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 4edd97eb..a7c658d7 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
@@ -10889,16 +10889,16 @@
                                               </node>
                                             </node>
                                             <node concept="gft3U" id="1OAJnGs11n" role="UU_$l">
-                                              <node concept="10QFUN" id="1OAJnGs1o0" role="gfFT$">
-                                                <node concept="3uibUv" id="1OAJnGs25s" role="10QFUM">
+                                              <node concept="10QFUN" id="1jRhh4jLZtp" role="gfFT$">
+                                                <node concept="3uibUv" id="1jRhh4jM06x" role="10QFUM">
                                                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                                  <node concept="29HgVG" id="1OAJnGty7w" role="lGtFl">
-                                                    <node concept="3NFfHV" id="1OAJnGtyAm" role="3NFExx">
-                                                      <node concept="3clFbS" id="1OAJnGtyAn" role="2VODD2">
-                                                        <node concept="3clFbF" id="1OAJnGtAl8" role="3cqZAp">
-                                                          <node concept="2OqwBi" id="1OAJnGtCwF" role="3clFbG">
-                                                            <node concept="30H73N" id="1OAJnGtAl7" role="2Oq$k0" />
-                                                            <node concept="3TrEf2" id="1OAJnGtHpF" role="2OqNvi">
+                                                  <node concept="29HgVG" id="1jRhh4jM6eO" role="lGtFl">
+                                                    <node concept="3NFfHV" id="1jRhh4jM6YD" role="3NFExx">
+                                                      <node concept="3clFbS" id="1jRhh4jM6YE" role="2VODD2">
+                                                        <node concept="3clFbF" id="1jRhh4jM6YH" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="1jRhh4jM9bi" role="3clFbG">
+                                                            <node concept="30H73N" id="1jRhh4jM6YG" role="2Oq$k0" />
+                                                            <node concept="3TrEf2" id="1jRhh4jMeql" role="2OqNvi">
                                                               <ref role="3Tt5mk" to="wq2x:5itBwM5ifE5" resolve="type" />
                                                             </node>
                                                           </node>
@@ -10907,7 +10907,22 @@
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="10Nm6u" id="1OAJnGs1IG" role="10QFUP" />
+                                                <node concept="10Nm6u" id="1jRhh4jJ_Cx" role="10QFUP">
+                                                  <node concept="29HgVG" id="1jRhh4jJAUF" role="lGtFl">
+                                                    <node concept="3NFfHV" id="1jRhh4jJEjZ" role="3NFExx">
+                                                      <node concept="3clFbS" id="1jRhh4jJEk0" role="2VODD2">
+                                                        <node concept="3clFbF" id="1jRhh4jJG51" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="1jRhh4jJG53" role="3clFbG">
+                                                            <node concept="30H73N" id="1jRhh4jJG54" role="2Oq$k0" />
+                                                            <node concept="3TrEf2" id="1jRhh4jJG55" role="2OqNvi">
+                                                              <ref role="3Tt5mk" to="wq2x:1ufy3d9wUy7" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
@@ -11380,16 +11395,16 @@
                                         </node>
                                       </node>
                                       <node concept="gft3U" id="3P9qlbs0geA" role="UU_$l">
-                                        <node concept="10QFUN" id="3P9qlbs0gxO" role="gfFT$">
-                                          <node concept="3uibUv" id="3P9qlbs0ioI" role="10QFUM">
+                                        <node concept="10QFUN" id="1jRhh4jLmVm" role="gfFT$">
+                                          <node concept="3uibUv" id="1jRhh4jLqe4" role="10QFUM">
                                             <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                            <node concept="29HgVG" id="3P9qlbs0kdK" role="lGtFl">
-                                              <node concept="3NFfHV" id="3P9qlbs0kx9" role="3NFExx">
-                                                <node concept="3clFbS" id="3P9qlbs0kxa" role="2VODD2">
-                                                  <node concept="3clFbF" id="3P9qlbs0kP4" role="3cqZAp">
-                                                    <node concept="2OqwBi" id="3P9qlbs0lEr" role="3clFbG">
-                                                      <node concept="30H73N" id="3P9qlbs0kP3" role="2Oq$k0" />
-                                                      <node concept="3TrEf2" id="3P9qlbs0ntV" role="2OqNvi">
+                                            <node concept="29HgVG" id="1jRhh4jLzZt" role="lGtFl">
+                                              <node concept="3NFfHV" id="1jRhh4jL$Le" role="3NFExx">
+                                                <node concept="3clFbS" id="1jRhh4jL$Lf" role="2VODD2">
+                                                  <node concept="3clFbF" id="1jRhh4jLABI" role="3cqZAp">
+                                                    <node concept="2OqwBi" id="1jRhh4jLCL5" role="3clFbG">
+                                                      <node concept="30H73N" id="1jRhh4jLABH" role="2Oq$k0" />
+                                                      <node concept="3TrEf2" id="1jRhh4jLSVB" role="2OqNvi">
                                                         <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
                                                       </node>
                                                     </node>
@@ -11398,7 +11413,22 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="10Nm6u" id="3P9qlbs0hR8" role="10QFUP" />
+                                          <node concept="10Nm6u" id="1jRhh4jKt6m" role="10QFUP">
+                                            <node concept="29HgVG" id="1jRhh4jKuso" role="lGtFl">
+                                              <node concept="3NFfHV" id="1jRhh4jKv7p" role="3NFExx">
+                                                <node concept="3clFbS" id="1jRhh4jKv7q" role="2VODD2">
+                                                  <node concept="3clFbF" id="1jRhh4jKv7t" role="3cqZAp">
+                                                    <node concept="2OqwBi" id="1jRhh4jKx9W" role="3clFbG">
+                                                      <node concept="30H73N" id="1jRhh4jKv7s" role="2Oq$k0" />
+                                                      <node concept="3TrEf2" id="1jRhh4jKB5Q" role="2OqNvi">
+                                                        <ref role="3Tt5mk" to="wq2x:5itBwM6zLOl" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
                                         </node>
                                       </node>
                                     </node>