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 cfa422b1..0e0d7809 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
@@ -10700,11 +10700,16 @@
                                                     <node concept="3clFbS" id="6cGbuqOvvNS" role="1bW5cS">
                                                       <node concept="3clFbF" id="6cGbuqOvvNT" role="3cqZAp">
                                                         <node concept="3clFbC" id="6cGbuqOvvNU" role="3clFbG">
-                                                          <node concept="2OqwBi" id="6cGbuqOvvNY" role="3uHU7B">
-                                                            <node concept="37vLTw" id="6cGbuqOvvNZ" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="6cGbuqOvvO1" resolve="it" />
+                                                          <node concept="2OqwBi" id="3P9qlbs0U7P" role="3uHU7B">
+                                                            <node concept="2OqwBi" id="6cGbuqOvvNY" role="2Oq$k0">
+                                                              <node concept="37vLTw" id="6cGbuqOvvNZ" role="2Oq$k0">
+                                                                <ref role="3cqZAo" node="6cGbuqOvvO1" resolve="it" />
+                                                              </node>
+                                                              <node concept="3TrEf2" id="3P9qlbs0Tf$" role="2OqNvi">
+                                                                <ref role="3Tt5mk" to="wq2x:5itBwM7QPtQ" resolve="declaration" />
+                                                              </node>
                                                             </node>
-                                                            <node concept="2bSWHS" id="6cGbuqOvvO0" role="2OqNvi" />
+                                                            <node concept="2bSWHS" id="3P9qlbs0UK4" role="2OqNvi" />
                                                           </node>
                                                           <node concept="$GB7w" id="6cGbuqOvxBQ" role="3uHU7w">
                                                             <property role="26SvY3" value="1jlY2aid0uu/index" />
@@ -10740,8 +10745,27 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="gft3U" id="4qGA5WD3DX3" role="UU_$l">
-                                        <node concept="10Nm6u" id="4qGA5WD3Fh3" role="gfFT$" />
+                                      <node concept="gft3U" id="3P9qlbs0geA" role="UU_$l">
+                                        <node concept="10QFUN" id="3P9qlbs0gxO" role="gfFT$">
+                                          <node concept="3uibUv" id="3P9qlbs0ioI" 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">
+                                                        <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="10Nm6u" id="3P9qlbs0hR8" role="10QFUP" />
+                                        </node>
                                       </node>
                                     </node>
                                     <node concept="29HgVG" id="4qGA5WD42tk" role="lGtFl">