diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
index 3656920f..619789d6 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
@@ -12,6 +12,7 @@
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
+    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -117,6 +118,9 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -911,17 +915,34 @@
       </node>
       <node concept="3clFbS" id="1H_6AUT3qxi" role="3clF47">
         <node concept="3cpWs6" id="1H_6AUT3qxl" role="3cqZAp">
-          <node concept="2OqwBi" id="1H_6AUT3xhF" role="3cqZAk">
-            <node concept="37vLTw" id="1H_6AUT3wwu" role="2Oq$k0">
-              <ref role="3cqZAo" node="1H_6AUT3r3E" resolve="principalRules" />
+          <node concept="1Wc70l" id="cmlg9O7Wff" role="3cqZAk">
+            <node concept="2ZW3vV" id="cmlg9O7WR1" role="3uHU7B">
+              <node concept="3uibUv" id="cmlg9O7X$p" role="2ZW6by">
+                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              </node>
+              <node concept="37vLTw" id="cmlg9O7Ww$" role="2ZW6bz">
+                <ref role="3cqZAo" node="1H_6AUT3qxg" resolve="rule" />
+              </node>
             </node>
-            <node concept="3JPx81" id="1H_6AUT3yjD" role="2OqNvi">
-              <node concept="2OqwBi" id="1H_6AUT3yEU" role="25WWJ7">
-                <node concept="37vLTw" id="1H_6AUT3yqA" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1H_6AUT3qxg" resolve="rule" />
-                </node>
-                <node concept="liA8E" id="6xVZN2uLgGx" role="2OqNvi">
-                  <ref role="37wK5l" to="av0y:~Rule.basetag()" resolve="basetag" />
+            <node concept="2OqwBi" id="1H_6AUT3xhF" role="3uHU7w">
+              <node concept="37vLTw" id="1H_6AUT3wwu" role="2Oq$k0">
+                <ref role="3cqZAo" node="1H_6AUT3r3E" resolve="principalRules" />
+              </node>
+              <node concept="3JPx81" id="1H_6AUT3yjD" role="2OqNvi">
+                <node concept="2OqwBi" id="1H_6AUT3yEU" role="25WWJ7">
+                  <node concept="1eOMI4" id="cmlg9O7XGo" role="2Oq$k0">
+                    <node concept="10QFUN" id="cmlg9O7XGn" role="1eOMHV">
+                      <node concept="37vLTw" id="cmlg9O7XGm" role="10QFUP">
+                        <ref role="3cqZAo" node="1H_6AUT3qxg" resolve="rule" />
+                      </node>
+                      <node concept="3uibUv" id="cmlg9O7XV2" role="10QFUM">
+                        <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="6xVZN2uLgGx" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:~Rule.basetag()" resolve="basetag" />
+                  </node>
                 </node>
               </node>
             </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 96fb3dce..276e7ec8 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
@@ -42,6 +42,7 @@
       <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
       <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="5293379017992965193" name="jetbrains.mps.baseLanguage.structure.StubStatementList" flags="ig" index="2lzX1y" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
         <child id="1076505808688" name="condition" index="2$JKZa" />
@@ -288,6 +289,18 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
@@ -300,6 +313,7 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -2723,6 +2737,21 @@
       <node concept="3Tm1VV" id="7nPD14Ob4lw" role="1B3o_S" />
       <node concept="3clFbS" id="7nPD14Ob4lx" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="cmlg9O80l2" role="jymVt" />
+    <node concept="3clFb_" id="~Rule.basetag()" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="basetag" />
+      <node concept="3Tm1VV" id="cmlg9N8aR2" role="1B3o_S" />
+      <node concept="2lzX1y" id="cmlg9N8aR3" role="3clF47" />
+      <node concept="17QB3L" id="cmlg9OiJpz" role="3clF45" />
+      <node concept="P$JXv" id="cmlg9OiMIe" role="lGtFl">
+        <node concept="TZ5HA" id="cmlg9OiMIf" role="TZ5H$">
+          <node concept="1dT_AC" id="cmlg9OiMIg" role="1dT_Ay">
+            <property role="1dT_AB" value="Human-readable identifier shared by all rules produced from the same template." />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="7nPD14OaO2E" role="jymVt" />
     <node concept="3Tm1VV" id="7nPD14OaO1P" role="1B3o_S" />
     <node concept="3uibUv" id="7nPD14OaO2v" role="1zkMxy">
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 2b6a67f4..591e48ee 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
@@ -869,11 +869,18 @@
                       <node concept="3clFbS" id="3FGJ5nvn1Qb" role="1bW5cS">
                         <node concept="3clFbF" id="3FGJ5nvn1Yt" role="3cqZAp">
                           <node concept="2OqwBi" id="3FGJ5nvn28m" role="3clFbG">
-                            <node concept="37vLTw" id="3FGJ5nvn1Ys" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3FGJ5nvn1Qc" resolve="it" />
+                            <node concept="1eOMI4" id="cmlg9O801y" role="2Oq$k0">
+                              <node concept="10QFUN" id="cmlg9O801x" role="1eOMHV">
+                                <node concept="37vLTw" id="cmlg9O801w" role="10QFUP">
+                                  <ref role="3cqZAo" node="3FGJ5nvn1Qc" resolve="it" />
+                                </node>
+                                <node concept="3uibUv" id="cmlg9O80bD" role="10QFUM">
+                                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                                </node>
+                              </node>
                             </node>
                             <node concept="liA8E" id="3FGJ5nvn2k_" role="2OqNvi">
-                              <ref role="37wK5l" to="av0y:~Rule.basetag()" resolve="basetag" />
+                              <ref role="37wK5l" to="i348:~Rule.basetag()" resolve="basetag" />
                             </node>
                           </node>
                         </node>
@@ -972,11 +979,18 @@
                 </node>
                 <node concept="TSZUe" id="3FGJ5nvmVEe" role="2OqNvi">
                   <node concept="2OqwBi" id="3FGJ5nvmW12" role="25WWJ7">
-                    <node concept="37vLTw" id="3FGJ5nvmVUX" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3FGJ5nvmTOj" resolve="rule" />
+                    <node concept="1eOMI4" id="cmlg9O7ZEh" role="2Oq$k0">
+                      <node concept="10QFUN" id="cmlg9O7ZEg" role="1eOMHV">
+                        <node concept="37vLTw" id="cmlg9O7ZEf" role="10QFUP">
+                          <ref role="3cqZAo" node="3FGJ5nvmTOj" resolve="rule" />
+                        </node>
+                        <node concept="3uibUv" id="cmlg9O7ZH8" role="10QFUM">
+                          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                        </node>
+                      </node>
                     </node>
                     <node concept="liA8E" id="3FGJ5nvmWo2" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Rule.basetag()" resolve="basetag" />
+                      <ref role="37wK5l" to="i348:~Rule.basetag()" resolve="basetag" />
                     </node>
                   </node>
                 </node>