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 e30423be..ec637bd6 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
@@ -357,9 +357,7 @@
       <concept id="1167087469898" name="jetbrains.mps.lang.generator.structure.CreateRootRule" flags="lg" index="2VPoh5">
         <reference id="1200923511980" name="label" index="2sBCQV" />
         <reference id="1167087469901" name="templateNode" index="2VPoh2" />
-        <child id="1167087469900" name="conditionFunction" index="2VPoh3" />
       </concept>
-      <concept id="1167087518662" name="jetbrains.mps.lang.generator.structure.CreateRootRule_Condition" flags="in" index="2VP$b9" />
       <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -459,6 +457,18 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <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="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="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
       <concept id="1217889725928" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_SessionObjectAccess" flags="nn" index="2fSANN" />
       <concept id="1217889960776" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_UserObjectAccessBase" flags="nn" index="2fTw9j">
@@ -755,32 +765,12 @@
   <node concept="bUwia" id="3YbBykHJQRu">
     <property role="TrG5h" value="rule" />
     <property role="3GE5qa" value="rule" />
-    <node concept="2VPoh5" id="6w6CYIRhl7M" role="2VS0gm">
-      <ref role="2VPoh2" node="6w6CYIRhmZ8" resolve="RuleTemplateManifest" />
-      <ref role="2sBCQV" node="2hteS6ClFWV" resolve="rule_manifest" />
-      <node concept="2VP$b9" id="7km57PkdjlM" role="2VPoh3">
-        <node concept="3clFbS" id="7km57PkdjlN" role="2VODD2">
-          <node concept="3clFbF" id="7km57PkdjsV" role="3cqZAp">
-            <node concept="2OqwBi" id="7km57PkdjsW" role="3clFbG">
-              <node concept="2OqwBi" id="7km57PkdjsX" role="2Oq$k0">
-                <node concept="2OqwBi" id="7km57PkdjsY" role="2Oq$k0">
-                  <node concept="1iwH7S" id="7km57PkdjsZ" role="2Oq$k0" />
-                  <node concept="1r8y6K" id="7km57Pkdjt0" role="2OqNvi" />
-                </node>
-                <node concept="2SmgA7" id="7km57Pkdjt1" role="2OqNvi">
-                  <node concept="chp4Y" id="7lt0LtPNOKQ" role="1dBWTz">
-                    <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3GX2aA" id="7km57Pkdo6o" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
+    <node concept="2VPoh5" id="5EDW3XF65RC" role="2VS0gm">
+      <ref role="2VPoh2" node="5EDW3XF62FH" resolve="Manifest" />
+      <ref role="2sBCQV" node="5EDW3XF64MJ" resolve="manifest" />
     </node>
-    <node concept="2rT7sh" id="2hteS6ClFWV" role="2rTMjI">
-      <property role="TrG5h" value="rule_manifest" />
+    <node concept="2rT7sh" id="5EDW3XF64MJ" role="2rTMjI">
+      <property role="TrG5h" value="manifest" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
     </node>
     <node concept="2rT7sh" id="4MqhgXUaC7X" role="2rTMjI">
@@ -3270,369 +3260,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="6w6CYIRhmZ8">
-    <property role="TrG5h" value="RuleTemplateManifest" />
-    <property role="3GE5qa" value="rule" />
-    <node concept="3Tm1VV" id="6w6CYIRhmZ9" role="1B3o_S" />
-    <node concept="n94m4" id="6w6CYIRhmZa" role="lGtFl" />
-    <node concept="3uibUv" id="6w6CYIRhmZC" role="1zkMxy">
-      <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-    </node>
-    <node concept="2tJIrI" id="6w6CYIRhnJs" role="jymVt" />
-    <node concept="3clFbW" id="4MqhgXUhWQk" role="jymVt">
-      <node concept="3cqZAl" id="4MqhgXUhWQm" role="3clF45" />
-      <node concept="3Tmbuc" id="7P_FdVQ3QIz" role="1B3o_S" />
-      <node concept="3clFbS" id="4MqhgXUhWQo" role="3clF47">
-        <node concept="3clFbF" id="7P_FdVQ4viH" role="3cqZAp">
-          <node concept="1rXfSq" id="7P_FdVQ4viG" role="3clFbG">
-            <ref role="37wK5l" node="4MqhgXUajMY" resolve="init" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MqhgXUhW$N" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVPtt0i" role="jymVt">
-      <property role="TrG5h" value="queryTemplates" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="_YKpA" id="7P_FdVPtt0j" role="3clF45">
-        <node concept="3uibUv" id="6OXbTD$jZLr" role="_ZDj9">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVPtt0l" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPtt0n" role="3clF47">
-        <node concept="3clFbF" id="7P_FdVPtIFz" role="3cqZAp">
-          <node concept="37vLTw" id="7P_FdVPtIFy" role="3clFbG">
-            <ref role="3cqZAo" node="7P_FdVPtty$" resolve="queryTemplates" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7P_FdVPtt0o" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7P_FdVPttnl" role="jymVt" />
-    <node concept="3clFb_" id="4MqhgXUaj4Y" role="jymVt">
-      <property role="TrG5h" value="rulesListTemplates" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="_YKpA" id="20Ay2VeZNsB" role="3clF45">
-        <node concept="3uibUv" id="20Ay2VeZNsD" role="_ZDj9">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RulesListTemplate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4MqhgXUaj51" role="1B3o_S" />
-      <node concept="3clFbS" id="4MqhgXUaj53" role="3clF47">
-        <node concept="3clFbF" id="4MqhgXUaIoi" role="3cqZAp">
-          <node concept="37vLTw" id="4MqhgXUaIog" role="3clFbG">
-            <ref role="3cqZAo" node="4MqhgXUajmq" resolve="handlerTemplates" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="4MqhgXUaj54" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2WtKs4tDB1W" role="jymVt" />
-    <node concept="3clFb_" id="2WtKs4tZmRg" role="jymVt">
-      <property role="TrG5h" value="analyses" />
-      <node concept="3clFbS" id="2WtKs4tZmRj" role="3clF47">
-        <node concept="3clFbF" id="2WtKs4u1bEl" role="3cqZAp">
-          <node concept="37vLTw" id="2WtKs4u1bEk" role="3clFbG">
-            <ref role="3cqZAo" node="2WtKs4tZo75" resolve="analyses" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2WtKs4tZmDZ" role="1B3o_S" />
-      <node concept="3uibUv" id="2WtKs4u1bS7" role="3clF45">
-        <ref role="3uigEE" node="7m2UX3UIaN5" resolve="BasicProgramAnalysisImpl" />
-      </node>
-      <node concept="2AHcQZ" id="2WtKs4tZneF" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2WtKs4tDAI5" role="jymVt" />
-    <node concept="3clFb_" id="4MqhgXUajMY" role="jymVt">
-      <property role="TrG5h" value="init" />
-      <node concept="3cqZAl" id="4MqhgXUajN0" role="3clF45" />
-      <node concept="3Tm6S6" id="7P_FdVQ4uXF" role="1B3o_S" />
-      <node concept="3clFbS" id="4MqhgXUajN2" role="3clF47">
-        <node concept="3clFbJ" id="4MqhgXUak5b" role="3cqZAp">
-          <node concept="3clFbC" id="4MqhgXUakYI" role="3clFbw">
-            <node concept="10Nm6u" id="4MqhgXUal8f" role="3uHU7w" />
-            <node concept="37vLTw" id="4MqhgXUak6p" role="3uHU7B">
-              <ref role="3cqZAo" node="4MqhgXUajmq" resolve="handlerTemplates" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="4MqhgXUak5d" role="3clFbx">
-            <node concept="3cpWs8" id="4MqhgXUaKVh" role="3cqZAp">
-              <node concept="3cpWsn" id="4MqhgXUaKVi" role="3cpWs9">
-                <property role="TrG5h" value="htpl" />
-                <node concept="_YKpA" id="4MqhgXUaKVd" role="1tU5fm">
-                  <node concept="3uibUv" id="4MqhgXUaKVg" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RulesListTemplate" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="4MqhgXUaKVj" role="33vP2m">
-                  <node concept="Tc6Ow" id="4MqhgXUaKVk" role="2ShVmc">
-                    <node concept="3uibUv" id="4MqhgXUaKVl" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RulesListTemplate" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4MqhgXUanCz" role="3cqZAp">
-              <node concept="2OqwBi" id="4MqhgXUaoq2" role="3clFbG">
-                <node concept="37vLTw" id="4MqhgXUlzHQ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4MqhgXUaKVi" resolve="htpl" />
-                </node>
-                <node concept="TSZUe" id="4MqhgXUap$3" role="2OqNvi">
-                  <node concept="2ShNRf" id="7P_FdVQ4c0e" role="25WWJ7">
-                    <node concept="1pGfFk" id="7P_FdVQ4c0f" role="2ShVmc">
-                      <ref role="37wK5l" node="4MqhgXUhXXR" resolve="RulesListTemplateImpl" />
-                      <node concept="1ZhdrF" id="7P_FdVQ4c0h" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                        <property role="2qtEX8" value="baseMethodDeclaration" />
-                        <node concept="3$xsQk" id="7P_FdVQ4c0i" role="3$ytzL">
-                          <node concept="3clFbS" id="7P_FdVQ4c0j" role="2VODD2">
-                            <node concept="3clFbF" id="7P_FdVQ4c0k" role="3cqZAp">
-                              <node concept="2OqwBi" id="7P_FdVQ4c0l" role="3clFbG">
-                                <node concept="1iwH7S" id="7P_FdVQ4c0m" role="2Oq$k0" />
-                                <node concept="1iwH70" id="7P_FdVQ4c0n" role="2OqNvi">
-                                  <ref role="1iwH77" node="7P_FdVQ488b" resolve="handler_template_constructor" />
-                                  <node concept="30H73N" id="7P_FdVQ4c0o" role="1iwH7V" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1WS0z7" id="4MqhgXUaxEZ" role="lGtFl">
-                <node concept="3JmXsc" id="4MqhgXUaxF1" role="3Jn$fo">
-                  <node concept="3clFbS" id="4MqhgXUaxF3" role="2VODD2">
-                    <node concept="3clFbF" id="4MqhgXUayhQ" role="3cqZAp">
-                      <node concept="2OqwBi" id="4MqhgXUayhS" role="3clFbG">
-                        <node concept="2OqwBi" id="4MqhgXUayhT" role="2Oq$k0">
-                          <node concept="1iwH7S" id="4MqhgXUayhU" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="4MqhgXUayhV" role="2OqNvi" />
-                        </node>
-                        <node concept="2SmgA7" id="4MqhgXUayhW" role="2OqNvi">
-                          <node concept="chp4Y" id="4MqhgXUayDv" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4MqhgXUalf2" role="3cqZAp">
-              <node concept="37vLTI" id="4MqhgXUancq" role="3clFbG">
-                <node concept="2OqwBi" id="4MqhgXUaM3n" role="37vLTx">
-                  <node concept="37vLTw" id="4MqhgXUaKVm" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MqhgXUaKVi" resolve="htpl" />
-                  </node>
-                  <node concept="26Dbio" id="4MqhgXUaNaX" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="4MqhgXUalnv" role="37vLTJ">
-                  <node concept="Xjq3P" id="4MqhgXUalf1" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="4MqhgXUalAu" role="2OqNvi">
-                    <ref role="2Oxat5" node="4MqhgXUajmq" resolve="handlerTemplates" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="7P_FdVPttUS" role="3cqZAp">
-          <node concept="3clFbS" id="7P_FdVPttUU" role="3clFbx">
-            <node concept="3cpWs8" id="7P_FdVPtxqh" role="3cqZAp">
-              <node concept="3cpWsn" id="7P_FdVPtxqi" role="3cpWs9">
-                <property role="TrG5h" value="qtpl" />
-                <node concept="_YKpA" id="7P_FdVPtxq9" role="1tU5fm">
-                  <node concept="3uibUv" id="6OXbTD$k1ph" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="7P_FdVPtxqj" role="33vP2m">
-                  <node concept="Tc6Ow" id="7P_FdVPtxqk" role="2ShVmc">
-                    <node concept="3uibUv" id="6OXbTD$k1Lk" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7P_FdVPtvoD" role="3cqZAp">
-              <node concept="2OqwBi" id="7P_FdVPtyUU" role="3clFbG">
-                <node concept="37vLTw" id="7P_FdVPtxqm" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7P_FdVPtxqi" resolve="qtpl" />
-                </node>
-                <node concept="TSZUe" id="7P_FdVPtztn" role="2OqNvi">
-                  <node concept="2ShNRf" id="7P_FdVPtzv0" role="25WWJ7">
-                    <node concept="1pGfFk" id="6OXbTD$keFf" role="2ShVmc">
-                      <ref role="37wK5l" node="6OXbTD$juGj" resolve="QueryTemplateImpl" />
-                      <node concept="1ZhdrF" id="6OXbTD$keJ8" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                        <property role="2qtEX8" value="baseMethodDeclaration" />
-                        <node concept="3$xsQk" id="6OXbTD$keJ9" role="3$ytzL">
-                          <node concept="3clFbS" id="6OXbTD$keJa" role="2VODD2">
-                            <node concept="3clFbF" id="7P_FdVPtDvB" role="3cqZAp">
-                              <node concept="2OqwBi" id="7P_FdVPtDvC" role="3clFbG">
-                                <node concept="1iwH7S" id="7P_FdVPtDvD" role="2Oq$k0" />
-                                <node concept="1iwH70" id="7P_FdVPtDvE" role="2OqNvi">
-                                  <ref role="1iwH77" node="6OXbTD$ko7g" resolve="query_constructor" />
-                                  <node concept="30H73N" id="7P_FdVPtDvF" role="1iwH7V" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1WS0z7" id="7P_FdVQCu2M" role="lGtFl">
-                <node concept="3JmXsc" id="7P_FdVQCu2S" role="3Jn$fo">
-                  <node concept="3clFbS" id="7P_FdVQCu2Y" role="2VODD2">
-                    <node concept="3clFbF" id="7P_FdVQCuKn" role="3cqZAp">
-                      <node concept="2OqwBi" id="7P_FdVQCuKo" role="3clFbG">
-                        <node concept="2OqwBi" id="7P_FdVQCuKp" role="2Oq$k0">
-                          <node concept="1iwH7S" id="7P_FdVQCuKq" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="7P_FdVQCuKr" role="2OqNvi" />
-                        </node>
-                        <node concept="2SmgA7" id="7P_FdVQCuKs" role="2OqNvi">
-                          <node concept="chp4Y" id="6OXbTD$kgyN" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7P_FdVPtDTn" role="3cqZAp">
-              <node concept="37vLTI" id="7P_FdVPtFOi" role="3clFbG">
-                <node concept="2OqwBi" id="7P_FdVPtHp1" role="37vLTx">
-                  <node concept="37vLTw" id="7P_FdVPtGF3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7P_FdVPtxqi" resolve="qtpl" />
-                  </node>
-                  <node concept="26Dbio" id="7P_FdVPtIzT" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="7P_FdVPtE4_" role="37vLTJ">
-                  <node concept="Xjq3P" id="7P_FdVPtDTl" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="7P_FdVPtEl1" role="2OqNvi">
-                    <ref role="2Oxat5" node="7P_FdVPtty$" resolve="queryTemplates" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="7P_FdVPtuUS" role="3clFbw">
-            <node concept="10Nm6u" id="7P_FdVPtviv" role="3uHU7w" />
-            <node concept="37vLTw" id="7P_FdVPtu3t" role="3uHU7B">
-              <ref role="3cqZAo" node="7P_FdVPtty$" resolve="queryTemplates" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="2WtKs4tDCiq" role="3cqZAp">
-          <node concept="3clFbS" id="2WtKs4tDCis" role="3clFbx">
-            <node concept="3cpWs8" id="2Ap6smv3i_" role="3cqZAp">
-              <node concept="3cpWsn" id="2Ap6smv3iA" role="3cpWs9">
-                <property role="TrG5h" value="builder" />
-                <node concept="3uibUv" id="2Ap6smv3iB" role="1tU5fm">
-                  <ref role="3uigEE" node="7m2UX3UIaN5" resolve="BasicProgramAnalysisImpl" />
-                </node>
-                <node concept="2ShNRf" id="2Ap6smv3iC" role="33vP2m">
-                  <node concept="1pGfFk" id="2Ap6smv3iD" role="2ShVmc">
-                    <ref role="37wK5l" node="2WtKs4tYohZ" resolve="BasicProgramAnalysisImpl" />
-                    <node concept="1ZhdrF" id="2Ap6smv3iE" role="lGtFl">
-                      <property role="2qtEX8" value="baseMethodDeclaration" />
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                      <node concept="3$xsQk" id="2Ap6smv3iF" role="3$ytzL">
-                        <node concept="3clFbS" id="2Ap6smv3iG" role="2VODD2">
-                          <node concept="3clFbF" id="2Ap6smv3iH" role="3cqZAp">
-                            <node concept="2OqwBi" id="2Ap6smv3iI" role="3clFbG">
-                              <node concept="1iwH7S" id="2Ap6smv3iJ" role="2Oq$k0" />
-                              <node concept="1iwH7d" id="2Ap6smv3iK" role="2OqNvi">
-                                <ref role="1iwH7c" node="2WtKs4tYtzV" resolve="basic_analysis_ctor" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="2WtKs4tY_nQ" role="3cqZAp">
-              <node concept="2OqwBi" id="2WtKs4tY_xE" role="3clFbG">
-                <node concept="37vLTw" id="2Ap6smxBmg" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2Ap6smv3iA" resolve="builder" />
-                </node>
-                <node concept="liA8E" id="2WtKs4tY_Es" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:1H_6AUSXuxC" resolve="run" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="2WtKs4tZozH" role="3cqZAp">
-              <node concept="37vLTI" id="2WtKs4tZp8p" role="3clFbG">
-                <node concept="37vLTw" id="2Ap6smxBn2" role="37vLTx">
-                  <ref role="3cqZAo" node="2Ap6smv3iA" resolve="builder" />
-                </node>
-                <node concept="2OqwBi" id="2WtKs4tZoGI" role="37vLTJ">
-                  <node concept="Xjq3P" id="2WtKs4tZozF" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="2WtKs4tZoUW" role="2OqNvi">
-                    <ref role="2Oxat5" node="2WtKs4tZo75" resolve="analyses" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="2WtKs4tDCvM" role="3clFbw">
-            <node concept="10Nm6u" id="2WtKs4tDC_p" role="3uHU7w" />
-            <node concept="37vLTw" id="2WtKs4tZotj" role="3uHU7B">
-              <ref role="3cqZAo" node="2WtKs4tZo75" resolve="analyses" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="20Ay2Vf4BEv" role="jymVt" />
-    <node concept="312cEg" id="4MqhgXUajmq" role="jymVt">
-      <property role="TrG5h" value="handlerTemplates" />
-      <node concept="3Tm6S6" id="4MqhgXUajmr" role="1B3o_S" />
-      <node concept="_YKpA" id="4MqhgXUajrF" role="1tU5fm">
-        <node concept="3uibUv" id="4MqhgXUajuP" role="_ZDj9">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RulesListTemplate" />
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="7P_FdVPtty$" role="jymVt">
-      <property role="TrG5h" value="queryTemplates" />
-      <node concept="3Tm6S6" id="7P_FdVPtty_" role="1B3o_S" />
-      <node concept="_YKpA" id="7P_FdVPttyA" role="1tU5fm">
-        <node concept="3uibUv" id="6OXbTD$k0vK" role="_ZDj9">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="2WtKs4tZo75" role="jymVt">
-      <property role="TrG5h" value="analyses" />
-      <node concept="3Tm6S6" id="2WtKs4tZnI9" role="1B3o_S" />
-      <node concept="3uibUv" id="2WtKs4tZo3T" role="1tU5fm">
-        <ref role="3uigEE" node="7m2UX3UIaN5" resolve="BasicProgramAnalysisImpl" />
-      </node>
-    </node>
-  </node>
   <node concept="bUwia" id="6FQzrygS9cb">
     <property role="TrG5h" value="rulemethod" />
     <property role="3GE5qa" value="rulemethod" />
@@ -4961,28 +4588,6 @@
       <ref role="3lhOvi" node="2N2MQGCMHqo" resolve="_MacroTable" />
       <ref role="2sgKRv" node="2N2MQGCMWOf" resolve="macroTable_class" />
     </node>
-    <node concept="2VPoh5" id="2N2MQGCMV2s" role="2VS0gm">
-      <ref role="2VPoh2" node="2N2MQGCMVs3" resolve="MacroManifest" />
-      <ref role="2sBCQV" node="2hteS6ClwZa" resolve="macroManifest" />
-      <node concept="2VP$b9" id="7km57Pkd9Ky" role="2VPoh3">
-        <node concept="3clFbS" id="7km57Pkd9Kz" role="2VODD2">
-          <node concept="3clFbF" id="7km57Pkd9RF" role="3cqZAp">
-            <node concept="2OqwBi" id="7km57PkdbIc" role="3clFbG">
-              <node concept="2OqwBi" id="7km57Pkd9RG" role="2Oq$k0">
-                <node concept="2OqwBi" id="7km57Pkd9RH" role="2Oq$k0">
-                  <node concept="1iwH7S" id="7km57Pkd9RI" role="2Oq$k0" />
-                  <node concept="1r8y6K" id="7km57Pkd9RJ" role="2OqNvi" />
-                </node>
-                <node concept="2RRcyG" id="7km57Pkd9RK" role="2OqNvi">
-                  <ref role="2RRcyH" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
-                </node>
-              </node>
-              <node concept="3GX2aA" id="7km57PkdeOj" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="5itBwM7K1kc" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:5itBwM7J4Oh" resolve="ExpandMacroInputReference" />
       <node concept="1Koe21" id="5itBwM7K9HW" role="1lVwrX">
@@ -5944,103 +5549,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="2N2MQGCMVs3">
-    <property role="TrG5h" value="MacroManifest" />
-    <property role="3GE5qa" value="macro" />
-    <node concept="3Tm1VV" id="2N2MQGCMVs4" role="1B3o_S" />
-    <node concept="n94m4" id="2N2MQGCMVs5" role="lGtFl" />
-    <node concept="3uibUv" id="2N2MQGCMVsu" role="1zkMxy">
-      <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
-    </node>
-    <node concept="2tJIrI" id="2N2MQGCMVK$" role="jymVt" />
-    <node concept="3clFb_" id="6UWSvq4Vuf2" role="jymVt">
-      <property role="TrG5h" value="macroTables" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3vKaQO" id="6UWSvq4Vuf3" role="3clF45">
-        <node concept="3uibUv" id="6UWSvq4Vuf4" role="3O5elw">
-          <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6UWSvq4Vuf5" role="1B3o_S" />
-      <node concept="3clFbS" id="6UWSvq4Vuf7" role="3clF47">
-        <node concept="3cpWs8" id="6UWSvq4VujE" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq4VujH" role="3cpWs9">
-            <property role="TrG5h" value="macroTables" />
-            <node concept="_YKpA" id="6UWSvq4VujC" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq4VuJF" role="_ZDj9">
-                <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6UWSvq4VuOy" role="33vP2m">
-              <node concept="Tc6Ow" id="6UWSvq4VuOb" role="2ShVmc">
-                <node concept="3uibUv" id="6UWSvq4VuOc" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6UWSvq4VuR$" role="3cqZAp" />
-        <node concept="3clFbF" id="6UWSvq4VuRR" role="3cqZAp">
-          <node concept="2OqwBi" id="6UWSvq4VvRt" role="3clFbG">
-            <node concept="37vLTw" id="6UWSvq4Vv6r" role="2Oq$k0">
-              <ref role="3cqZAo" node="6UWSvq4VujH" resolve="macroTables" />
-            </node>
-            <node concept="TSZUe" id="6UWSvq4Vwrr" role="2OqNvi">
-              <node concept="2ShNRf" id="6UWSvq4VwVP" role="25WWJ7">
-                <node concept="HV5vD" id="6UWSvq4VwVQ" role="2ShVmc">
-                  <ref role="HV5vE" node="2N2MQGCMHqo" resolve="_MacroTable" />
-                  <node concept="1ZhdrF" id="6UWSvq4VwVR" role="lGtFl">
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
-                    <property role="2qtEX8" value="classifier" />
-                    <node concept="3$xsQk" id="6UWSvq4VwVS" role="3$ytzL">
-                      <node concept="3clFbS" id="6UWSvq4VwVT" role="2VODD2">
-                        <node concept="3clFbF" id="6UWSvq4VwVU" role="3cqZAp">
-                          <node concept="2OqwBi" id="6UWSvq4VwVV" role="3clFbG">
-                            <node concept="1iwH7S" id="6UWSvq4VwVW" role="2Oq$k0" />
-                            <node concept="1iwH70" id="6UWSvq4VwVX" role="2OqNvi">
-                              <ref role="1iwH77" node="2N2MQGCMWOf" resolve="macroTable_class" />
-                              <node concept="30H73N" id="6UWSvq4VwVY" role="1iwH7V" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1WS0z7" id="6UWSvq4VuS5" role="lGtFl">
-            <node concept="3JmXsc" id="6UWSvq4VuS6" role="3Jn$fo">
-              <node concept="3clFbS" id="6UWSvq4VuS7" role="2VODD2">
-                <node concept="3clFbF" id="6UWSvq4VuS8" role="3cqZAp">
-                  <node concept="2OqwBi" id="6UWSvq4VuS9" role="3clFbG">
-                    <node concept="2OqwBi" id="6UWSvq4VuSa" role="2Oq$k0">
-                      <node concept="1iwH7S" id="6UWSvq4VuSb" role="2Oq$k0" />
-                      <node concept="1r8y6K" id="6UWSvq4VuSc" role="2OqNvi" />
-                    </node>
-                    <node concept="2RRcyG" id="6UWSvq4VuSd" role="2OqNvi">
-                      <ref role="2RRcyH" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6UWSvq4VuRH" role="3cqZAp" />
-        <node concept="3clFbF" id="6UWSvq4Vxt8" role="3cqZAp">
-          <node concept="37vLTw" id="6UWSvq4Vxt6" role="3clFbG">
-            <ref role="3cqZAo" node="6UWSvq4VujH" resolve="macroTables" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6UWSvq4Vuf8" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-  </node>
   <node concept="jVnub" id="3KXGt7WGC_R">
     <property role="TrG5h" value="rule_tag" />
     <node concept="3aamgX" id="36tQV5AEsKG" role="3aUrZf">
@@ -9923,11 +9431,14 @@
     <node concept="3uibUv" id="4MqhgXUa3o$" role="EKbjA">
       <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RulesListTemplate" />
     </node>
-    <node concept="17Uvod" id="4MqhgXUa3zo" role="lGtFl">
-      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+    <node concept="3uibUv" id="5EDW3XF6tvV" role="1zkMxy">
+      <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
+    </node>
+    <node concept="17Uvod" id="5EDW3XF6tVm" role="lGtFl">
       <property role="2qtEX9" value="name" />
-      <node concept="3zFVjK" id="4MqhgXUa3zr" role="3zH0cK">
-        <node concept="3clFbS" id="4MqhgXUa3zs" role="2VODD2">
+      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+      <node concept="3zFVjK" id="5EDW3XF6tVn" role="3zH0cK">
+        <node concept="3clFbS" id="5EDW3XF6tVo" role="2VODD2">
           <node concept="3clFbF" id="4MqhgXUa3zy" role="3cqZAp">
             <node concept="3cpWs3" id="4MqhgXUaaTa" role="3clFbG">
               <node concept="2OqwBi" id="4MqhgXUabZl" role="3uHU7w">
@@ -12315,7 +11826,7 @@
       <node concept="3Tm1VV" id="36tQV5AoEXJ" role="1B3o_S" />
       <node concept="3clFbS" id="36tQV5AoEXK" role="3clF47">
         <node concept="XkiVB" id="36tQV5AoEXL" role="3cqZAp">
-          <ref role="37wK5l" to="i348:1ffsG7bUbEV" resolve="AbstraceRuleTemplate" />
+          <ref role="37wK5l" to="i348:1ffsG7bUbEV" resolve="AbstractRuleTemplate" />
           <node concept="37vLTw" id="36tQV5AoEXM" role="37wK5m">
             <ref role="3cqZAo" node="36tQV5AoEXG" resolve="rulesListTemplate" />
           </node>
@@ -12547,7 +12058,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="36tQV5AoF2O" role="1zkMxy">
-      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
       <node concept="3uibUv" id="36tQV5AoF33" role="11_B2D">
         <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
         <node concept="1ZhdrF" id="36tQV5AoF34" role="lGtFl">
@@ -13050,7 +12561,7 @@
       <node concept="2tJIrI" id="6R6MIbTN7mU" role="jymVt" />
       <node concept="3Tm1VV" id="6R6MIbTN7kh" role="1B3o_S" />
       <node concept="3uibUv" id="6R6MIbU1iPN" role="1zkMxy">
-        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
         <node concept="3uibUv" id="6R6MIbU1kcI" role="11_B2D">
           <ref role="3uigEE" node="36tQV5AxhJd" resolve="__Template.Token" />
         </node>
@@ -13076,7 +12587,7 @@
         <node concept="3Tm1VV" id="6R6MIbU1l5H" role="1B3o_S" />
         <node concept="3clFbS" id="6R6MIbU1l5I" role="3clF47">
           <node concept="XkiVB" id="6R6MIbU1l61" role="3cqZAp">
-            <ref role="37wK5l" to="i348:1ffsG7bUbEV" resolve="AbstraceRuleTemplate" />
+            <ref role="37wK5l" to="i348:1ffsG7bUbEV" resolve="AbstractRuleTemplate" />
             <node concept="37vLTw" id="6R6MIbU1l62" role="37wK5m">
               <ref role="3cqZAo" node="6R6MIbU1l5A" resolve="handlerTemplate" />
             </node>
@@ -13774,29 +13285,28 @@
   <node concept="312cEu" id="7km57PkeUQV">
     <property role="TrG5h" value="AspectDescriptor" />
     <property role="3GE5qa" value="aspect" />
-    <node concept="2tJIrI" id="2hteS6Clnqr" role="jymVt" />
-    <node concept="3clFb_" id="2hteS6ClnqE" role="jymVt">
-      <property role="TrG5h" value="createMacroManifest" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3uibUv" id="2hteS6ClnqF" role="3clF45">
-        <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+    <node concept="2tJIrI" id="5EDW3XF61Rp" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XF61YL" role="jymVt">
+      <property role="TrG5h" value="manifest" />
+      <node concept="3uibUv" id="5EDW3XF61YM" role="3clF45">
+        <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
       </node>
-      <node concept="3Tm1VV" id="2hteS6ClnqG" role="1B3o_S" />
-      <node concept="3clFbS" id="2hteS6ClnqI" role="3clF47">
-        <node concept="3cpWs6" id="NKt6ynYfGx" role="3cqZAp">
-          <node concept="2ShNRf" id="NKt6ynYfSC" role="3cqZAk">
-            <node concept="HV5vD" id="NKt6ynYfSD" role="2ShVmc">
-              <ref role="HV5vE" node="2N2MQGCMVs3" resolve="MacroManifest" />
-              <node concept="1ZhdrF" id="NKt6ynYfSE" role="lGtFl">
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
+      <node concept="3Tm1VV" id="5EDW3XF61YN" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XF61YQ" role="3clF47">
+        <node concept="3clFbF" id="5EDW3XF67ZO" role="3cqZAp">
+          <node concept="2ShNRf" id="5EDW3XF67ZM" role="3clFbG">
+            <node concept="HV5vD" id="5EDW3XF68w3" role="2ShVmc">
+              <ref role="HV5vE" node="5EDW3XF62FH" resolve="Manifest" />
+              <node concept="1ZhdrF" id="5EDW3XF68_c" role="lGtFl">
                 <property role="2qtEX8" value="classifier" />
-                <node concept="3$xsQk" id="NKt6ynYfSF" role="3$ytzL">
-                  <node concept="3clFbS" id="NKt6ynYfSG" role="2VODD2">
-                    <node concept="3clFbF" id="NKt6ynYfSH" role="3cqZAp">
-                      <node concept="2OqwBi" id="NKt6ynYfSI" role="3clFbG">
-                        <node concept="1iwH7S" id="NKt6ynYfSJ" role="2Oq$k0" />
-                        <node concept="1iwH7d" id="NKt6ynYfSK" role="2OqNvi">
-                          <ref role="1iwH7c" node="2hteS6ClwZa" resolve="macroManifest" />
+                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
+                <node concept="3$xsQk" id="5EDW3XF68_d" role="3$ytzL">
+                  <node concept="3clFbS" id="5EDW3XF68_e" role="2VODD2">
+                    <node concept="3clFbF" id="5EDW3XF68Ds" role="3cqZAp">
+                      <node concept="2OqwBi" id="5EDW3XF68P4" role="3clFbG">
+                        <node concept="1iwH7S" id="5EDW3XF68Dr" role="2Oq$k0" />
+                        <node concept="1iwH7d" id="5EDW3XF68Vd" role="2OqNvi">
+                          <ref role="1iwH7c" node="5EDW3XF64MJ" resolve="manifest" />
                         </node>
                       </node>
                     </node>
@@ -13804,109 +13314,10 @@
                 </node>
               </node>
             </node>
-            <node concept="1W57fq" id="NKt6ynYfSL" role="lGtFl">
-              <node concept="3IZrLx" id="NKt6ynYfSM" role="3IZSJc">
-                <node concept="3clFbS" id="NKt6ynYfSN" role="2VODD2">
-                  <node concept="3clFbF" id="NKt6ynYfSO" role="3cqZAp">
-                    <node concept="2OqwBi" id="NKt6ynYfSP" role="3clFbG">
-                      <node concept="2OqwBi" id="NKt6ynYfSQ" role="2Oq$k0">
-                        <node concept="2OqwBi" id="NKt6ynYfSR" role="2Oq$k0">
-                          <node concept="1iwH7S" id="NKt6ynYfSS" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="NKt6ynYfST" role="2OqNvi" />
-                        </node>
-                        <node concept="2RRcyG" id="NKt6ynYfSU" role="2OqNvi">
-                          <ref role="2RRcyH" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
-                        </node>
-                      </node>
-                      <node concept="3GX2aA" id="NKt6ynYfSV" role="2OqNvi" />
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="NKt6ynYfSW" role="3cqZAp">
-                    <node concept="2OqwBi" id="NKt6ynYfSX" role="3clFbG">
-                      <node concept="2OqwBi" id="NKt6ynYfSY" role="2Oq$k0">
-                        <node concept="2OqwBi" id="NKt6ynYfSZ" role="2Oq$k0">
-                          <node concept="1iwH7S" id="NKt6ynYfT0" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="NKt6ynYfT1" role="2OqNvi" />
-                        </node>
-                        <node concept="2RRcyG" id="NKt6ynYfT2" role="2OqNvi">
-                          <ref role="2RRcyH" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
-                        </node>
-                      </node>
-                      <node concept="3GX2aA" id="NKt6ynYfT3" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="gft3U" id="NKt6ynYfT4" role="UU_$l">
-                <node concept="10Nm6u" id="NKt6ynYfT5" role="gfFT$" />
-              </node>
-            </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="2hteS6ClnqJ" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2hteS6ClnBr" role="jymVt" />
-    <node concept="3clFb_" id="2hteS6ClnqM" role="jymVt">
-      <property role="TrG5h" value="createRuleManifest" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3uibUv" id="2hteS6ClnqN" role="3clF45">
-        <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-      </node>
-      <node concept="3Tm1VV" id="2hteS6ClnqO" role="1B3o_S" />
-      <node concept="3clFbS" id="2hteS6ClnqQ" role="3clF47">
-        <node concept="3cpWs6" id="NKt6ynYgs8" role="3cqZAp">
-          <node concept="2ShNRf" id="NKt6ynYgyH" role="3cqZAk">
-            <node concept="HV5vD" id="NKt6ynYgyI" role="2ShVmc">
-              <ref role="HV5vE" node="6w6CYIRhmZ8" resolve="RuleTemplateManifest" />
-              <node concept="1ZhdrF" id="NKt6ynYgyJ" role="lGtFl">
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
-                <property role="2qtEX8" value="classifier" />
-                <node concept="3$xsQk" id="NKt6ynYgyK" role="3$ytzL">
-                  <node concept="3clFbS" id="NKt6ynYgyL" role="2VODD2">
-                    <node concept="3clFbF" id="NKt6ynYgyM" role="3cqZAp">
-                      <node concept="2OqwBi" id="NKt6ynYgyN" role="3clFbG">
-                        <node concept="1iwH7S" id="NKt6ynYgyO" role="2Oq$k0" />
-                        <node concept="1iwH7d" id="NKt6ynYgyP" role="2OqNvi">
-                          <ref role="1iwH7c" node="2hteS6ClFWV" resolve="rule_manifest" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1W57fq" id="NKt6ynYgyQ" role="lGtFl">
-              <node concept="3IZrLx" id="NKt6ynYgyR" role="3IZSJc">
-                <node concept="3clFbS" id="NKt6ynYgyS" role="2VODD2">
-                  <node concept="3clFbF" id="NKt6ynYgyT" role="3cqZAp">
-                    <node concept="2OqwBi" id="NKt6ynYgyU" role="3clFbG">
-                      <node concept="2OqwBi" id="NKt6ynYgyV" role="2Oq$k0">
-                        <node concept="2OqwBi" id="NKt6ynYgyW" role="2Oq$k0">
-                          <node concept="1iwH7S" id="NKt6ynYgyX" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="NKt6ynYgyY" role="2OqNvi" />
-                        </node>
-                        <node concept="2SmgA7" id="NKt6ynYgyZ" role="2OqNvi">
-                          <node concept="chp4Y" id="NKt6ynYgz0" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3GX2aA" id="NKt6ynYgz1" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="gft3U" id="NKt6ynYgz2" role="UU_$l">
-                <node concept="10Nm6u" id="NKt6ynYgz3" role="gfFT$" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="2hteS6ClnqR" role="2AJF6D">
+      <node concept="2AHcQZ" id="5EDW3XF61YR" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
@@ -13950,7 +13361,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="NKt6yp1FJg" role="1zkMxy">
-      <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+      <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
       <node concept="1ZhdrF" id="78H58odLtQH" role="lGtFl">
         <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
         <property role="2qtEX8" value="classifier" />
@@ -17841,5 +17252,502 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="5EDW3XF62FH">
+    <property role="3GE5qa" value="aspect" />
+    <property role="TrG5h" value="Manifest" />
+    <node concept="2tJIrI" id="5EDW3XF62Ng" role="jymVt" />
+    <node concept="3clFbW" id="5EDW3XF6_7s" role="jymVt">
+      <node concept="3cqZAl" id="5EDW3XF6_7u" role="3clF45" />
+      <node concept="3Tm1VV" id="5EDW3XF6_7v" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XF6_7w" role="3clF47">
+        <node concept="3clFbF" id="5EDW3XF6_LR" role="3cqZAp">
+          <node concept="1rXfSq" id="5EDW3XF6_LQ" role="3clFbG">
+            <ref role="37wK5l" node="5EDW3XF6enC" resolve="init" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF6_Rc" role="jymVt" />
+    <node concept="3Tm1VV" id="5EDW3XF62FI" role="1B3o_S" />
+    <node concept="n94m4" id="5EDW3XF62FJ" role="lGtFl" />
+    <node concept="3uibUv" id="5EDW3XF62I7" role="1zkMxy">
+      <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+    </node>
+    <node concept="3clFb_" id="5EDW3XF62Nx" role="jymVt">
+      <property role="TrG5h" value="macroTables" />
+      <node concept="3vKaQO" id="5EDW3XF62Ny" role="3clF45">
+        <node concept="3uibUv" id="5EDW3XF62Nz" role="3O5elw">
+          <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5EDW3XF62N$" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XF62NA" role="3clF47">
+        <node concept="3clFbF" id="5EDW3XF69vZ" role="3cqZAp">
+          <node concept="37vLTw" id="5EDW3XF6d5m" role="3clFbG">
+            <ref role="3cqZAo" node="5EDW3XF6ble" resolve="macroTables" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5EDW3XF62NB" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF6pIq" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XF62NC" role="jymVt">
+      <property role="TrG5h" value="ruleTables" />
+      <node concept="3vKaQO" id="5EDW3XF62ND" role="3clF45">
+        <node concept="3uibUv" id="5EDW3XF62NE" role="3O5elw">
+          <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5EDW3XF62NF" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XF62NH" role="3clF47">
+        <node concept="3clFbF" id="5EDW3XF6qjj" role="3cqZAp">
+          <node concept="37vLTw" id="5EDW3XF6qji" role="3clFbG">
+            <ref role="3cqZAo" node="5EDW3XF6d9_" resolve="ruleTables" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5EDW3XF62NI" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF6qvP" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XF62NJ" role="jymVt">
+      <property role="TrG5h" value="queryTables" />
+      <node concept="3vKaQO" id="5EDW3XF62NK" role="3clF45">
+        <node concept="3uibUv" id="5EDW3XF62NL" role="3O5elw">
+          <ref role="3uigEE" to="i348:5EDW3XF608m" resolve="AbstractQueryTable" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5EDW3XF62NM" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XF62NO" role="3clF47">
+        <node concept="3SKdUt" id="5EDW3XF6x4a" role="3cqZAp">
+          <node concept="1PaTwC" id="5EDW3XF6x4b" role="3ndbpf">
+            <node concept="3oM_SD" id="5EDW3XF6x4d" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+          </node>
+        </node>
+        <node concept="YS8fn" id="5EDW3XF6wwI" role="3cqZAp">
+          <node concept="2ShNRf" id="5EDW3XF6wxq" role="YScLw">
+            <node concept="1pGfFk" id="5EDW3XF6x0O" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5EDW3XF62NP" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF6vVW" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XF6zkv" role="jymVt">
+      <property role="TrG5h" value="queryTemplates" />
+      <node concept="_YKpA" id="5EDW3XF6zkw" role="3clF45">
+        <node concept="3uibUv" id="5EDW3XF6zkx" role="_ZDj9">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5EDW3XF6zky" role="1B3o_S" />
+      <node concept="2AHcQZ" id="5EDW3XF6zk$" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
+      <node concept="3clFbS" id="5EDW3XF6zk_" role="3clF47">
+        <node concept="3clFbF" id="5EDW3XF6$ey" role="3cqZAp">
+          <node concept="37vLTw" id="5EDW3XF6$ex" role="3clFbG">
+            <ref role="3cqZAo" node="5EDW3XF6d9D" resolve="queryTemplates" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5EDW3XF6zkA" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF6zXt" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XF62NQ" role="jymVt">
+      <property role="TrG5h" value="analyses" />
+      <node concept="3Tm1VV" id="5EDW3XF62NS" role="1B3o_S" />
+      <node concept="3uibUv" id="5EDW3XF62NT" role="3clF45">
+        <ref role="3uigEE" to="i348:1H_6AUSXnyk" resolve="ProgramAnalysis" />
+      </node>
+      <node concept="3clFbS" id="5EDW3XF62NU" role="3clF47">
+        <node concept="3clFbF" id="5EDW3XF6$kS" role="3cqZAp">
+          <node concept="37vLTw" id="5EDW3XF6$kQ" role="3clFbG">
+            <ref role="3cqZAo" node="5EDW3XF6d9H" resolve="analyses" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5EDW3XF62NV" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF6frs" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XF6enC" role="jymVt">
+      <property role="TrG5h" value="init" />
+      <node concept="3cqZAl" id="5EDW3XF6enD" role="3clF45" />
+      <node concept="3Tm6S6" id="5EDW3XF6enE" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XF6enF" role="3clF47">
+        <node concept="9aQIb" id="5EDW3XF6lQ$" role="3cqZAp">
+          <node concept="3clFbS" id="5EDW3XF6lQA" role="9aQI4">
+            <node concept="3cpWs8" id="5EDW3XF6mH0" role="3cqZAp">
+              <node concept="3cpWsn" id="5EDW3XF6mH1" role="3cpWs9">
+                <property role="TrG5h" value="macroTables" />
+                <node concept="_YKpA" id="5EDW3XF6mH2" role="1tU5fm">
+                  <node concept="3uibUv" id="5EDW3XF6mH3" role="_ZDj9">
+                    <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="5EDW3XF6mH4" role="33vP2m">
+                  <node concept="Tc6Ow" id="5EDW3XF6mH5" role="2ShVmc">
+                    <node concept="3uibUv" id="5EDW3XF6mH6" role="HW$YZ">
+                      <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5EDW3XF6mH8" role="3cqZAp">
+              <node concept="2OqwBi" id="5EDW3XF6mH9" role="3clFbG">
+                <node concept="37vLTw" id="5EDW3XF6mHa" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5EDW3XF6mH1" resolve="macroTables" />
+                </node>
+                <node concept="TSZUe" id="5EDW3XF6mHb" role="2OqNvi">
+                  <node concept="2ShNRf" id="5EDW3XF6mHc" role="25WWJ7">
+                    <node concept="HV5vD" id="5EDW3XF6mHd" role="2ShVmc">
+                      <ref role="HV5vE" node="2N2MQGCMHqo" resolve="_MacroTable" />
+                      <node concept="1ZhdrF" id="5EDW3XF6mHe" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
+                        <property role="2qtEX8" value="classifier" />
+                        <node concept="3$xsQk" id="5EDW3XF6mHf" role="3$ytzL">
+                          <node concept="3clFbS" id="5EDW3XF6mHg" role="2VODD2">
+                            <node concept="3clFbF" id="5EDW3XF6mHh" role="3cqZAp">
+                              <node concept="2OqwBi" id="5EDW3XF6mHi" role="3clFbG">
+                                <node concept="1iwH7S" id="5EDW3XF6mHj" role="2Oq$k0" />
+                                <node concept="1iwH70" id="5EDW3XF6mHk" role="2OqNvi">
+                                  <ref role="1iwH77" node="2N2MQGCMWOf" resolve="macroTable_class" />
+                                  <node concept="30H73N" id="5EDW3XF6mHl" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1WS0z7" id="5EDW3XF6mHm" role="lGtFl">
+                <node concept="3JmXsc" id="5EDW3XF6mHn" role="3Jn$fo">
+                  <node concept="3clFbS" id="5EDW3XF6mHo" role="2VODD2">
+                    <node concept="3clFbF" id="5EDW3XF6mHp" role="3cqZAp">
+                      <node concept="2OqwBi" id="5EDW3XF6mHq" role="3clFbG">
+                        <node concept="2OqwBi" id="5EDW3XF6mHr" role="2Oq$k0">
+                          <node concept="1iwH7S" id="5EDW3XF6mHs" role="2Oq$k0" />
+                          <node concept="1r8y6K" id="5EDW3XF6mHt" role="2OqNvi" />
+                        </node>
+                        <node concept="2RRcyG" id="5EDW3XF6mHu" role="2OqNvi">
+                          <ref role="2RRcyH" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5EDW3XF6mHw" role="3cqZAp">
+              <node concept="37vLTI" id="5EDW3XF6n6l" role="3clFbG">
+                <node concept="2OqwBi" id="5EDW3XF6nnV" role="37vLTJ">
+                  <node concept="Xjq3P" id="5EDW3XF6n77" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="5EDW3XF6nwB" role="2OqNvi">
+                    <ref role="2Oxat5" node="5EDW3XF6ble" resolve="macroTables" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="5EDW3XF6okx" role="37vLTx">
+                  <node concept="37vLTw" id="5EDW3XF6mHx" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5EDW3XF6mH1" resolve="macroTables" />
+                  </node>
+                  <node concept="26Dbio" id="5EDW3XF6oYN" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="9aQIb" id="5EDW3XF6g63" role="3cqZAp">
+          <node concept="3clFbS" id="5EDW3XF6g65" role="9aQI4">
+            <node concept="3cpWs8" id="5EDW3XF6enL" role="3cqZAp">
+              <node concept="3cpWsn" id="5EDW3XF6enM" role="3cpWs9">
+                <property role="TrG5h" value="rtables" />
+                <node concept="_YKpA" id="5EDW3XF6enN" role="1tU5fm">
+                  <node concept="3uibUv" id="5EDW3XF6vrN" role="_ZDj9">
+                    <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="5EDW3XF6enP" role="33vP2m">
+                  <node concept="Tc6Ow" id="5EDW3XF6enQ" role="2ShVmc">
+                    <node concept="3uibUv" id="5EDW3XF6uQf" role="HW$YZ">
+                      <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5EDW3XF6enS" role="3cqZAp">
+              <node concept="2OqwBi" id="5EDW3XF6enT" role="3clFbG">
+                <node concept="37vLTw" id="5EDW3XF6enU" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5EDW3XF6enM" resolve="rtables" />
+                </node>
+                <node concept="TSZUe" id="5EDW3XF6enV" role="2OqNvi">
+                  <node concept="2ShNRf" id="5EDW3XF6enW" role="25WWJ7">
+                    <node concept="1pGfFk" id="5EDW3XF6enX" role="2ShVmc">
+                      <ref role="37wK5l" node="4MqhgXUhXXR" resolve="RulesListTemplateImpl" />
+                      <node concept="1ZhdrF" id="5EDW3XF6enY" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <property role="2qtEX8" value="baseMethodDeclaration" />
+                        <node concept="3$xsQk" id="5EDW3XF6enZ" role="3$ytzL">
+                          <node concept="3clFbS" id="5EDW3XF6eo0" role="2VODD2">
+                            <node concept="3clFbF" id="5EDW3XF6eo1" role="3cqZAp">
+                              <node concept="2OqwBi" id="5EDW3XF6eo2" role="3clFbG">
+                                <node concept="1iwH7S" id="5EDW3XF6eo3" role="2Oq$k0" />
+                                <node concept="1iwH70" id="5EDW3XF6eo4" role="2OqNvi">
+                                  <ref role="1iwH77" node="7P_FdVQ488b" resolve="handler_template_constructor" />
+                                  <node concept="30H73N" id="5EDW3XF6eo5" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1WS0z7" id="5EDW3XF6eo6" role="lGtFl">
+                <node concept="3JmXsc" id="5EDW3XF6eo7" role="3Jn$fo">
+                  <node concept="3clFbS" id="5EDW3XF6eo8" role="2VODD2">
+                    <node concept="3clFbF" id="5EDW3XF6eo9" role="3cqZAp">
+                      <node concept="2OqwBi" id="5EDW3XF6eoa" role="3clFbG">
+                        <node concept="2OqwBi" id="5EDW3XF6eob" role="2Oq$k0">
+                          <node concept="1iwH7S" id="5EDW3XF6eoc" role="2Oq$k0" />
+                          <node concept="1r8y6K" id="5EDW3XF6eod" role="2OqNvi" />
+                        </node>
+                        <node concept="2SmgA7" id="5EDW3XF6eoe" role="2OqNvi">
+                          <node concept="chp4Y" id="5EDW3XF6eof" role="1dBWTz">
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5EDW3XF6eog" role="3cqZAp">
+              <node concept="37vLTI" id="5EDW3XF6eoh" role="3clFbG">
+                <node concept="2OqwBi" id="5EDW3XF6eoi" role="37vLTx">
+                  <node concept="37vLTw" id="5EDW3XF6eoj" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5EDW3XF6enM" resolve="rtables" />
+                  </node>
+                  <node concept="26Dbio" id="5EDW3XF6eok" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="5EDW3XF6eol" role="37vLTJ">
+                  <node concept="Xjq3P" id="5EDW3XF6eom" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="5EDW3XF6gXe" role="2OqNvi">
+                    <ref role="2Oxat5" node="5EDW3XF6d9_" resolve="ruleTables" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="9aQIb" id="5EDW3XF6i5h" role="3cqZAp">
+          <node concept="3clFbS" id="5EDW3XF6i5j" role="9aQI4">
+            <node concept="3cpWs8" id="5EDW3XF6eoq" role="3cqZAp">
+              <node concept="3cpWsn" id="5EDW3XF6eor" role="3cpWs9">
+                <property role="TrG5h" value="qtpl" />
+                <node concept="_YKpA" id="5EDW3XF6eos" role="1tU5fm">
+                  <node concept="3uibUv" id="5EDW3XF6eot" role="_ZDj9">
+                    <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="5EDW3XF6eou" role="33vP2m">
+                  <node concept="Tc6Ow" id="5EDW3XF6eov" role="2ShVmc">
+                    <node concept="3uibUv" id="5EDW3XF6eow" role="HW$YZ">
+                      <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5EDW3XF6eox" role="3cqZAp">
+              <node concept="2OqwBi" id="5EDW3XF6eoy" role="3clFbG">
+                <node concept="37vLTw" id="5EDW3XF6eoz" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5EDW3XF6eor" resolve="qtpl" />
+                </node>
+                <node concept="TSZUe" id="5EDW3XF6eo$" role="2OqNvi">
+                  <node concept="2ShNRf" id="5EDW3XF6eo_" role="25WWJ7">
+                    <node concept="1pGfFk" id="5EDW3XF6eoA" role="2ShVmc">
+                      <ref role="37wK5l" node="6OXbTD$juGj" resolve="QueryTemplateImpl" />
+                      <node concept="1ZhdrF" id="5EDW3XF6eoB" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <property role="2qtEX8" value="baseMethodDeclaration" />
+                        <node concept="3$xsQk" id="5EDW3XF6eoC" role="3$ytzL">
+                          <node concept="3clFbS" id="5EDW3XF6eoD" role="2VODD2">
+                            <node concept="3clFbF" id="5EDW3XF6eoE" role="3cqZAp">
+                              <node concept="2OqwBi" id="5EDW3XF6eoF" role="3clFbG">
+                                <node concept="1iwH7S" id="5EDW3XF6eoG" role="2Oq$k0" />
+                                <node concept="1iwH70" id="5EDW3XF6eoH" role="2OqNvi">
+                                  <ref role="1iwH77" node="6OXbTD$ko7g" resolve="query_constructor" />
+                                  <node concept="30H73N" id="5EDW3XF6eoI" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1WS0z7" id="5EDW3XF6eoJ" role="lGtFl">
+                <node concept="3JmXsc" id="5EDW3XF6eoK" role="3Jn$fo">
+                  <node concept="3clFbS" id="5EDW3XF6eoL" role="2VODD2">
+                    <node concept="3clFbF" id="5EDW3XF6eoM" role="3cqZAp">
+                      <node concept="2OqwBi" id="5EDW3XF6eoN" role="3clFbG">
+                        <node concept="2OqwBi" id="5EDW3XF6eoO" role="2Oq$k0">
+                          <node concept="1iwH7S" id="5EDW3XF6eoP" role="2Oq$k0" />
+                          <node concept="1r8y6K" id="5EDW3XF6eoQ" role="2OqNvi" />
+                        </node>
+                        <node concept="2SmgA7" id="5EDW3XF6eoR" role="2OqNvi">
+                          <node concept="chp4Y" id="5EDW3XF6eoS" role="1dBWTz">
+                            <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5EDW3XF6eoT" role="3cqZAp">
+              <node concept="37vLTI" id="5EDW3XF6eoU" role="3clFbG">
+                <node concept="2OqwBi" id="5EDW3XF6eoV" role="37vLTx">
+                  <node concept="37vLTw" id="5EDW3XF6eoW" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5EDW3XF6eor" resolve="qtpl" />
+                  </node>
+                  <node concept="26Dbio" id="5EDW3XF6eoX" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="5EDW3XF6eoY" role="37vLTJ">
+                  <node concept="Xjq3P" id="5EDW3XF6eoZ" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="5EDW3XF6ep0" role="2OqNvi">
+                    <ref role="2Oxat5" node="5EDW3XF6d9D" resolve="queryTemplates" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="9aQIb" id="5EDW3XF6iYq" role="3cqZAp">
+          <node concept="3clFbS" id="5EDW3XF6iYs" role="9aQI4">
+            <node concept="3cpWs8" id="5EDW3XF6ep6" role="3cqZAp">
+              <node concept="3cpWsn" id="5EDW3XF6ep7" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5EDW3XF6ep8" role="1tU5fm">
+                  <ref role="3uigEE" node="7m2UX3UIaN5" resolve="BasicProgramAnalysisImpl" />
+                </node>
+                <node concept="2ShNRf" id="5EDW3XF6ep9" role="33vP2m">
+                  <node concept="1pGfFk" id="5EDW3XF6epa" role="2ShVmc">
+                    <ref role="37wK5l" node="2WtKs4tYohZ" resolve="BasicProgramAnalysisImpl" />
+                    <node concept="1ZhdrF" id="5EDW3XF6epb" role="lGtFl">
+                      <property role="2qtEX8" value="baseMethodDeclaration" />
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                      <node concept="3$xsQk" id="5EDW3XF6epc" role="3$ytzL">
+                        <node concept="3clFbS" id="5EDW3XF6epd" role="2VODD2">
+                          <node concept="3clFbF" id="5EDW3XF6epe" role="3cqZAp">
+                            <node concept="2OqwBi" id="5EDW3XF6epf" role="3clFbG">
+                              <node concept="1iwH7S" id="5EDW3XF6epg" role="2Oq$k0" />
+                              <node concept="1iwH7d" id="5EDW3XF6eph" role="2OqNvi">
+                                <ref role="1iwH7c" node="2WtKs4tYtzV" resolve="basic_analysis_ctor" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5EDW3XF6epi" role="3cqZAp">
+              <node concept="2OqwBi" id="5EDW3XF6epj" role="3clFbG">
+                <node concept="37vLTw" id="5EDW3XF6epk" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5EDW3XF6ep7" resolve="builder" />
+                </node>
+                <node concept="liA8E" id="5EDW3XF6epl" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:1H_6AUSXuxC" resolve="run" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5EDW3XF6epm" role="3cqZAp">
+              <node concept="37vLTI" id="5EDW3XF6epn" role="3clFbG">
+                <node concept="37vLTw" id="5EDW3XF6epo" role="37vLTx">
+                  <ref role="3cqZAo" node="5EDW3XF6ep7" resolve="builder" />
+                </node>
+                <node concept="2OqwBi" id="5EDW3XF6epp" role="37vLTJ">
+                  <node concept="Xjq3P" id="5EDW3XF6epq" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="5EDW3XF6epr" role="2OqNvi">
+                    <ref role="2Oxat5" node="5EDW3XF6d9H" resolve="analyses" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF6cg_" role="jymVt" />
+    <node concept="312cEg" id="5EDW3XF6ble" role="jymVt">
+      <property role="TrG5h" value="macroTables" />
+      <node concept="3Tm6S6" id="5EDW3XF6blb" role="1B3o_S" />
+      <node concept="_YKpA" id="5EDW3XF6blc" role="1tU5fm">
+        <node concept="3uibUv" id="5EDW3XF6bld" role="_ZDj9">
+          <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="5EDW3XF6d9_" role="jymVt">
+      <property role="TrG5h" value="ruleTables" />
+      <node concept="3Tm6S6" id="5EDW3XF6d9A" role="1B3o_S" />
+      <node concept="_YKpA" id="5EDW3XF6d9B" role="1tU5fm">
+        <node concept="3uibUv" id="5EDW3XF6qLZ" role="_ZDj9">
+          <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF6dvu" role="jymVt" />
+    <node concept="312cEg" id="5EDW3XF6d9D" role="jymVt">
+      <property role="TrG5h" value="queryTemplates" />
+      <node concept="3Tm6S6" id="5EDW3XF6d9E" role="1B3o_S" />
+      <node concept="_YKpA" id="5EDW3XF6d9F" role="1tU5fm">
+        <node concept="3uibUv" id="5EDW3XF6d9G" role="_ZDj9">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="z59LJ" id="5EDW3XF6dZg" role="lGtFl">
+        <node concept="TZ5HA" id="5EDW3XF6dZh" role="TZ5H$">
+          <node concept="1dT_AC" id="5EDW3XF6dZi" role="1dT_Ay">
+            <property role="1dT_AB" value="FIXME " />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="5EDW3XF6d9H" role="jymVt">
+      <property role="TrG5h" value="analyses" />
+      <node concept="3Tm6S6" id="5EDW3XF6d9I" role="1B3o_S" />
+      <node concept="3uibUv" id="5EDW3XF6d9J" role="1tU5fm">
+        <ref role="3uigEE" node="7m2UX3UIaN5" resolve="BasicProgramAnalysisImpl" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index f5d06e16..b1960b5c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -3365,58 +3365,12 @@
   <node concept="312cEu" id="6fdr4UgftiG">
     <property role="TrG5h" value="RuleTemplateIndex" />
     <node concept="2tJIrI" id="20Ay2VeQfgH" role="jymVt" />
-    <node concept="2YIFZL" id="7P_FdVPIPE$" role="jymVt">
-      <property role="TrG5h" value="withManifests" />
-      <node concept="37vLTG" id="7P_FdVPISMR" role="3clF46">
-        <property role="TrG5h" value="manifests" />
-        <node concept="A3Dl8" id="7P_FdVPISMS" role="1tU5fm">
-          <node concept="3uibUv" id="7P_FdVPISMT" role="A3Ik2">
-            <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="7P_FdVPISEg" role="3clF45">
-        <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVPIPEB" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPIPEC" role="3clF47">
-        <node concept="3cpWs8" id="7P_FdVPITOd" role="3cqZAp">
-          <node concept="3cpWsn" id="7P_FdVPITOe" role="3cpWs9">
-            <property role="TrG5h" value="index" />
-            <node concept="3uibUv" id="7P_FdVPITOc" role="1tU5fm">
-              <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
-            </node>
-            <node concept="2ShNRf" id="7P_FdVPITOf" role="33vP2m">
-              <node concept="1pGfFk" id="7P_FdVPITOg" role="2ShVmc">
-                <ref role="37wK5l" node="7P_FdVPIH2n" resolve="RuleTemplateIndex" />
-                <node concept="37vLTw" id="7WKNeR94iqD" role="37wK5m">
-                  <ref role="3cqZAo" node="7P_FdVPISMR" resolve="manifests" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7P_FdVPITWo" role="3cqZAp">
-          <node concept="37vLTw" id="7P_FdVPITWm" role="3clFbG">
-            <ref role="3cqZAo" node="7P_FdVPITOe" resolve="index" />
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="7P_FdVPIUAE" role="lGtFl">
-        <node concept="TZ5HA" id="7P_FdVPIUDa" role="TZ5H$">
-          <node concept="1dT_AC" id="7P_FdVPIUDb" role="1dT_Ay">
-            <property role="1dT_AB" value="The list of manifests must be sorted in the topological order." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7P_FdVPIMz3" role="jymVt" />
     <node concept="3clFbW" id="7P_FdVPIH2n" role="jymVt">
       <node concept="37vLTG" id="7WKNeR94ikN" role="3clF46">
         <property role="TrG5h" value="manifests" />
         <node concept="A3Dl8" id="7WKNeR94ikO" role="1tU5fm">
-          <node concept="3uibUv" id="7WKNeR94ikP" role="A3Ik2">
-            <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+          <node concept="3uibUv" id="5EDW3XFuISP" role="A3Ik2">
+            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
           </node>
         </node>
       </node>
@@ -3425,7 +3379,7 @@
       <node concept="3clFbS" id="7P_FdVPIH2r" role="3clF47">
         <node concept="3clFbF" id="7WKNeR96aA4" role="3cqZAp">
           <node concept="1rXfSq" id="7WKNeR96aA3" role="3clFbG">
-            <ref role="37wK5l" node="7DvO2Mandqg" resolve="initWithManifests" />
+            <ref role="37wK5l" node="7DvO2Mandqg" resolve="init" />
             <node concept="37vLTw" id="7WKNeR96aIu" role="37wK5m">
               <ref role="3cqZAo" node="7WKNeR94ikN" resolve="manifests" />
             </node>
@@ -3450,7 +3404,7 @@
       </node>
       <node concept="A3Dl8" id="6fdr4UgfxqC" role="3clF45">
         <node concept="3uibUv" id="1ffsG7c4ezn" role="A3Ik2">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
           <node concept="3qUE_q" id="7XdbJdyRKIf" role="11_B2D">
             <node concept="3uibUv" id="7XdbJdyRMGp" role="3qUE_r">
               <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3465,7 +3419,7 @@
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="12yN8DyvAUd" role="1tU5fm">
               <node concept="3uibUv" id="6tPOoeTaEit" role="_ZDj9">
-                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                 <node concept="3qUE_q" id="6tPOoeTaEiu" role="11_B2D">
                   <node concept="3uibUv" id="6tPOoeTaEiv" role="3qUE_r">
                     <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3476,7 +3430,7 @@
             <node concept="2ShNRf" id="12yN8DyvD8g" role="33vP2m">
               <node concept="Tc6Ow" id="12yN8DyvD72" role="2ShVmc">
                 <node concept="3uibUv" id="6tPOoeTaGDL" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                   <node concept="3qUE_q" id="6tPOoeTaGDM" role="11_B2D">
                     <node concept="3uibUv" id="6tPOoeTaGDN" role="3qUE_r">
                       <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3611,7 +3565,7 @@
                     <property role="TrG5h" value="matching" />
                     <node concept="3vKaQO" id="12yN8DyD$_b" role="1tU5fm">
                       <node concept="3uibUv" id="7XdbJdyRSmQ" role="3O5elw">
-                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                         <node concept="3qUE_q" id="7XdbJdyRSmR" role="11_B2D">
                           <node concept="3uibUv" id="7XdbJdyRSmS" role="3qUE_r">
                             <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3672,7 +3626,7 @@
                   <node concept="3cpWsn" id="12yN8DyDOdM" role="1Duv9x">
                     <property role="TrG5h" value="tpl" />
                     <node concept="3uibUv" id="6tPOoeTaJl8" role="1tU5fm">
-                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                       <node concept="3qUE_q" id="6tPOoeTaJl9" role="11_B2D">
                         <node concept="3uibUv" id="6tPOoeTaJla" role="3qUE_r">
                           <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3727,7 +3681,7 @@
       <property role="TrG5h" value="allRuleTemplatesWithNoInput" />
       <node concept="A3Dl8" id="5NuEpF1qn9B" role="3clF45">
         <node concept="3uibUv" id="7XdbJdyRWsv" role="A3Ik2">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
           <node concept="3qUE_q" id="7XdbJdyRWsw" role="11_B2D">
             <node concept="3uibUv" id="7XdbJdyRWsx" role="3qUE_r">
               <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3742,7 +3696,7 @@
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="5NuEpF1qn9H" role="1tU5fm">
               <node concept="3uibUv" id="6tPOoeTaMF9" role="_ZDj9">
-                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                 <node concept="3qUE_q" id="6tPOoeTaMFa" role="11_B2D">
                   <node concept="3uibUv" id="6tPOoeTaMFb" role="3qUE_r">
                     <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3753,7 +3707,7 @@
             <node concept="2ShNRf" id="5NuEpF1qn9J" role="33vP2m">
               <node concept="Tc6Ow" id="5NuEpF1qn9K" role="2ShVmc">
                 <node concept="3uibUv" id="6tPOoeTaOFc" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                   <node concept="3qUE_q" id="6tPOoeTaOFd" role="11_B2D">
                     <node concept="3uibUv" id="6tPOoeTaOFe" role="3qUE_r">
                       <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3772,7 +3726,7 @@
                 <property role="TrG5h" value="matching" />
                 <node concept="3vKaQO" id="5NuEpF1qnan" role="1tU5fm">
                   <node concept="3uibUv" id="6tPOoeTaQxm" role="3O5elw">
-                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                     <node concept="3qUE_q" id="6tPOoeTaQxn" role="11_B2D">
                       <node concept="3uibUv" id="6tPOoeTaQxo" role="3qUE_r">
                         <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3807,7 +3761,7 @@
               <node concept="3cpWsn" id="5NuEpF1qnaO" role="1Duv9x">
                 <property role="TrG5h" value="tpl" />
                 <node concept="3uibUv" id="6tPOoeTaR5p" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                   <node concept="3qUE_q" id="6tPOoeTaR5q" role="11_B2D">
                     <node concept="3uibUv" id="6tPOoeTaR5r" role="3qUE_r">
                       <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -3890,12 +3844,12 @@
     </node>
     <node concept="2tJIrI" id="429xoypKCy4" role="jymVt" />
     <node concept="3clFb_" id="7DvO2Mandqg" role="jymVt">
-      <property role="TrG5h" value="initWithManifests" />
+      <property role="TrG5h" value="init" />
       <node concept="37vLTG" id="7P_FdVPGxfv" role="3clF46">
         <property role="TrG5h" value="ruleTemplateManifests" />
         <node concept="A3Dl8" id="7P_FdVPGxfw" role="1tU5fm">
-          <node concept="3uibUv" id="7P_FdVPGxfx" role="A3Ik2">
-            <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+          <node concept="3uibUv" id="5EDW3XFuIWi" role="A3Ik2">
+            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
           </node>
         </node>
       </node>
@@ -3919,8 +3873,8 @@
                             <node concept="37vLTw" id="7P_FdVPPs$d" role="2Oq$k0">
                               <ref role="3cqZAo" node="7P_FdVPIjy4" resolve="it" />
                             </node>
-                            <node concept="liA8E" id="7P_FdVPPsZB" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:4MqhgXUaiLz" resolve="rulesListTemplates" />
+                            <node concept="liA8E" id="5EDW3XFuJga" role="2OqNvi">
+                              <ref role="37wK5l" to="fqlx:4MqhgXUaiLz" resolve="ruleTables" />
                             </node>
                           </node>
                           <node concept="3zZkjj" id="7WKNeR97rb9" role="2OqNvi">
@@ -3961,10 +3915,10 @@
     <node concept="3clFb_" id="7P_FdVPHmHU" role="jymVt">
       <property role="TrG5h" value="initWithTemplates" />
       <node concept="37vLTG" id="7P_FdVPHmOS" role="3clF46">
-        <property role="TrG5h" value="handlingTemplates" />
+        <property role="TrG5h" value="ruleTables" />
         <node concept="A3Dl8" id="7P_FdVPHCUR" role="1tU5fm">
-          <node concept="3uibUv" id="6tPOoeT9Wkd" role="A3Ik2">
-            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RulesListTemplate" />
+          <node concept="3uibUv" id="5EDW3XFv7Lh" role="A3Ik2">
+            <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
           </node>
         </node>
       </node>
@@ -3975,7 +3929,7 @@
           <node concept="1rXfSq" id="7DvO2MaBQGO" role="3clFbG">
             <ref role="37wK5l" node="12yN8Dyvyy6" resolve="collectTemplates" />
             <node concept="37vLTw" id="6tPOoeTaawu" role="37wK5m">
-              <ref role="3cqZAo" node="7P_FdVPHmOS" resolve="handlingTemplates" />
+              <ref role="3cqZAo" node="7P_FdVPHmOS" resolve="ruleTables" />
             </node>
           </node>
         </node>
@@ -4004,10 +3958,10 @@
     <node concept="3clFb_" id="12yN8Dyvyy6" role="jymVt">
       <property role="TrG5h" value="collectTemplates" />
       <node concept="37vLTG" id="6tPOoeTa2e3" role="3clF46">
-        <property role="TrG5h" value="handlerTemplates" />
+        <property role="TrG5h" value="ruleTables" />
         <node concept="A3Dl8" id="6tPOoeTa566" role="1tU5fm">
-          <node concept="3uibUv" id="6tPOoeTa5$s" role="A3Ik2">
-            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RulesListTemplate" />
+          <node concept="3uibUv" id="5EDW3XFv8cS" role="A3Ik2">
+            <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
           </node>
         </node>
       </node>
@@ -4058,7 +4012,7 @@
                     <property role="TrG5h" value="stageTemplate" />
                     <node concept="3vKaQO" id="4MqhgXUaPfW" role="1tU5fm">
                       <node concept="3uibUv" id="7XdbJdySsFg" role="3O5elw">
-                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                         <node concept="3qUE_q" id="7XdbJdySsFh" role="11_B2D">
                           <node concept="3uibUv" id="7XdbJdySsFi" role="3qUE_r">
                             <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -4090,7 +4044,7 @@
                             <node concept="2ShNRf" id="4MqhgXUaPg9" role="37vLTx">
                               <node concept="Tc6Ow" id="4MqhgXUaPga" role="2ShVmc">
                                 <node concept="3uibUv" id="6tPOoeTaAOM" role="HW$YZ">
-                                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                                   <node concept="3qUE_q" id="6tPOoeTaAON" role="11_B2D">
                                     <node concept="3uibUv" id="6tPOoeTaAOO" role="3qUE_r">
                                       <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -4156,7 +4110,7 @@
                             <ref role="3cqZAo" node="4MqhgXUaONz" resolve="ruleTemplate" />
                           </node>
                           <node concept="3uibUv" id="3IIf9OAyhfn" role="10QFUM">
-                            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                             <node concept="3qUE_q" id="3IIf9OAyXlP" role="11_B2D">
                               <node concept="3uibUv" id="3IIf9OAyXlQ" role="3qUE_r">
                                 <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -4197,7 +4151,7 @@
             </node>
           </node>
           <node concept="37vLTw" id="6tPOoeTa7ji" role="1DdaDG">
-            <ref role="3cqZAo" node="6tPOoeTa2e3" resolve="handlerTemplates" />
+            <ref role="3cqZAo" node="6tPOoeTa2e3" resolve="ruleTables" />
           </node>
         </node>
       </node>
@@ -4256,7 +4210,7 @@
         <node concept="3bZ5Sz" id="YGS68MZPLr" role="3rvQeY" />
         <node concept="3vKaQO" id="12yN8DyDzne" role="3rvSg0">
           <node concept="3uibUv" id="7XdbJdyRSXd" role="3O5elw">
-            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
             <node concept="3qUE_q" id="7XdbJdyRSXe" role="11_B2D">
               <node concept="3uibUv" id="7XdbJdyRSXf" role="3qUE_r">
                 <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -4270,7 +4224,7 @@
           <node concept="3bZ5Sz" id="YGS68MZQMl" role="3rHrn6" />
           <node concept="3vKaQO" id="429xoypKEop" role="3rHtpV">
             <node concept="3uibUv" id="6tPOoeTa_2l" role="3O5elw">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
               <node concept="3qUE_q" id="6tPOoeTa_2m" role="11_B2D">
                 <node concept="3uibUv" id="6tPOoeTa_2n" role="3qUE_r">
                   <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -4401,26 +4355,6 @@
       <node concept="3cqZAl" id="1hX44vNlSOM" role="3clF45" />
       <node concept="3Tmbuc" id="7DvO2MamUIO" role="1B3o_S" />
       <node concept="3clFbS" id="1hX44vNlSOO" role="3clF47">
-        <node concept="3clFbF" id="1hX44vNniCn" role="3cqZAp">
-          <node concept="37vLTI" id="1hX44vNniCp" role="3clFbG">
-            <node concept="2OqwBi" id="1hX44vNniCt" role="37vLTJ">
-              <node concept="Xjq3P" id="1hX44vNniCw" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1hX44vNniCs" role="2OqNvi">
-                <ref role="2Oxat5" node="1hX44vNniCj" resolve="macroManifests" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="7DvO2MamVt1" role="37vLTx">
-              <node concept="Tc6Ow" id="7DvO2MamVs$" role="2ShVmc">
-                <node concept="3uibUv" id="7DvO2MamVs_" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
-                </node>
-                <node concept="37vLTw" id="7DvO2MamWbg" role="I$8f6">
-                  <ref role="3cqZAo" node="7DvO2MamV5v" resolve="macroManifests" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="2Y70AYEegr_" role="3cqZAp">
           <node concept="37vLTI" id="2Y70AYEegrB" role="3clFbG">
             <node concept="2OqwBi" id="2Y70AYEegQP" role="37vLTJ">
@@ -4436,7 +4370,10 @@
         </node>
         <node concept="3clFbF" id="1hX44vNnpfY" role="3cqZAp">
           <node concept="1rXfSq" id="1hX44vNnpfX" role="3clFbG">
-            <ref role="37wK5l" node="1hX44vNnpfT" resolve="collectMacroTables" />
+            <ref role="37wK5l" node="1hX44vNnpfT" resolve="init" />
+            <node concept="37vLTw" id="5EDW3XFu$rL" role="37wK5m">
+              <ref role="3cqZAo" node="7DvO2MamV5v" resolve="manifests" />
+            </node>
           </node>
         </node>
       </node>
@@ -4448,10 +4385,10 @@
         </node>
       </node>
       <node concept="37vLTG" id="7DvO2MamV5v" role="3clF46">
-        <property role="TrG5h" value="macroManifests" />
+        <property role="TrG5h" value="manifests" />
         <node concept="A3Dl8" id="7DvO2MamV5t" role="1tU5fm">
-          <node concept="3uibUv" id="7DvO2MamV75" role="A3Ik2">
-            <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+          <node concept="3uibUv" id="5EDW3XFusk9" role="A3Ik2">
+            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
           </node>
         </node>
       </node>
@@ -4479,197 +4416,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1hX44vNlSO3" role="jymVt" />
-    <node concept="3clFb_" id="4nxCIBqy$vr" role="jymVt">
-      <property role="TrG5h" value="macroTemplate" />
-      <node concept="37vLTG" id="4nxCIBqyARP" role="3clF46">
-        <property role="TrG5h" value="concept" />
-        <node concept="3bZ5Sz" id="4nxCIBqyBgc" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="4nxCIBqy_HE" role="3clF45">
-        <ref role="3uigEE" to="i348:1hX44vNnjJ$" resolve="MacroTemplate" />
-        <node concept="16syzq" id="1eKXYsjIcB2" role="11_B2D">
-          <ref role="16sUi3" node="1eKXYsjIb$d" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4nxCIBqy$vu" role="1B3o_S" />
-      <node concept="3clFbS" id="4nxCIBqy$vv" role="3clF47">
-        <node concept="2Gpval" id="6UWSvq5a0yX" role="3cqZAp">
-          <node concept="3clFbS" id="6UWSvq5a00Q" role="2LFqv$">
-            <node concept="3cpWs8" id="6UWSvq5a3OB" role="3cqZAp">
-              <node concept="3cpWsn" id="6UWSvq5a3OC" role="3cpWs9">
-                <property role="TrG5h" value="macroTemplate" />
-                <node concept="3uibUv" id="6UWSvq5a3On" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1hX44vNnjJ$" resolve="MacroTemplate" />
-                  <node concept="16syzq" id="6UWSvq5a3Oq" role="11_B2D">
-                    <ref role="16sUi3" node="1eKXYsjIb$d" resolve="T" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="6UWSvq5a3OD" role="33vP2m">
-                  <node concept="2GrUjf" id="6UWSvq5a3OE" role="2Oq$k0">
-                    <ref role="2Gs0qQ" node="6UWSvq5a0zl" resolve="macroTable" />
-                  </node>
-                  <node concept="liA8E" id="6UWSvq5a3OF" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4KRwoelAtxl" resolve="macroTemplate" />
-                    <node concept="37vLTw" id="6UWSvq5a3OG" role="37wK5m">
-                      <ref role="3cqZAo" node="4nxCIBqyARP" resolve="concept" />
-                    </node>
-                    <node concept="16syzq" id="6UWSvq5a3OH" role="3PaCim">
-                      <ref role="16sUi3" node="1eKXYsjIb$d" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="6UWSvq5a1iY" role="3cqZAp">
-              <node concept="3y3z36" id="6UWSvq5a4w2" role="3clFbw">
-                <node concept="10Nm6u" id="6UWSvq5a4EQ" role="3uHU7w" />
-                <node concept="37vLTw" id="6UWSvq5a3OI" role="3uHU7B">
-                  <ref role="3cqZAo" node="6UWSvq5a3OC" resolve="macroTemplate" />
-                </node>
-              </node>
-              <node concept="3clFbS" id="6UWSvq5a1j0" role="3clFbx">
-                <node concept="3cpWs6" id="6UWSvq5a4FK" role="3cqZAp">
-                  <node concept="37vLTw" id="6UWSvq5at_n" role="3cqZAk">
-                    <ref role="3cqZAo" node="6UWSvq5a3OC" resolve="macroTemplate" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="6UWSvq5a00W" role="2GsD0m">
-            <ref role="3cqZAo" node="4JJCDImRYzW" resolve="macroTables" />
-          </node>
-          <node concept="2GrKxI" id="6UWSvq5a0zl" role="2Gsz3X">
-            <property role="TrG5h" value="macroTable" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="5itBwM7VNmm" role="3cqZAp">
-          <node concept="1rXfSq" id="5itBwM7VKAH" role="3clFbG">
-            <ref role="37wK5l" node="5itBwM7VKAh" resolve="reportFailure" />
-            <node concept="3cpWs3" id="5itBwM7VO8_" role="37wK5m">
-              <node concept="3cpWs3" id="5itBwM7VO8A" role="3uHU7B">
-                <node concept="Xl_RD" id="5itBwM7VO8B" role="3uHU7B">
-                  <property role="Xl_RC" value="no macro template for concept \&quot;" />
-                </node>
-                <node concept="37vLTw" id="5itBwM7VO8C" role="3uHU7w">
-                  <ref role="3cqZAo" node="4nxCIBqyARP" resolve="concept" />
-                </node>
-              </node>
-              <node concept="Xl_RD" id="5itBwM7VO8D" role="3uHU7w">
-                <property role="Xl_RC" value="\&quot;" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5itBwM7VNQq" role="3cqZAp">
-          <node concept="10Nm6u" id="5itBwM7VNQo" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="16euLQ" id="1eKXYsjIb$d" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="1eKXYsjIcrC" role="3ztrMU">
-          <ref role="3uigEE" to="i348:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="5itBwM7VLgc" role="jymVt" />
-    <node concept="3clFb_" id="6UWSvq4Qqe$" role="jymVt">
-      <property role="TrG5h" value="macroTemplate" />
-      <node concept="37vLTG" id="4MEOIDEhHGm" role="3clF46">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="5yr01fDuOwL" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="6UWSvq4QqeB" role="3clF45">
-        <ref role="3uigEE" to="i348:1hX44vNnjJ$" resolve="MacroTemplate" />
-        <node concept="16syzq" id="6UWSvq4QqeC" role="11_B2D">
-          <ref role="16sUi3" node="6UWSvq4QqeP" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6UWSvq4QqeD" role="1B3o_S" />
-      <node concept="3clFbS" id="6UWSvq4QqeE" role="3clF47">
-        <node concept="2Gpval" id="6UWSvq5a9vj" role="3cqZAp">
-          <node concept="3clFbS" id="6UWSvq5a9vk" role="2LFqv$">
-            <node concept="3cpWs8" id="6UWSvq5a9vl" role="3cqZAp">
-              <node concept="3cpWsn" id="6UWSvq5a9vm" role="3cpWs9">
-                <property role="TrG5h" value="macroTemplate" />
-                <node concept="3uibUv" id="6UWSvq5a9vn" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1hX44vNnjJ$" resolve="MacroTemplate" />
-                  <node concept="16syzq" id="6UWSvq5a9vo" role="11_B2D">
-                    <ref role="16sUi3" node="6UWSvq4QqeP" resolve="T" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="6UWSvq5a9vp" role="33vP2m">
-                  <node concept="2GrUjf" id="6UWSvq5a9vq" role="2Oq$k0">
-                    <ref role="2Gs0qQ" node="6UWSvq5a9vA" resolve="macroTable" />
-                  </node>
-                  <node concept="liA8E" id="6UWSvq5a9vr" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:5itBwM8SJDJ" resolve="macroTemplate" />
-                    <node concept="37vLTw" id="6UWSvq5aasz" role="37wK5m">
-                      <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="templateRef" />
-                    </node>
-                    <node concept="16syzq" id="6UWSvq5a9vt" role="3PaCim">
-                      <ref role="16sUi3" node="6UWSvq4QqeP" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="6UWSvq5a9vu" role="3cqZAp">
-              <node concept="3y3z36" id="6UWSvq5a9vv" role="3clFbw">
-                <node concept="10Nm6u" id="6UWSvq5a9vw" role="3uHU7w" />
-                <node concept="37vLTw" id="6UWSvq5a9vx" role="3uHU7B">
-                  <ref role="3cqZAo" node="6UWSvq5a9vm" resolve="macroTemplate" />
-                </node>
-              </node>
-              <node concept="3clFbS" id="6UWSvq5a9vy" role="3clFbx">
-                <node concept="3cpWs6" id="6UWSvq5a9vz" role="3cqZAp">
-                  <node concept="37vLTw" id="6UWSvq5auEi" role="3cqZAk">
-                    <ref role="3cqZAo" node="6UWSvq5a9vm" resolve="macroTemplate" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="6UWSvq5a9v_" role="2GsD0m">
-            <ref role="3cqZAo" node="4JJCDImRYzW" resolve="macroTables" />
-          </node>
-          <node concept="2GrKxI" id="6UWSvq5a9vA" role="2Gsz3X">
-            <property role="TrG5h" value="macroTable" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="5itBwM7VP0M" role="3cqZAp">
-          <node concept="1rXfSq" id="5itBwM7VP0K" role="3clFbG">
-            <ref role="37wK5l" node="5itBwM7VKAh" resolve="reportFailure" />
-            <node concept="3cpWs3" id="5itBwM7VPk7" role="37wK5m">
-              <node concept="3cpWs3" id="5itBwM7VPk8" role="3uHU7B">
-                <node concept="Xl_RD" id="5itBwM7VPk9" role="3uHU7B">
-                  <property role="Xl_RC" value="no macro template  \&quot;" />
-                </node>
-                <node concept="37vLTw" id="5itBwM7VPka" role="3uHU7w">
-                  <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="templateRef" />
-                </node>
-              </node>
-              <node concept="Xl_RD" id="5itBwM7VPkb" role="3uHU7w">
-                <property role="Xl_RC" value="\&quot;" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5itBwM7VPXb" role="3cqZAp">
-          <node concept="10Nm6u" id="5itBwM7VPX9" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="16euLQ" id="6UWSvq4QqeP" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="6UWSvq4QqeQ" role="3ztrMU">
-          <ref role="3uigEE" to="i348:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6UWSvq4Qqez" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7WF$n" role="jymVt">
       <property role="TrG5h" value="callMacroTemplate" />
       <node concept="37vLTG" id="5itBwM7WF$o" role="3clF46">
@@ -4963,7 +4710,15 @@
     </node>
     <node concept="2tJIrI" id="4nxCIBqyBjc" role="jymVt" />
     <node concept="3clFb_" id="1hX44vNnpfT" role="jymVt">
-      <property role="TrG5h" value="collectMacroTables" />
+      <property role="TrG5h" value="init" />
+      <node concept="37vLTG" id="5EDW3XFuukb" role="3clF46">
+        <property role="TrG5h" value="manifests" />
+        <node concept="A3Dl8" id="5EDW3XFuukc" role="1tU5fm">
+          <node concept="3uibUv" id="5EDW3XFuukd" role="A3Ik2">
+            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+          </node>
+        </node>
+      </node>
       <node concept="3Tm6S6" id="1hX44vNnpfU" role="1B3o_S" />
       <node concept="3cqZAl" id="1hX44vNnpfV" role="3clF45" />
       <node concept="3clFbS" id="1hX44vNnpfH" role="3clF47">
@@ -4994,8 +4749,8 @@
           <node concept="2GrKxI" id="7DvO2MamWSO" role="2Gsz3X">
             <property role="TrG5h" value="macroManifest" />
           </node>
-          <node concept="37vLTw" id="7DvO2MamXRd" role="2GsD0m">
-            <ref role="3cqZAo" node="1hX44vNniCj" resolve="macroManifests" />
+          <node concept="37vLTw" id="5EDW3XFuyOR" role="2GsD0m">
+            <ref role="3cqZAo" node="5EDW3XFuukb" resolve="manifests" />
           </node>
           <node concept="3clFbS" id="7DvO2MamWT0" role="2LFqv$">
             <node concept="3SKdUt" id="1hX44vNnqZn" role="3cqZAp">
@@ -5039,7 +4794,7 @@
                   <ref role="2Gs0qQ" node="7DvO2MamWSO" resolve="macroManifest" />
                 </node>
                 <node concept="liA8E" id="6UWSvq4VHk3" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:6UWSvq4Vu5V" resolve="macroTables" />
+                  <ref role="37wK5l" to="fqlx:6UWSvq4Vu5V" resolve="macroTables" />
                 </node>
               </node>
               <node concept="2GrKxI" id="6UWSvq4VKfN" role="2Gsz3X">
@@ -5417,15 +5172,6 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="1hX44vNlSIB" role="1B3o_S" />
-    <node concept="312cEg" id="1hX44vNniCj" role="jymVt">
-      <property role="TrG5h" value="macroManifests" />
-      <node concept="3Tm6S6" id="1hX44vNniCk" role="1B3o_S" />
-      <node concept="_YKpA" id="7DvO2MamVaf" role="1tU5fm">
-        <node concept="3uibUv" id="7DvO2MamVag" role="_ZDj9">
-          <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
-        </node>
-      </node>
-    </node>
     <node concept="312cEg" id="2Y70AYEegrx" role="jymVt">
       <property role="TrG5h" value="messageHandler" />
       <node concept="3Tm6S6" id="2Y70AYEegry" role="1B3o_S" />
@@ -6107,35 +5853,18 @@
         </node>
       </node>
       <node concept="3clFbS" id="7DvO2M9VeMg" role="3clF47">
-        <node concept="3cpWs8" id="6UWSvq5d6Ly" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq5d6Lz" role="3cpWs9">
-            <property role="TrG5h" value="macroManifests" />
-            <node concept="_YKpA" id="6UWSvq5d6QU" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq5d6QW" role="_ZDj9">
-                <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+        <node concept="3cpWs8" id="5EDW3XFuncT" role="3cqZAp">
+          <node concept="3cpWsn" id="5EDW3XFuncU" role="3cpWs9">
+            <property role="TrG5h" value="manifests" />
+            <node concept="_YKpA" id="5EDW3XFuncv" role="1tU5fm">
+              <node concept="3uibUv" id="5EDW3XFuncy" role="_ZDj9">
+                <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
               </node>
             </node>
-            <node concept="2ShNRf" id="6UWSvq5d8fo" role="33vP2m">
-              <node concept="Tc6Ow" id="6UWSvq5d8dH" role="2ShVmc">
-                <node concept="3uibUv" id="6UWSvq5d8dI" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6UWSvq5d8mc" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq5d8md" role="3cpWs9">
-            <property role="TrG5h" value="ruleManifests" />
-            <node concept="_YKpA" id="6UWSvq5d8vu" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq5d8vw" role="_ZDj9">
-                <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6UWSvq5daoJ" role="33vP2m">
-              <node concept="Tc6Ow" id="6UWSvq5dan4" role="2ShVmc">
-                <node concept="3uibUv" id="6UWSvq5dan5" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+            <node concept="2ShNRf" id="5EDW3XFuncV" role="33vP2m">
+              <node concept="Tc6Ow" id="5EDW3XFuncW" role="2ShVmc">
+                <node concept="3uibUv" id="5EDW3XFuncX" role="HW$YZ">
+                  <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
                 </node>
               </node>
             </node>
@@ -6153,128 +5882,78 @@
         <node concept="3clFbH" id="2WtKs4tZiYW" role="3cqZAp" />
         <node concept="2Gpval" id="NKt6yoTa7y" role="3cqZAp">
           <node concept="3clFbS" id="6UWSvq5d00n" role="2LFqv$">
-            <node concept="3cpWs8" id="7wfdmjRl1_C" role="3cqZAp">
-              <node concept="3cpWsn" id="7wfdmjRl1_D" role="3cpWs9">
-                <property role="TrG5h" value="macroManifest" />
-                <node concept="3uibUv" id="7wfdmjRl1_$" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+            <node concept="3cpWs8" id="5EDW3XFurcR" role="3cqZAp">
+              <node concept="3cpWsn" id="5EDW3XFurcS" role="3cpWs9">
+                <property role="TrG5h" value="manifest" />
+                <node concept="3uibUv" id="5EDW3XFuqYq" role="1tU5fm">
+                  <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
                 </node>
-                <node concept="2OqwBi" id="7wfdmjRl1_E" role="33vP2m">
-                  <node concept="2GrUjf" id="NKt6yoTaa0" role="2Oq$k0">
+                <node concept="2OqwBi" id="5EDW3XFurcT" role="33vP2m">
+                  <node concept="2GrUjf" id="5EDW3XFurcU" role="2Oq$k0">
                     <ref role="2Gs0qQ" node="NKt6yoTa9Y" resolve="aspect" />
                   </node>
-                  <node concept="liA8E" id="7wfdmjRl1_G" role="2OqNvi">
-                    <ref role="37wK5l" to="fqlx:NKt6yomP6t" resolve="createMacroManifest" />
+                  <node concept="liA8E" id="5EDW3XFurcV" role="2OqNvi">
+                    <ref role="37wK5l" to="fqlx:5EDW3XF61A_" resolve="manifest" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbJ" id="7wfdmjRl3BC" role="3cqZAp">
-              <node concept="3clFbS" id="7wfdmjRl3BE" role="3clFbx">
-                <node concept="3clFbF" id="6UWSvq5daIa" role="3cqZAp">
-                  <node concept="2OqwBi" id="6UWSvq5dbyT" role="3clFbG">
-                    <node concept="37vLTw" id="6UWSvq5daI8" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6UWSvq5d6Lz" resolve="macroManifests" />
-                    </node>
-                    <node concept="TSZUe" id="6UWSvq5dcAz" role="2OqNvi">
-                      <node concept="37vLTw" id="7wfdmjRl1_H" role="25WWJ7">
-                        <ref role="3cqZAo" node="7wfdmjRl1_D" resolve="macroManifest" />
-                      </node>
-                    </node>
-                  </node>
+            <node concept="3clFbF" id="5EDW3XFuoKW" role="3cqZAp">
+              <node concept="2OqwBi" id="5EDW3XFupsb" role="3clFbG">
+                <node concept="37vLTw" id="5EDW3XFuoKU" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5EDW3XFuncU" resolve="manifests" />
                 </node>
-              </node>
-              <node concept="3y3z36" id="7wfdmjRl3R4" role="3clFbw">
-                <node concept="10Nm6u" id="7wfdmjRl3St" role="3uHU7w" />
-                <node concept="37vLTw" id="7wfdmjRl3I7" role="3uHU7B">
-                  <ref role="3cqZAo" node="7wfdmjRl1_D" resolve="macroManifest" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="7P_FdVPGvW1" role="3cqZAp" />
-            <node concept="3cpWs8" id="7wfdmjRl439" role="3cqZAp">
-              <node concept="3cpWsn" id="7wfdmjRl43a" role="3cpWs9">
-                <property role="TrG5h" value="ruleManifest" />
-                <node concept="3uibUv" id="7wfdmjRl436" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-                </node>
-                <node concept="2OqwBi" id="7wfdmjRl43b" role="33vP2m">
-                  <node concept="2GrUjf" id="NKt6yoTaa2" role="2Oq$k0">
-                    <ref role="2Gs0qQ" node="NKt6yoTa9Y" resolve="aspect" />
-                  </node>
-                  <node concept="liA8E" id="7wfdmjRl43d" role="2OqNvi">
-                    <ref role="37wK5l" to="fqlx:NKt6yomP6y" resolve="createRuleManifest" />
+                <node concept="TSZUe" id="5EDW3XFuq0S" role="2OqNvi">
+                  <node concept="37vLTw" id="5EDW3XFurcW" role="25WWJ7">
+                    <ref role="3cqZAo" node="5EDW3XFurcS" resolve="manifest" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbJ" id="7wfdmjRl4mB" role="3cqZAp">
-              <node concept="3clFbS" id="7wfdmjRl4mD" role="3clFbx">
-                <node concept="3clFbF" id="6UWSvq5dds6" role="3cqZAp">
-                  <node concept="2OqwBi" id="6UWSvq5deco" role="3clFbG">
-                    <node concept="37vLTw" id="6UWSvq5dds4" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6UWSvq5d8md" resolve="ruleManifests" />
-                    </node>
-                    <node concept="TSZUe" id="6UWSvq5dffY" role="2OqNvi">
-                      <node concept="37vLTw" id="7wfdmjRl43e" role="25WWJ7">
-                        <ref role="3cqZAo" node="7wfdmjRl43a" resolve="ruleManifest" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="2WtKs4u1jyY" role="3cqZAp" />
-                <node concept="3clFbJ" id="2WtKs4u1jzV" role="3cqZAp">
-                  <node concept="3clFbS" id="2WtKs4u1jzX" role="3clFbx">
-                    <node concept="3clFbF" id="2WtKs4u1kj3" role="3cqZAp">
-                      <node concept="2OqwBi" id="2WtKs4u1kpF" role="3clFbG">
-                        <node concept="37vLTw" id="2WtKs4u1kj2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2WtKs4u1jqC" resolve="mergedAnalysis" />
-                        </node>
-                        <node concept="liA8E" id="2WtKs4u1kvN" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:2WtKs4tZgH_" resolve="merge" />
-                          <node concept="2OqwBi" id="2WtKs4u1kCq" role="37wK5m">
-                            <node concept="37vLTw" id="2WtKs4u1kxn" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7wfdmjRl43a" resolve="ruleManifest" />
-                            </node>
-                            <node concept="liA8E" id="2WtKs4u1kIK" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:2WtKs4tZlCC" resolve="analyses" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3y3z36" id="2WtKs4u1jSW" role="3clFbw">
-                    <node concept="37vLTw" id="2WtKs4u1j_i" role="3uHU7B">
+            <node concept="3clFbJ" id="5EDW3XFuqRI" role="3cqZAp">
+              <node concept="3clFbS" id="5EDW3XFuqRJ" role="3clFbx">
+                <node concept="3clFbF" id="5EDW3XFuqRK" role="3cqZAp">
+                  <node concept="2OqwBi" id="5EDW3XFuqRL" role="3clFbG">
+                    <node concept="37vLTw" id="5EDW3XFuqRM" role="2Oq$k0">
                       <ref role="3cqZAo" node="2WtKs4u1jqC" resolve="mergedAnalysis" />
                     </node>
-                    <node concept="10Nm6u" id="2WtKs4u1jRd" role="3uHU7w" />
-                  </node>
-                  <node concept="9aQIb" id="2WtKs4u1jW_" role="9aQIa">
-                    <node concept="3clFbS" id="2WtKs4u1jWA" role="9aQI4">
-                      <node concept="3clFbF" id="2WtKs4u1jXs" role="3cqZAp">
-                        <node concept="37vLTI" id="2WtKs4u1k3Z" role="3clFbG">
-                          <node concept="2OqwBi" id="2WtKs4u1kaX" role="37vLTx">
-                            <node concept="37vLTw" id="2WtKs4u1k5c" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7wfdmjRl43a" resolve="ruleManifest" />
-                            </node>
-                            <node concept="liA8E" id="2WtKs4u1kho" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:2WtKs4tZlCC" resolve="analyses" />
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="2WtKs4u1jXr" role="37vLTJ">
-                            <ref role="3cqZAo" node="2WtKs4u1jqC" resolve="mergedAnalysis" />
-                          </node>
+                    <node concept="liA8E" id="5EDW3XFuqRN" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:2WtKs4tZgH_" resolve="merge" />
+                      <node concept="2OqwBi" id="5EDW3XFuqRO" role="37wK5m">
+                        <node concept="liA8E" id="5EDW3XFurK7" role="2OqNvi">
+                          <ref role="37wK5l" to="fqlx:2WtKs4tZlCC" resolve="analyses" />
+                        </node>
+                        <node concept="37vLTw" id="5EDW3XFuryE" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5EDW3XFurcS" resolve="manifest" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3y3z36" id="7wfdmjRl4B5" role="3clFbw">
-                <node concept="10Nm6u" id="7wfdmjRl4Dc" role="3uHU7w" />
-                <node concept="37vLTw" id="7wfdmjRl4u6" role="3uHU7B">
-                  <ref role="3cqZAo" node="7wfdmjRl43a" resolve="ruleManifest" />
+              <node concept="3y3z36" id="5EDW3XFuqRR" role="3clFbw">
+                <node concept="37vLTw" id="5EDW3XFuqRS" role="3uHU7B">
+                  <ref role="3cqZAo" node="2WtKs4u1jqC" resolve="mergedAnalysis" />
+                </node>
+                <node concept="10Nm6u" id="5EDW3XFuqRT" role="3uHU7w" />
+              </node>
+              <node concept="9aQIb" id="5EDW3XFuqRU" role="9aQIa">
+                <node concept="3clFbS" id="5EDW3XFuqRV" role="9aQI4">
+                  <node concept="3clFbF" id="5EDW3XFuqRW" role="3cqZAp">
+                    <node concept="37vLTI" id="5EDW3XFuqRX" role="3clFbG">
+                      <node concept="2OqwBi" id="5EDW3XFuqRY" role="37vLTx">
+                        <node concept="liA8E" id="5EDW3XFuqS0" role="2OqNvi">
+                          <ref role="37wK5l" to="fqlx:2WtKs4tZlCC" resolve="analyses" />
+                        </node>
+                        <node concept="37vLTw" id="5EDW3XFurNG" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5EDW3XFurcS" resolve="manifest" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="5EDW3XFuqS1" role="37vLTJ">
+                        <ref role="3cqZAo" node="2WtKs4u1jqC" resolve="mergedAnalysis" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -6298,8 +5977,8 @@
             <node concept="2ShNRf" id="7DvO2M9VeMt" role="37vLTx">
               <node concept="1pGfFk" id="7DvO2M9VeMu" role="2ShVmc">
                 <ref role="37wK5l" node="1hX44vNlSOK" resolve="MacroTemplateIndex" />
-                <node concept="37vLTw" id="6UWSvq5d6LC" role="37wK5m">
-                  <ref role="3cqZAo" node="6UWSvq5d6Lz" resolve="macroManifests" />
+                <node concept="37vLTw" id="5EDW3XFusav" role="37wK5m">
+                  <ref role="3cqZAo" node="5EDW3XFuncU" resolve="manifests" />
                 </node>
                 <node concept="37vLTw" id="2Y70AYEfWEu" role="37wK5m">
                   <ref role="3cqZAo" node="2Y70AYEbe1O" resolve="messageHandler" />
@@ -6319,8 +5998,8 @@
             <node concept="2ShNRf" id="7WKNeR99Rwt" role="37vLTx">
               <node concept="1pGfFk" id="7WKNeR99RWw" role="2ShVmc">
                 <ref role="37wK5l" node="7P_FdVPIH2n" resolve="RuleTemplateIndex" />
-                <node concept="37vLTw" id="7WKNeR99RYR" role="37wK5m">
-                  <ref role="3cqZAo" node="6UWSvq5d8md" resolve="ruleManifests" />
+                <node concept="37vLTw" id="5EDW3XFuLaf" role="37wK5m">
+                  <ref role="3cqZAo" node="5EDW3XFuncU" resolve="manifests" />
                 </node>
               </node>
             </node>
@@ -6331,8 +6010,8 @@
             <node concept="2ShNRf" id="7WKNeR99SEp" role="37vLTx">
               <node concept="1pGfFk" id="7WKNeR99T6s" role="2ShVmc">
                 <ref role="37wK5l" node="7WKNeR93OQV" resolve="QueryTemplateIndex" />
-                <node concept="37vLTw" id="7WKNeR99T8e" role="37wK5m">
-                  <ref role="3cqZAo" node="6UWSvq5d8md" resolve="ruleManifests" />
+                <node concept="37vLTw" id="5EDW3XFuR8Y" role="37wK5m">
+                  <ref role="3cqZAo" node="5EDW3XFuncU" resolve="manifests" />
                 </node>
               </node>
             </node>
@@ -8004,8 +7683,8 @@
       <node concept="37vLTG" id="7WKNeR93Q47" role="3clF46">
         <property role="TrG5h" value="manifests" />
         <node concept="A3Dl8" id="7WKNeR93Q48" role="1tU5fm">
-          <node concept="3uibUv" id="7WKNeR93Q49" role="A3Ik2">
-            <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+          <node concept="3uibUv" id="5EDW3XFuMs$" role="A3Ik2">
+            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
           </node>
         </node>
       </node>
@@ -8140,8 +7819,8 @@
       <node concept="37vLTG" id="7WKNeR96eOL" role="3clF46">
         <property role="TrG5h" value="manifests" />
         <node concept="A3Dl8" id="7WKNeR96eOM" role="1tU5fm">
-          <node concept="3uibUv" id="7WKNeR96eON" role="A3Ik2">
-            <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+          <node concept="3uibUv" id="5EDW3XFuMuQ" role="A3Ik2">
+            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
           </node>
         </node>
       </node>
@@ -8169,7 +7848,7 @@
                           <ref role="3cqZAo" node="7WKNeR97vRX" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7WKNeR97vRW" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7P_FdVPtq7Z" resolve="queryTemplates" />
+                          <ref role="37wK5l" to="fqlx:7P_FdVPtq7Z" resolve="queryTemplates" />
                         </node>
                       </node>
                     </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 4deaa5a8..75c88cf4 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -5656,7 +5656,7 @@
       <node concept="37vLTG" id="5ntLU8GlSnJ" role="3clF46">
         <property role="TrG5h" value="tpl" />
         <node concept="3uibUv" id="1ffsG7c51iR" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
           <node concept="16syzq" id="7XdbJdyQi3s" role="11_B2D">
             <ref role="16sUi3" node="7XdbJdyQdwM" resolve="T" />
           </node>
@@ -6055,7 +6055,7 @@
       <node concept="37vLTG" id="7XdbJdyNeFb" role="3clF46">
         <property role="TrG5h" value="tpl" />
         <node concept="3uibUv" id="7XdbJdyNeFc" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
           <node concept="16syzq" id="7XdbJdyQuae" role="11_B2D">
             <ref role="16sUi3" node="7XdbJdyQn2x" resolve="T" />
           </node>
@@ -6211,7 +6211,7 @@
         <property role="TrG5h" value="tpls" />
         <node concept="A3Dl8" id="tIwzd1I3Xn" role="1tU5fm">
           <node concept="3uibUv" id="6tPOoeTdbj8" role="A3Ik2">
-            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
             <node concept="3qUE_q" id="6tPOoeTdbj9" role="11_B2D">
               <node concept="3uibUv" id="6tPOoeTdbja" role="3qUE_r">
                 <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -6372,7 +6372,7 @@
                   <node concept="3cpWsn" id="4MqhgXUBzFo" role="3cpWs9">
                     <property role="TrG5h" value="template" />
                     <node concept="3uibUv" id="4MqhgXUBzF7" role="1tU5fm">
-                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                       <node concept="3qUE_q" id="7XdbJdyRy2h" role="11_B2D">
                         <node concept="3uibUv" id="7XdbJdyRyYU" role="3qUE_r">
                           <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -7010,7 +7010,7 @@
           <node concept="3cpWsn" id="tIwzd1I3Xj" role="1Duv9x">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="6tPOoeTdcfx" role="1tU5fm">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
               <node concept="3qUE_q" id="6tPOoeTdcfy" role="11_B2D">
                 <node concept="3uibUv" id="6tPOoeTdcfz" role="3qUE_r">
                   <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
@@ -7528,7 +7528,7 @@
               <property role="TrG5h" value="tpls" />
               <node concept="A3Dl8" id="5ntLU8GlzSt" role="1tU5fm">
                 <node concept="3uibUv" id="1ffsG7c5hrm" role="A3Ik2">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                   <node concept="3qUE_q" id="7XdbJdyRI0u" role="11_B2D">
                     <node concept="3uibUv" id="7XdbJdyRId5" role="3qUE_r">
                       <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 118cc0dc..14d8c6c2 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -695,7 +695,7 @@
               <node concept="3cpWsn" id="1CcQBrPeqBu" role="3cpWs9">
                 <property role="TrG5h" value="template" />
                 <node concept="3uibUv" id="3IIf9OADWM$" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                   <node concept="3qTvmN" id="3IIf9OADXsN" role="11_B2D" />
                 </node>
                 <node concept="37vLTw" id="6tPOoeTdjBM" role="33vP2m">
@@ -767,7 +767,7 @@
           <node concept="3cpWsn" id="3YJ7yg2N2M5" role="1Duv9x">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="1ffsG7c4ezn" role="1tU5fm">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
               <node concept="3qUE_q" id="7XdbJdyRKIf" role="11_B2D">
                 <node concept="3uibUv" id="7XdbJdyRMGp" role="3qUE_r">
                   <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index a4f7a76b..8b659798 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -686,7 +686,7 @@
             </node>
             <node concept="2YIFZM" id="3KN3A4uZFD0" role="33vP2m">
               <ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
-              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
               <node concept="3VsKOn" id="3KN3A4uZFD1" role="37wK5m">
                 <ref role="3VsUkX" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
               </node>
@@ -701,7 +701,7 @@
             </node>
             <node concept="2YIFZM" id="3KN3A4v2PX8" role="33vP2m">
               <ref role="37wK5l" to="fqlx:3KN3A4uZLWT" resolve="sidekickDetectable" />
-              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
             </node>
           </node>
         </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index 9fc913b9..41ad5384 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -1066,32 +1066,23 @@
   </node>
   <node concept="3HP615" id="NKt6yomNZE">
     <property role="TrG5h" value="CoderulesAspect" />
-    <node concept="2tJIrI" id="NKt6yomOnF" role="jymVt" />
-    <node concept="3clFb_" id="NKt6yomP6t" role="jymVt">
-      <property role="TrG5h" value="createMacroManifest" />
-      <node concept="3uibUv" id="NKt6yomP6u" role="3clF45">
-        <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
-      </node>
-      <node concept="3Tm1VV" id="NKt6yomP6v" role="1B3o_S" />
-      <node concept="3clFbS" id="NKt6yomP6w" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="NKt6yomP6x" role="jymVt" />
-    <node concept="3clFb_" id="NKt6yomP6y" role="jymVt">
-      <property role="TrG5h" value="createRuleManifest" />
-      <node concept="3uibUv" id="NKt6yomP6z" role="3clF45">
-        <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-      </node>
-      <node concept="3Tm1VV" id="NKt6yomP6$" role="1B3o_S" />
-      <node concept="3clFbS" id="NKt6yomP6_" role="3clF47" />
-    </node>
     <node concept="2tJIrI" id="NKt6yomOnK" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XF61A_" role="jymVt">
+      <property role="TrG5h" value="manifest" />
+      <node concept="3uibUv" id="5EDW3XF61BW" role="3clF45">
+        <ref role="3uigEE" node="5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+      </node>
+      <node concept="3Tm1VV" id="5EDW3XF61AB" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XF61AC" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF61A$" role="jymVt" />
     <node concept="3Tm1VV" id="NKt6yomNZF" role="1B3o_S" />
     <node concept="3uibUv" id="NKt6yomOn_" role="3HQHJm">
       <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
     </node>
   </node>
   <node concept="312cEu" id="NKt6yp1COZ">
-    <property role="TrG5h" value="DefaultCoderulesAspect" />
+    <property role="TrG5h" value="AbstractCoderulesAspect" />
     <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="3KN3A4uZLbU" role="jymVt" />
     <node concept="2YIFZL" id="78H58oefoaA" role="jymVt">
@@ -1215,7 +1206,7 @@
       <node concept="16euLQ" id="78H58oefoAe" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="78H58oefoCM" role="3ztrMU">
-          <ref role="3uigEE" node="NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+          <ref role="3uigEE" node="NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
         </node>
       </node>
     </node>
@@ -3468,5 +3459,72 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="5EDW3XF5Z95">
+    <property role="TrG5h" value="AbstractCoderulesManifest" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="5EDW3XF5Zad" role="jymVt" />
+    <node concept="3clFb_" id="6UWSvq4Vu5V" role="jymVt">
+      <property role="TrG5h" value="macroTables" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3vKaQO" id="6UWSvq4Vu6$" role="3clF45">
+        <node concept="3uibUv" id="6UWSvq4Vu7$" role="3O5elw">
+          <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6UWSvq4Vu5Y" role="1B3o_S" />
+      <node concept="3clFbS" id="6UWSvq4Vu5Z" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF5Zaf" role="jymVt" />
+    <node concept="3clFb_" id="4MqhgXUaiLz" role="jymVt">
+      <property role="TrG5h" value="ruleTables" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3vKaQO" id="5EDW3XF609H" role="3clF45">
+        <node concept="3uibUv" id="5EDW3XF609J" role="3O5elw">
+          <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4MqhgXUaiLA" role="1B3o_S" />
+      <node concept="3clFbS" id="4MqhgXUaiLB" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF60aY" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XF60ae" role="jymVt">
+      <property role="TrG5h" value="queryTables" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3vKaQO" id="5EDW3XF60af" role="3clF45">
+        <node concept="3uibUv" id="5EDW3XF60b$" role="3O5elw">
+          <ref role="3uigEE" to="i348:5EDW3XF608m" resolve="AbstractQueryTable" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5EDW3XF60ah" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XF60ai" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF5Zaw" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPtq7Z" role="jymVt">
+      <property role="TrG5h" value="queryTemplates" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="_YKpA" id="7P_FdVPtqGB" role="3clF45">
+        <node concept="3uibUv" id="6OXbTD$jYJi" role="_ZDj9">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPtq82" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPtq83" role="3clF47" />
+      <node concept="2AHcQZ" id="5EDW3XF6yGO" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF6yEU" role="jymVt" />
+    <node concept="3clFb_" id="2WtKs4tZlCC" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="analyses" />
+      <node concept="3clFbS" id="2WtKs4tZlCF" role="3clF47" />
+      <node concept="3Tm1VV" id="2WtKs4tZlzz" role="1B3o_S" />
+      <node concept="3uibUv" id="2WtKs4u1dpp" role="3clF45">
+        <ref role="3uigEE" to="i348:1H_6AUSXnyk" resolve="ProgramAnalysis" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XF5Zai" role="jymVt" />
+    <node concept="3Tm1VV" id="5EDW3XF5Z96" role="1B3o_S" />
+  </node>
 </model>
 
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 3673b00a..9b89dc9b 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
@@ -385,47 +385,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="312cEu" id="4OKkcnfu_xe">
-    <property role="TrG5h" value="AbstractRuleTemplateManifest" />
-    <property role="1sVAO0" value="true" />
-    <property role="3GE5qa" value="rule" />
-    <node concept="2tJIrI" id="1ggxSI7z1Os" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVPtq7Z" role="jymVt">
-      <property role="TrG5h" value="queryTemplates" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="_YKpA" id="7P_FdVPtqGB" role="3clF45">
-        <node concept="3uibUv" id="6OXbTD$jYJi" role="_ZDj9">
-          <ref role="3uigEE" node="6OXbTD$iNPP" resolve="QueryTemplate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVPtq82" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPtq83" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="7P_FdVPtpzK" role="jymVt" />
-    <node concept="3clFb_" id="4MqhgXUaiLz" role="jymVt">
-      <property role="TrG5h" value="rulesListTemplates" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="_YKpA" id="20Ay2VeZMvJ" role="3clF45">
-        <node concept="3uibUv" id="20Ay2VeZMvL" role="_ZDj9">
-          <ref role="3uigEE" node="4MqhgXU9fm3" resolve="RulesListTemplate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4MqhgXUaiLA" role="1B3o_S" />
-      <node concept="3clFbS" id="4MqhgXUaiLB" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2WtKs4tD$nT" role="jymVt" />
-    <node concept="3clFb_" id="2WtKs4tZlCC" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="analyses" />
-      <node concept="3clFbS" id="2WtKs4tZlCF" role="3clF47" />
-      <node concept="3Tm1VV" id="2WtKs4tZlzz" role="1B3o_S" />
-      <node concept="3uibUv" id="2WtKs4u1dpp" role="3clF45">
-        <ref role="3uigEE" node="1H_6AUSXnyk" resolve="ProgramAnalysis" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MqhgXUaiL8" role="jymVt" />
-    <node concept="3Tm1VV" id="4OKkcnfu_xn" role="1B3o_S" />
-  </node>
   <node concept="Qs71p" id="4OKkcnfu_Ag">
     <property role="TrG5h" value="RuleTemplateMehodKind" />
     <property role="3GE5qa" value="" />
@@ -494,7 +453,7 @@
     </node>
   </node>
   <node concept="312cEu" id="1ffsG7bUbCM">
-    <property role="TrG5h" value="AbstraceRuleTemplate" />
+    <property role="TrG5h" value="AbstractRuleTemplate" />
     <property role="1sVAO0" value="true" />
     <property role="3GE5qa" value="rule" />
     <node concept="2tJIrI" id="1ffsG7bUbEG" role="jymVt" />
@@ -6660,25 +6619,6 @@
     <node concept="2tJIrI" id="6R6MIbU9_i0" role="jymVt" />
     <node concept="3Tm1VV" id="6R6MIbU9$OE" role="1B3o_S" />
   </node>
-  <node concept="312cEu" id="2N2MQGCMVqD">
-    <property role="TrG5h" value="AbstractMacroManifest" />
-    <property role="1sVAO0" value="true" />
-    <property role="3GE5qa" value="macro" />
-    <node concept="2tJIrI" id="6UWSvq4Vu5u" role="jymVt" />
-    <node concept="3clFb_" id="6UWSvq4Vu5V" role="jymVt">
-      <property role="TrG5h" value="macroTables" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3vKaQO" id="6UWSvq4Vu6$" role="3clF45">
-        <node concept="3uibUv" id="6UWSvq4Vu7$" role="3O5elw">
-          <ref role="3uigEE" node="1pPth$m7IVF" resolve="AbstractMacroTable" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6UWSvq4Vu5Y" role="1B3o_S" />
-      <node concept="3clFbS" id="6UWSvq4Vu5Z" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2N2MQGCMNOd" role="jymVt" />
-    <node concept="3Tm1VV" id="2N2MQGCMVqE" role="1B3o_S" />
-  </node>
   <node concept="312cEu" id="1pPth$m7IVF">
     <property role="TrG5h" value="AbstractMacroTable" />
     <property role="1sVAO0" value="true" />
@@ -7441,5 +7381,21 @@
     <node concept="2tJIrI" id="5EDW3XDYeXm" role="jymVt" />
     <node concept="3Tm1VV" id="5EDW3XDYeWw" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="5EDW3XF5Zh6">
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="AbstractRuleTable" />
+    <property role="1sVAO0" value="true" />
+    <node concept="3Tm1VV" id="5EDW3XF5Zh7" role="1B3o_S" />
+    <node concept="3uibUv" id="5EDW3XF5ZiM" role="EKbjA">
+      <ref role="3uigEE" node="4MqhgXU9fm3" resolve="RulesListTemplate" />
+    </node>
+  </node>
+  <node concept="312cEu" id="5EDW3XF608m">
+    <property role="3GE5qa" value="query" />
+    <property role="TrG5h" value="AbstractQueryTable" />
+    <node concept="2tJIrI" id="5EDW3XF609u" role="jymVt" />
+    <node concept="2tJIrI" id="5EDW3XF609w" role="jymVt" />
+    <node concept="3Tm1VV" id="5EDW3XF608n" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
index cbb2a8d6..f73206f5 100644
--- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
@@ -122,7 +122,7 @@
             <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
             <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
             <node concept="2YIFZM" id="3KN3A4v3zEB" role="37wK5m">
-              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
               <ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
               <node concept="3VsKOn" id="3KN3A4v3zEC" role="37wK5m">
                 <ref role="3VsUkX" node="7km57Pkjxf4" resolve="ControlflowAspect" />
@@ -130,7 +130,7 @@
             </node>
             <node concept="2YIFZM" id="3KN3A4v3zED" role="37wK5m">
               <ref role="37wK5l" to="fqlx:3KN3A4uZLWT" resolve="sidekickDetectable" />
-              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
             </node>
           </node>
         </node>
@@ -199,7 +199,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="NKt6yp1DsV" role="1zkMxy">
-      <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+      <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
     </node>
   </node>
 </model>
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
index a6314331..12ed8a26 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
@@ -124,14 +124,14 @@
             <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
             <node concept="2YIFZM" id="3KN3A4v4kbE" role="37wK5m">
               <ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
-              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
               <node concept="3VsKOn" id="3KN3A4v4kbF" role="37wK5m">
                 <ref role="3VsUkX" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
               </node>
             </node>
             <node concept="2YIFZM" id="3KN3A4v4kbG" role="37wK5m">
               <ref role="37wK5l" to="fqlx:3KN3A4uZLWT" resolve="sidekickDetectable" />
-              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
             </node>
           </node>
         </node>
@@ -200,7 +200,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="NKt6yp1DsV" role="1zkMxy">
-      <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+      <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
     </node>
   </node>
 </model>