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 a6de6848..c5723ecb 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
@@ -264,10 +264,6 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
-      <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
-        <child id="1171903916107" name="bound" index="3qUE_r" />
-      </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
@@ -322,9 +318,7 @@
       </concept>
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
-      <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
-        <reference id="1218736638915" name="classifier" index="32nkFo" />
-      </concept>
+      <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
       <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
@@ -368,10 +362,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1235573135402" name="jetbrains.mps.baseLanguage.collections.structure.SingletonSequenceCreator" flags="nn" index="2HTt$P">
-        <child id="1235573175711" name="elementType" index="2HTBi0" />
-        <child id="1235573187520" name="singletonValue" index="2HTEbv" />
-      </concept>
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
@@ -482,10 +472,10 @@
     </node>
     <node concept="2tJIrI" id="4n$QnzZQmw6" role="jymVt" />
     <node concept="3clFbW" id="3YJ7yg2MSlk" role="jymVt">
-      <node concept="37vLTG" id="20Ay2VeR4H3" role="3clF46">
-        <property role="TrG5h" value="ruleTemplateIndex" />
-        <node concept="3uibUv" id="20Ay2VeR5CJ" role="1tU5fm">
-          <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
+      <node concept="37vLTG" id="4XsNDZYjJG4" role="3clF46">
+        <property role="TrG5h" value="typecheckingService" />
+        <node concept="3uibUv" id="4XsNDZYjL0i" role="1tU5fm">
+          <ref role="3uigEE" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
         </node>
       </node>
       <node concept="37vLTG" id="6i42QSsgg1v" role="3clF46">
@@ -510,16 +500,16 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="20Ay2VeR5DA" role="3cqZAp">
-          <node concept="37vLTI" id="20Ay2VeR5DC" role="3clFbG">
-            <node concept="2OqwBi" id="20Ay2VeR6l9" role="37vLTJ">
-              <node concept="Xjq3P" id="20Ay2VeR6$H" role="2Oq$k0" />
-              <node concept="2OwXpG" id="20Ay2VeR6lc" role="2OqNvi">
-                <ref role="2Oxat5" node="20Ay2VeR5Dy" resolve="ruleTemplateIndex" />
+        <node concept="3clFbF" id="4XsNDZYjNTS" role="3cqZAp">
+          <node concept="37vLTI" id="4XsNDZYjNTU" role="3clFbG">
+            <node concept="2OqwBi" id="4XsNDZYjPDd" role="37vLTJ">
+              <node concept="Xjq3P" id="4XsNDZYjPHD" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4XsNDZYjPDg" role="2OqNvi">
+                <ref role="2Oxat5" node="4XsNDZYjNTO" resolve="typecheckingService" />
               </node>
             </node>
-            <node concept="37vLTw" id="20Ay2VeR5DG" role="37vLTx">
-              <ref role="3cqZAo" node="20Ay2VeR4H3" resolve="ruleTemplateIndex" />
+            <node concept="37vLTw" id="4XsNDZYjNTY" role="37vLTx">
+              <ref role="3cqZAo" node="4XsNDZYjJG4" resolve="typecheckingService" />
             </node>
           </node>
         </node>
@@ -675,6 +665,52 @@
           </node>
         </node>
         <node concept="3clFbH" id="5mg4ZgLlS4H" role="3cqZAp" />
+        <node concept="3cpWs8" id="4XsNDZYjT9n" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZYjT9o" role="3cpWs9">
+            <property role="TrG5h" value="refs" />
+            <node concept="_YKpA" id="4XsNDZYjT1u" role="1tU5fm">
+              <node concept="2sp9CU" id="4XsNDZYjT1x" role="_ZDj9" />
+            </node>
+          </node>
+        </node>
+        <node concept="1QHqEK" id="4XsNDZYjQgz" role="3cqZAp">
+          <node concept="1QHqEC" id="4XsNDZYjQg_" role="1QHqEI">
+            <node concept="3clFbS" id="4XsNDZYjQgB" role="1bW5cS">
+              <node concept="3clFbF" id="4XsNDZYk4J5" role="3cqZAp">
+                <node concept="37vLTI" id="4XsNDZYk4J7" role="3clFbG">
+                  <node concept="2OqwBi" id="4XsNDZYjT9p" role="37vLTx">
+                    <node concept="2OqwBi" id="4XsNDZYjT9q" role="2Oq$k0">
+                      <node concept="37vLTw" id="4XsNDZYjT9r" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4XsNDZYjNTO" resolve="typecheckingService" />
+                      </node>
+                      <node concept="liA8E" id="4XsNDZYjT9s" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:4XsNDZY7Lel" resolve="findRuleTemplates" />
+                        <node concept="37vLTw" id="4XsNDZYjT9t" role="37wK5m">
+                          <ref role="3cqZAo" node="4n$QnzZQnen" resolve="node" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="4XsNDZYjT9u" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:1z4$59ivhO1" resolve="get" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="4XsNDZYk4Jb" role="37vLTJ">
+                    <ref role="3cqZAo" node="4XsNDZYjT9o" resolve="refs" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="4XsNDZYkx6A" role="ukAjM">
+            <node concept="37vLTw" id="4XsNDZYkvLs" role="2Oq$k0">
+              <ref role="3cqZAo" node="6i42QSsghp4" resolve="mpsProject" />
+            </node>
+            <node concept="liA8E" id="4XsNDZYkyKz" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4XsNDZYjIUC" role="3cqZAp" />
         <node concept="3cpWs8" id="3YJ7yg2MBU8" role="3cqZAp">
           <node concept="3cpWsn" id="3YJ7yg2MBU9" role="3cpWs9">
             <property role="TrG5h" value="results" />
@@ -692,37 +728,8 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6i42QSsgtgL" role="3cqZAp" />
-        <node concept="1DcWWT" id="3YJ7yg2N2M2" role="3cqZAp">
-          <node concept="3clFbS" id="3YJ7yg2N2M4" role="2LFqv$">
-            <node concept="3cpWs8" id="1CcQBrPeqBt" role="3cqZAp">
-              <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="AbstractRuleTemplate" />
-                  <node concept="3qTvmN" id="3IIf9OADXsN" role="11_B2D" />
-                </node>
-                <node concept="37vLTw" id="6tPOoeTdjBM" role="33vP2m">
-                  <ref role="3cqZAo" node="3YJ7yg2N2M5" resolve="tpl" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="6i42QSsgfqS" role="3cqZAp">
-              <node concept="3cpWsn" id="6i42QSsgfqT" role="3cpWs9">
-                <property role="TrG5h" value="templateRef" />
-                <node concept="3uibUv" id="6i42QSsgfqP" role="1tU5fm">
-                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                </node>
-                <node concept="2OqwBi" id="6i42QSsgfqU" role="33vP2m">
-                  <node concept="37vLTw" id="1CcQBrPeqBy" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1CcQBrPeqBu" resolve="template" />
-                  </node>
-                  <node concept="liA8E" id="6i42QSsgfqW" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="getTemplateRef" />
-                  </node>
-                </node>
-              </node>
-            </node>
+        <node concept="1DcWWT" id="4XsNDZYk7Ne" role="3cqZAp">
+          <node concept="3clFbS" id="4XsNDZYk7Nh" role="2LFqv$">
             <node concept="3clFbJ" id="6i42QSsgpe6" role="3cqZAp">
               <node concept="3clFbS" id="6i42QSsgpe8" role="3clFbx">
                 <node concept="3clFbF" id="3YJ7yg2NcOY" role="3cqZAp">
@@ -735,11 +742,18 @@
                         <node concept="1pGfFk" id="3YJ7yg2Nhus" role="2ShVmc">
                           <ref role="37wK5l" to="9erk:~SearchResult.&lt;init&gt;(java.lang.Object,java.lang.String)" resolve="SearchResult" />
                           <node concept="2OqwBi" id="6i42QSsgo9q" role="37wK5m">
-                            <node concept="37vLTw" id="6i42QSsgnKB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6i42QSsgfqT" resolve="templateRef" />
+                            <node concept="1eOMI4" id="4XsNDZYkq6x" role="2Oq$k0">
+                              <node concept="10QFUN" id="4XsNDZYkq6w" role="1eOMHV">
+                                <node concept="37vLTw" id="4XsNDZYkq6v" role="10QFUP">
+                                  <ref role="3cqZAo" node="4XsNDZYk7Ni" resolve="ref" />
+                                </node>
+                                <node concept="3uibUv" id="4XsNDZYkqqd" role="10QFUM">
+                                  <ref role="3uigEE" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                                </node>
+                              </node>
                             </node>
                             <node concept="liA8E" id="6i42QSsgonT" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                              <ref role="37wK5l" to="w1kc:~SNodePointer.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                               <node concept="2OqwBi" id="6i42QSsgjMy" role="37wK5m">
                                 <node concept="37vLTw" id="6i42QSsgiWf" role="2Oq$k0">
                                   <ref role="3cqZAo" node="6i42QSsghp4" resolve="mpsProject" />
@@ -762,33 +776,18 @@
               </node>
               <node concept="3y3z36" id="6i42QSsgqc8" role="3clFbw">
                 <node concept="10Nm6u" id="6i42QSsgqsn" role="3uHU7w" />
-                <node concept="37vLTw" id="6i42QSsgpQH" role="3uHU7B">
-                  <ref role="3cqZAo" node="6i42QSsgfqT" resolve="templateRef" />
+                <node concept="37vLTw" id="4XsNDZYkpIV" role="3uHU7B">
+                  <ref role="3cqZAo" node="4XsNDZYk7Ni" resolve="ref" />
                 </node>
               </node>
             </node>
           </node>
-          <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="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" />
-                </node>
-              </node>
-            </node>
+          <node concept="3cpWsn" id="4XsNDZYk7Ni" role="1Duv9x">
+            <property role="TrG5h" value="ref" />
+            <node concept="2sp9CU" id="4XsNDZYk7Nm" role="1tU5fm" />
           </node>
-          <node concept="2OqwBi" id="3YJ7yg2N55f" role="1DdaDG">
-            <node concept="37vLTw" id="20Ay2VeR8np" role="2Oq$k0">
-              <ref role="3cqZAo" node="20Ay2VeR5Dy" resolve="ruleTemplateIndex" />
-            </node>
-            <node concept="liA8E" id="3YJ7yg2N55j" role="2OqNvi">
-              <ref role="37wK5l" to="hano:6fdr4UgfuGk" resolve="allRuleTemplates" />
-              <node concept="37vLTw" id="3YJ7yg2N7pX" role="37wK5m">
-                <ref role="3cqZAo" node="4n$QnzZQnen" resolve="node" />
-              </node>
-            </node>
+          <node concept="37vLTw" id="4XsNDZYk7Nn" role="1DdaDG">
+            <ref role="3cqZAo" node="4XsNDZYjT9o" resolve="refs" />
           </node>
         </node>
         <node concept="3clFbH" id="3YJ7yg2MREs" role="3cqZAp" />
@@ -822,11 +821,12 @@
         <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
       </node>
     </node>
-    <node concept="312cEg" id="20Ay2VeR5Dy" role="jymVt">
-      <property role="TrG5h" value="ruleTemplateIndex" />
-      <node concept="3Tm6S6" id="20Ay2VeR5Dz" role="1B3o_S" />
-      <node concept="3uibUv" id="20Ay2VeR5D_" role="1tU5fm">
-        <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
+    <node concept="312cEg" id="4XsNDZYjNTO" role="jymVt">
+      <property role="TrG5h" value="typecheckingService" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="4XsNDZYjNTP" role="1B3o_S" />
+      <node concept="3uibUv" id="4XsNDZYjNTR" role="1tU5fm">
+        <ref role="3uigEE" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
       </node>
     </node>
   </node>
@@ -851,12 +851,6 @@
     </node>
     <node concept="tnohg" id="3YJ7yg2LgPJ" role="tncku">
       <node concept="3clFbS" id="3YJ7yg2LgPK" role="2VODD2">
-        <node concept="3cpWs8" id="6kREIVkWLqO" role="3cqZAp">
-          <node concept="3cpWsn" id="6kREIVkWLqP" role="3cpWs9">
-            <property role="TrG5h" value="root" />
-            <node concept="3Tqbb2" id="6kREIVkWMXC" role="1tU5fm" />
-          </node>
-        </node>
         <node concept="3cpWs8" id="6nFpYlun1LU" role="3cqZAp">
           <node concept="3cpWsn" id="6nFpYlun1LV" role="3cpWs9">
             <property role="TrG5h" value="repository" />
@@ -876,24 +870,104 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="4XsNDZYjiYB" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZYjiYC" role="3cpWs9">
+            <property role="TrG5h" value="typecheckingService" />
+            <node concept="3uibUv" id="4XsNDZYjiYD" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+            </node>
+            <node concept="2YIFZM" id="4XsNDZYjiYE" role="33vP2m">
+              <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+              <ref role="37wK5l" to="tj24:1z4$59iHmYH" resolve="create" />
+              <node concept="37vLTw" id="4XsNDZYjiYF" role="37wK5m">
+                <ref role="3cqZAo" node="6nFpYlun1LV" resolve="repository" />
+              </node>
+              <node concept="2YIFZM" id="4XsNDZYjiYG" role="37wK5m">
+                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              </node>
+              <node concept="2YIFZM" id="4XsNDZYjiYH" role="37wK5m">
+                <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                <node concept="2OqwBi" id="4XsNDZYjlMO" role="37wK5m">
+                  <node concept="2WthIp" id="4XsNDZYjlMR" role="2Oq$k0" />
+                  <node concept="1DTwFV" id="4XsNDZYjlMT" role="2OqNvi">
+                    <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4XsNDZYkDEu" role="3cqZAp" />
+        <node concept="3cpWs8" id="4XsNDZYkI9P" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZYkI9Q" role="3cpWs9">
+            <property role="TrG5h" value="query" />
+            <node concept="3uibUv" id="4XsNDZYkI9R" role="1tU5fm">
+              <ref role="3uigEE" to="9erk:~SearchQuery" resolve="SearchQuery" />
+            </node>
+            <node concept="10Nm6u" id="4XsNDZYl7pn" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4XsNDZYkI9E" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZYkI9F" role="3cpWs9">
+            <property role="TrG5h" value="finder" />
+            <node concept="3uibUv" id="4XsNDZYkI9G" role="1tU5fm">
+              <ref role="3uigEE" node="4n$QnzZQkF9" resolve="ApplicableTemplatesFinder" />
+            </node>
+            <node concept="10Nm6u" id="4XsNDZYl8Q6" role="33vP2m" />
+          </node>
+        </node>
         <node concept="1QHqEK" id="3YJ7yg2LGli" role="3cqZAp">
           <node concept="1QHqEC" id="3YJ7yg2LGlj" role="1QHqEI">
             <node concept="3clFbS" id="3YJ7yg2LGlk" role="1bW5cS">
-              <node concept="3clFbF" id="6kREIVkWNEb" role="3cqZAp">
-                <node concept="37vLTI" id="6kREIVkWNEd" role="3clFbG">
-                  <node concept="2OqwBi" id="6kREIVkWLqQ" role="37vLTx">
-                    <node concept="2OqwBi" id="6kREIVkWLqR" role="2Oq$k0">
-                      <node concept="2WthIp" id="6kREIVkWLqS" role="2Oq$k0" />
-                      <node concept="1DTwFV" id="6kREIVkWLqT" role="2OqNvi">
-                        <ref role="2WH_rO" node="3YJ7yg2LgUp" resolve="node" />
+              <node concept="3clFbF" id="4XsNDZYl505" role="3cqZAp">
+                <node concept="37vLTI" id="4XsNDZYl507" role="3clFbG">
+                  <node concept="2ShNRf" id="4XsNDZYkI9H" role="37vLTx">
+                    <node concept="1pGfFk" id="4XsNDZYkI9I" role="2ShVmc">
+                      <ref role="37wK5l" node="3YJ7yg2MSlk" resolve="ApplicableTemplatesFinder" />
+                      <node concept="37vLTw" id="4XsNDZYkMV9" role="37wK5m">
+                        <ref role="3cqZAo" node="4XsNDZYjiYC" resolve="typecheckingService" />
+                      </node>
+                      <node concept="2OqwBi" id="4XsNDZYkI9M" role="37wK5m">
+                        <node concept="2WthIp" id="4XsNDZYkI9N" role="2Oq$k0" />
+                        <node concept="1DTwFV" id="4XsNDZYkI9O" role="2OqNvi">
+                          <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="6kREIVkWLqU" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
+                  </node>
+                  <node concept="37vLTw" id="4XsNDZYl50b" role="37vLTJ">
+                    <ref role="3cqZAo" node="4XsNDZYkI9F" resolve="finder" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="4XsNDZYkI9V" role="3cqZAp">
+                <node concept="37vLTI" id="4XsNDZYkI9W" role="3clFbG">
+                  <node concept="2ShNRf" id="4XsNDZYkI9X" role="37vLTx">
+                    <node concept="1pGfFk" id="4XsNDZYkI9Y" role="2ShVmc">
+                      <ref role="37wK5l" to="9erk:~SearchQuery.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.module.SearchScope)" resolve="SearchQuery" />
+                      <node concept="2OqwBi" id="4XsNDZYkI9Z" role="37wK5m">
+                        <node concept="2WthIp" id="4XsNDZYkIa0" role="2Oq$k0" />
+                        <node concept="1DTwFV" id="4XsNDZYkIa1" role="2OqNvi">
+                          <ref role="2WH_rO" node="3YJ7yg2LgUp" resolve="node" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="4XsNDZYkIa2" role="37wK5m">
+                        <node concept="2OqwBi" id="4XsNDZYkIa3" role="2Oq$k0">
+                          <node concept="2WthIp" id="4XsNDZYkIa4" role="2Oq$k0" />
+                          <node concept="1DTwFV" id="4XsNDZYkIa5" role="2OqNvi">
+                            <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="4XsNDZYkIa6" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getScope()" resolve="getScope" />
+                        </node>
+                      </node>
                     </node>
                   </node>
-                  <node concept="37vLTw" id="6kREIVkWNEh" role="37vLTJ">
-                    <ref role="3cqZAo" node="6kREIVkWLqP" resolve="root" />
+                  <node concept="37vLTw" id="4XsNDZYkIa7" role="37vLTJ">
+                    <ref role="3cqZAo" node="4XsNDZYkI9Q" resolve="query" />
                   </node>
                 </node>
               </node>
@@ -903,350 +977,75 @@
             <ref role="3cqZAo" node="6nFpYlun1LV" resolve="repository" />
           </node>
         </node>
-        <node concept="3clFbH" id="6kREIVkXLDT" role="3cqZAp" />
-        <node concept="3cpWs8" id="3KN3A4vCOBB" role="3cqZAp">
-          <node concept="3cpWsn" id="3KN3A4vCOBC" role="3cpWs9">
-            <property role="TrG5h" value="aspectLookup" />
-            <node concept="3uibUv" id="3KN3A4vCOjR" role="1tU5fm">
-              <ref role="3uigEE" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
-              <node concept="3uibUv" id="3KN3A4vCOjU" role="11_B2D">
-                <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-              </node>
+        <node concept="3cpWs8" id="4XsNDZYkIad" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZYkIae" role="3cpWs9">
+            <property role="TrG5h" value="opt" />
+            <node concept="3uibUv" id="4XsNDZYkIaf" role="1tU5fm">
+              <ref role="3uigEE" to="ngmn:~UsageToolOptions" resolve="UsageToolOptions" />
             </node>
-            <node concept="2YIFZM" id="3KN3A4vCOBD" role="33vP2m">
-              <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
-              <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3KN3A4vCTIJ" role="3cqZAp">
-          <node concept="3cpWsn" id="3KN3A4vCTIK" role="3cpWs9">
-            <property role="TrG5h" value="ac" />
-            <node concept="3vKaQO" id="3KN3A4vCTGm" role="1tU5fm">
-              <node concept="3uibUv" id="3KN3A4vCTGt" role="3O5elw">
-                <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
-                <node concept="3uibUv" id="3KN3A4vCTGu" role="11_B2D">
-                  <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="3KN3A4vCTIL" role="33vP2m">
-              <node concept="37vLTw" id="3KN3A4vCTIM" role="2Oq$k0">
-                <ref role="3cqZAo" node="3KN3A4vCOBC" resolve="aspectLookup" />
-              </node>
-              <node concept="liA8E" id="3KN3A4vCTIN" role="2OqNvi">
-                <ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
-                <node concept="2ShNRf" id="3KN3A4vEAr_" role="37wK5m">
-                  <node concept="2HTt$P" id="3KN3A4vECvI" role="2ShVmc">
-                    <node concept="3Tqbb2" id="3KN3A4vEDpx" role="2HTBi0" />
-                    <node concept="37vLTw" id="3KN3A4vEDNf" role="2HTEbv">
-                      <ref role="3cqZAo" node="6kREIVkWLqP" resolve="root" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="6nFpYlun1M3" role="37wK5m">
-                  <ref role="3cqZAo" node="6nFpYlun1LV" resolve="repository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3KN3A4vCYR8" role="3cqZAp" />
-        <node concept="3cpWs8" id="6nFpYlun4Ee" role="3cqZAp">
-          <node concept="3cpWsn" id="6nFpYlun4Ef" role="3cpWs9">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="6nFpYlun4qm" role="1tU5fm">
-              <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-            </node>
-            <node concept="2ShNRf" id="6nFpYlun4Eg" role="33vP2m">
-              <node concept="1pGfFk" id="6nFpYlun4Eh" role="2ShVmc">
-                <ref role="37wK5l" to="hano:7DvO2M9VeM1" resolve="RuleProcessingSession" />
-                <node concept="2OqwBi" id="zL5ZaNDQ_N" role="37wK5m">
-                  <node concept="37vLTw" id="zL5ZaNDQ_O" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3KN3A4vCTIK" resolve="ac" />
-                  </node>
-                  <node concept="1uHKPH" id="zL5ZaNDQ_P" role="2OqNvi" />
-                </node>
-                <node concept="37vLTw" id="6nFpYlun4Es" role="37wK5m">
-                  <ref role="3cqZAo" node="6nFpYlun1LV" resolve="repository" />
-                </node>
-                <node concept="2YIFZM" id="6nFpYlun4Et" role="37wK5m">
-                  <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
-                  <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
-                  <node concept="2OqwBi" id="6nFpYlun4Eu" role="37wK5m">
-                    <node concept="2WthIp" id="6nFpYlun4Ev" role="2Oq$k0" />
-                    <node concept="1DTwFV" id="6nFpYlun4Ew" role="2OqNvi">
-                      <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6nFpYlun0w_" role="3cqZAp" />
-        <node concept="3cpWs8" id="6kREIVkWRFp" role="3cqZAp">
-          <node concept="3cpWsn" id="6kREIVkWRFq" role="3cpWs9">
-            <property role="TrG5h" value="applyTemplatesStep" />
-            <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="6kREIVkWRFk" role="1tU5fm">
-              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-            </node>
-            <node concept="2ShNRf" id="6kREIVkWRFr" role="33vP2m">
-              <node concept="1pGfFk" id="6kREIVkWRFs" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:7kTeLbPt4na" resolve="ApplyTemplatesStep" />
-                <node concept="37vLTw" id="6nFpYlun6L_" role="37wK5m">
-                  <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
-                </node>
-                <node concept="2ShNRf" id="3IIf9O_rLCc" role="37wK5m">
-                  <node concept="Tc6Ow" id="3IIf9O_rNYG" role="2ShVmc">
-                    <node concept="3Tqbb2" id="3IIf9O_rQv1" role="HW$YZ" />
-                    <node concept="37vLTw" id="3IIf9O_rSZY" role="HW$Y0">
-                      <ref role="3cqZAo" node="6kREIVkWLqP" resolve="root" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="6nFpYlun1M1" role="37wK5m">
-                  <ref role="3cqZAo" node="6nFpYlun1LV" resolve="repository" />
-                </node>
-                <node concept="2ShNRf" id="6nFpYluqJHO" role="37wK5m">
-                  <node concept="1pGfFk" id="1LBj9w_ERR0" role="2ShVmc">
-                    <ref role="37wK5l" to="ksgm:1LBj9w_EhDG" resolve="RulesPlanHandler" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6kREIVkWT7i" role="3cqZAp" />
-        <node concept="3clFbF" id="6kREIVkX6vM" role="3cqZAp">
-          <node concept="2OqwBi" id="6kREIVkX6vO" role="3clFbG">
-            <node concept="2ShNRf" id="6kREIVkX8wA" role="2Oq$k0">
-              <node concept="1pGfFk" id="6kREIVkX8wB" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:1pPth$lK1ZL" resolve="CoderulesHelper" />
-                <node concept="10Nm6u" id="5MNibEMWwxM" role="37wK5m" />
-                <node concept="2ShNRf" id="6kREIVkX8wC" role="37wK5m">
-                  <node concept="YeOm9" id="6kREIVkX8wD" role="2ShVmc">
-                    <node concept="1Y3b0j" id="6kREIVkX8wE" role="YeSDq">
-                      <property role="2bfB8j" value="true" />
-                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                      <ref role="1Y3XeK" to="1yqb:3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
-                      <node concept="3Tm1VV" id="6kREIVkX8wF" role="1B3o_S" />
-                      <node concept="3clFb_" id="3MwxBzG65AK" role="jymVt">
-                        <property role="TrG5h" value="done" />
-                        <node concept="37vLTG" id="3MwxBzG65AL" role="3clF46">
-                          <property role="TrG5h" value="message" />
-                          <node concept="17QB3L" id="3MwxBzG65AM" role="1tU5fm" />
-                        </node>
-                        <node concept="37vLTG" id="3MwxBzG65AN" role="3clF46">
-                          <property role="TrG5h" value="result" />
-                          <node concept="3uibUv" id="3MwxBzG65AO" role="1tU5fm">
-                            <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
-                          </node>
-                        </node>
-                        <node concept="3cqZAl" id="3MwxBzG65AP" role="3clF45" />
-                        <node concept="3Tm1VV" id="3MwxBzG65AQ" role="1B3o_S" />
-                        <node concept="3clFbS" id="3MwxBzG65AT" role="3clF47">
-                          <node concept="3clFbJ" id="3MwxBzG69bJ" role="3cqZAp">
-                            <node concept="3clFbS" id="3MwxBzG69bL" role="3clFbx">
-                              <node concept="3cpWs8" id="6kREIVkXHNY" role="3cqZAp">
-                                <node concept="3cpWsn" id="6kREIVkXHNZ" role="3cpWs9">
-                                  <property role="TrG5h" value="finder" />
-                                  <node concept="3uibUv" id="6kREIVkXHNK" role="1tU5fm">
-                                    <ref role="3uigEE" node="4n$QnzZQkF9" resolve="ApplicableTemplatesFinder" />
-                                  </node>
-                                  <node concept="2ShNRf" id="6kREIVkXHO0" role="33vP2m">
-                                    <node concept="1pGfFk" id="6kREIVkXHO1" role="2ShVmc">
-                                      <ref role="37wK5l" node="3YJ7yg2MSlk" resolve="ApplicableTemplatesFinder" />
-                                      <node concept="2OqwBi" id="6kREIVkXHO2" role="37wK5m">
-                                        <node concept="37vLTw" id="6kREIVkXHO3" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6kREIVkWRFq" resolve="applyTemplatesStep" />
-                                        </node>
-                                        <node concept="liA8E" id="6kREIVkXHO4" role="2OqNvi">
-                                          <ref role="37wK5l" to="1yqb:20Ay2VeR9qk" resolve="ruleTemplates" />
-                                        </node>
-                                      </node>
-                                      <node concept="2OqwBi" id="6kREIVkXHO5" role="37wK5m">
-                                        <node concept="2WthIp" id="6kREIVkXHO6" role="2Oq$k0" />
-                                        <node concept="1DTwFV" id="6kREIVkXHO7" role="2OqNvi">
-                                          <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3cpWs8" id="6kREIVkXK5h" role="3cqZAp">
-                                <node concept="3cpWsn" id="6kREIVkXK5i" role="3cpWs9">
-                                  <property role="TrG5h" value="query" />
-                                  <node concept="3uibUv" id="6kREIVkXK57" role="1tU5fm">
-                                    <ref role="3uigEE" to="9erk:~SearchQuery" resolve="SearchQuery" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="1QHqEK" id="5upUcEtjDdE" role="3cqZAp">
-                                <node concept="1QHqEC" id="5upUcEtjDdG" role="1QHqEI">
-                                  <node concept="3clFbS" id="5upUcEtjDdI" role="1bW5cS">
-                                    <node concept="3clFbF" id="5upUcEtiRpS" role="3cqZAp">
-                                      <node concept="37vLTI" id="5upUcEtiRpU" role="3clFbG">
-                                        <node concept="2ShNRf" id="6kREIVkXK5j" role="37vLTx">
-                                          <node concept="1pGfFk" id="6kREIVkXK5k" role="2ShVmc">
-                                            <ref role="37wK5l" to="9erk:~SearchQuery.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.module.SearchScope)" resolve="SearchQuery" />
-                                            <node concept="2OqwBi" id="6kREIVkXK5l" role="37wK5m">
-                                              <node concept="2WthIp" id="6kREIVkXK5m" role="2Oq$k0" />
-                                              <node concept="1DTwFV" id="6kREIVkXK5n" role="2OqNvi">
-                                                <ref role="2WH_rO" node="3YJ7yg2LgUp" resolve="node" />
-                                              </node>
-                                            </node>
-                                            <node concept="2OqwBi" id="6kREIVkXK5o" role="37wK5m">
-                                              <node concept="2OqwBi" id="6kREIVkXK5p" role="2Oq$k0">
-                                                <node concept="2WthIp" id="6kREIVkXK5q" role="2Oq$k0" />
-                                                <node concept="1DTwFV" id="6kREIVkXK5r" role="2OqNvi">
-                                                  <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
-                                                </node>
-                                              </node>
-                                              <node concept="liA8E" id="6kREIVkXK5s" role="2OqNvi">
-                                                <ref role="37wK5l" to="z1c3:~Project.getScope()" resolve="getScope" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="37vLTw" id="5upUcEtiRpY" role="37vLTJ">
-                                          <ref role="3cqZAo" node="6kREIVkXK5i" resolve="query" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="2OqwBi" id="5upUcEtjF_F" role="ukAjM">
-                                  <node concept="2OqwBi" id="5upUcEtjEoy" role="2Oq$k0">
-                                    <node concept="2WthIp" id="5upUcEtjEo_" role="2Oq$k0">
-                                      <ref role="32nkFo" node="3YJ7yg2LgPI" resolve="FindApplicableTemplates" />
-                                    </node>
-                                    <node concept="1DTwFV" id="5upUcEtjEoB" role="2OqNvi">
-                                      <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="5upUcEtjHoz" role="2OqNvi">
-                                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3cpWs8" id="6kREIVkX8wN" role="3cqZAp">
-                                <node concept="3cpWsn" id="6kREIVkX8wO" role="3cpWs9">
-                                  <property role="TrG5h" value="opt" />
-                                  <node concept="3uibUv" id="6kREIVkX8wP" role="1tU5fm">
-                                    <ref role="3uigEE" to="ngmn:~UsageToolOptions" resolve="UsageToolOptions" />
-                                  </node>
-                                  <node concept="2OqwBi" id="6kREIVkX8wQ" role="33vP2m">
-                                    <node concept="2OqwBi" id="6kREIVkX8wR" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="6kREIVkX8wS" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="6kREIVkX8wT" role="2Oq$k0">
-                                          <node concept="2ShNRf" id="6kREIVkX8wU" role="2Oq$k0">
-                                            <node concept="1pGfFk" id="6kREIVkX8wV" role="2ShVmc">
-                                              <ref role="37wK5l" to="ngmn:~UsageToolOptions.&lt;init&gt;()" resolve="UsageToolOptions" />
-                                            </node>
-                                          </node>
-                                          <node concept="liA8E" id="6kREIVkX8wW" role="2OqNvi">
-                                            <ref role="37wK5l" to="ngmn:~UsageToolOptions.allowRunAgain(boolean)" resolve="allowRunAgain" />
-                                            <node concept="3clFbT" id="6kREIVkX8wX" role="37wK5m" />
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="6kREIVkX8wY" role="2OqNvi">
-                                          <ref role="37wK5l" to="ngmn:~UsageToolOptions.navigateIfSingle(boolean)" resolve="navigateIfSingle" />
-                                          <node concept="3clFbT" id="6kREIVkX8wZ" role="37wK5m">
-                                            <property role="3clFbU" value="false" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="liA8E" id="6kREIVkX8x0" role="2OqNvi">
-                                        <ref role="37wK5l" to="ngmn:~UsageToolOptions.forceNewTab(boolean)" resolve="forceNewTab" />
-                                        <node concept="3clFbT" id="6kREIVkX8x1" role="37wK5m">
-                                          <property role="3clFbU" value="false" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="6kREIVkX8x2" role="2OqNvi">
-                                      <ref role="37wK5l" to="ngmn:~UsageToolOptions.notFoundMessage(java.lang.String)" resolve="notFoundMessage" />
-                                      <node concept="Xl_RD" id="6kREIVkX8x3" role="37wK5m">
-                                        <property role="Xl_RC" value="no applicable templates found" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="6kREIVkX8x4" role="3cqZAp">
-                                <node concept="2YIFZM" id="6kREIVkX8x5" role="3clFbG">
-                                  <ref role="1Pybhc" to="ngmn:~UsagesViewTool" resolve="UsagesViewTool" />
-                                  <ref role="37wK5l" to="ngmn:~UsagesViewTool.showUsages(com.intellij.openapi.project.Project,jetbrains.mps.ide.findusages.model.IResultProvider,jetbrains.mps.ide.findusages.model.SearchQuery,jetbrains.mps.ide.findusages.view.UsageToolOptions)" resolve="showUsages" />
-                                  <node concept="2OqwBi" id="6kREIVkX8x6" role="37wK5m">
-                                    <node concept="2WthIp" id="6kREIVkX8x7" role="2Oq$k0" />
-                                    <node concept="1DTwFV" id="6kREIVkX8x8" role="2OqNvi">
-                                      <ref role="2WH_rO" node="3YJ7yg2OPyo" resolve="ideaProject" />
-                                    </node>
-                                  </node>
-                                  <node concept="2YIFZM" id="6kREIVkX8x9" role="37wK5m">
-                                    <ref role="37wK5l" to="ngmm:~FindUtils.makeProvider(jetbrains.mps.ide.findusages.findalgorithm.finders.IFinder...)" resolve="makeProvider" />
-                                    <ref role="1Pybhc" to="ngmm:~FindUtils" resolve="FindUtils" />
-                                    <node concept="37vLTw" id="6kREIVkXHO8" role="37wK5m">
-                                      <ref role="3cqZAo" node="6kREIVkXHNZ" resolve="finder" />
-                                    </node>
-                                  </node>
-                                  <node concept="37vLTw" id="6kREIVkXK5t" role="37wK5m">
-                                    <ref role="3cqZAo" node="6kREIVkXK5i" resolve="query" />
-                                  </node>
-                                  <node concept="37vLTw" id="6kREIVkX8xj" role="37wK5m">
-                                    <ref role="3cqZAo" node="6kREIVkX8wO" resolve="opt" />
-                                  </node>
-                                </node>
-                                <node concept="15s5l7" id="6kREIVkX8xk" role="lGtFl" />
-                              </node>
-                              <node concept="3clFbH" id="3MwxBzG6dqk" role="3cqZAp" />
-                            </node>
-                            <node concept="2OqwBi" id="3MwxBzG6aHK" role="3clFbw">
-                              <node concept="37vLTw" id="3MwxBzG69IR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3MwxBzG65AN" resolve="result" />
-                              </node>
-                              <node concept="liA8E" id="3MwxBzG6bvY" role="2OqNvi">
-                                <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
-                              </node>
-                            </node>
-                            <node concept="9aQIb" id="3MwxBzG6cPI" role="9aQIa">
-                              <node concept="3clFbS" id="3MwxBzG6cPJ" role="9aQI4">
-                                <node concept="3clFbF" id="6kREIVkX8xs" role="3cqZAp">
-                                  <node concept="2YIFZM" id="6kREIVkX8xt" role="3clFbG">
-                                    <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String)" resolve="showWarningDialog" />
-                                    <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
-                                    <node concept="37vLTw" id="3MwxBzG6fXK" role="37wK5m">
-                                      <ref role="3cqZAo" node="3MwxBzG65AL" resolve="message" />
-                                    </node>
-                                    <node concept="Xl_RD" id="6kREIVkX8xv" role="37wK5m">
-                                      <property role="Xl_RC" value="Find Applicable Templates" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2AHcQZ" id="3MwxBzG65AU" role="2AJF6D">
-                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                        </node>
+            <node concept="2OqwBi" id="4XsNDZYkIag" role="33vP2m">
+              <node concept="2OqwBi" id="4XsNDZYkIah" role="2Oq$k0">
+                <node concept="2OqwBi" id="4XsNDZYkIai" role="2Oq$k0">
+                  <node concept="2OqwBi" id="4XsNDZYkIaj" role="2Oq$k0">
+                    <node concept="2ShNRf" id="4XsNDZYkIak" role="2Oq$k0">
+                      <node concept="1pGfFk" id="4XsNDZYkIal" role="2ShVmc">
+                        <ref role="37wK5l" to="ngmn:~UsageToolOptions.&lt;init&gt;()" resolve="UsageToolOptions" />
                       </node>
                     </node>
+                    <node concept="liA8E" id="4XsNDZYkIam" role="2OqNvi">
+                      <ref role="37wK5l" to="ngmn:~UsageToolOptions.allowRunAgain(boolean)" resolve="allowRunAgain" />
+                      <node concept="3clFbT" id="4XsNDZYkIan" role="37wK5m" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="4XsNDZYkIao" role="2OqNvi">
+                    <ref role="37wK5l" to="ngmn:~UsageToolOptions.navigateIfSingle(boolean)" resolve="navigateIfSingle" />
+                    <node concept="3clFbT" id="4XsNDZYkIap" role="37wK5m">
+                      <property role="3clFbU" value="false" />
+                    </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="6kREIVkX8xw" role="37wK5m">
-                  <ref role="3cqZAo" node="6kREIVkWRFq" resolve="applyTemplatesStep" />
+                <node concept="liA8E" id="4XsNDZYkIaq" role="2OqNvi">
+                  <ref role="37wK5l" to="ngmn:~UsageToolOptions.forceNewTab(boolean)" resolve="forceNewTab" />
+                  <node concept="3clFbT" id="4XsNDZYkIar" role="37wK5m">
+                    <property role="3clFbU" value="false" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="4XsNDZYkIas" role="2OqNvi">
+                <ref role="37wK5l" to="ngmn:~UsageToolOptions.notFoundMessage(java.lang.String)" resolve="notFoundMessage" />
+                <node concept="Xl_RD" id="4XsNDZYkIat" role="37wK5m">
+                  <property role="Xl_RC" value="no applicable templates found" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="6kREIVkX6vQ" role="2OqNvi">
-              <ref role="37wK5l" to="1yqb:1pPth$lNVW2" resolve="executeAsync" />
-            </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6kREIVkX3RG" role="3cqZAp" />
+        <node concept="3clFbF" id="4XsNDZYkIau" role="3cqZAp">
+          <node concept="2YIFZM" id="4XsNDZYkIav" role="3clFbG">
+            <ref role="37wK5l" to="ngmn:~UsagesViewTool.showUsages(com.intellij.openapi.project.Project,jetbrains.mps.ide.findusages.model.IResultProvider,jetbrains.mps.ide.findusages.model.SearchQuery,jetbrains.mps.ide.findusages.view.UsageToolOptions)" resolve="showUsages" />
+            <ref role="1Pybhc" to="ngmn:~UsagesViewTool" resolve="UsagesViewTool" />
+            <node concept="2OqwBi" id="4XsNDZYkIaw" role="37wK5m">
+              <node concept="2WthIp" id="4XsNDZYkIax" role="2Oq$k0" />
+              <node concept="1DTwFV" id="4XsNDZYkIay" role="2OqNvi">
+                <ref role="2WH_rO" node="3YJ7yg2OPyo" resolve="ideaProject" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="4XsNDZYkIaz" role="37wK5m">
+              <ref role="1Pybhc" to="ngmm:~FindUtils" resolve="FindUtils" />
+              <ref role="37wK5l" to="ngmm:~FindUtils.makeProvider(jetbrains.mps.ide.findusages.findalgorithm.finders.IFinder...)" resolve="makeProvider" />
+              <node concept="37vLTw" id="4XsNDZYkIa$" role="37wK5m">
+                <ref role="3cqZAo" node="4XsNDZYkI9F" resolve="finder" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4XsNDZYkIa_" role="37wK5m">
+              <ref role="3cqZAo" node="4XsNDZYkI9Q" resolve="query" />
+            </node>
+            <node concept="37vLTw" id="4XsNDZYkIaA" role="37wK5m">
+              <ref role="3cqZAo" node="4XsNDZYkIae" resolve="opt" />
+            </node>
+          </node>
+          <node concept="15s5l7" id="4XsNDZYkIaB" role="lGtFl" />
+        </node>
       </node>
     </node>
     <node concept="2ScWuX" id="3YJ7yg2LDPl" role="tmbBb">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 5b1dc78c..c23d5abf 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -102,6 +102,10 @@
       <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
         <child id="1076505808688" name="condition" index="2$JKZa" />
       </concept>
+      <concept id="1173175405605" name="jetbrains.mps.baseLanguage.structure.ArrayAccessExpression" flags="nn" index="AH0OO">
+        <child id="1173175577737" name="index" index="AHEQo" />
+        <child id="1173175590490" name="array" index="AHHXb" />
+      </concept>
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
@@ -321,6 +325,7 @@
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
+      <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
@@ -9333,6 +9338,111 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="4XsNDZY7AsY" role="jymVt" />
+    <node concept="3clFb_" id="4XsNDZY7Lel" role="jymVt">
+      <property role="TrG5h" value="findRuleTemplates" />
+      <node concept="37vLTG" id="4XsNDZY8sF5" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3Tqbb2" id="4XsNDZY8xQP" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="4XsNDZY7QRl" role="3clF45">
+        <ref role="3uigEE" node="1z4$59iohfJ" resolve="TypecheckingService.Request" />
+        <node concept="_YKpA" id="4XsNDZY7WnK" role="11_B2D">
+          <node concept="2sp9CU" id="4XsNDZY8h8$" role="_ZDj9" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4XsNDZY7Leo" role="1B3o_S" />
+      <node concept="3clFbS" id="4XsNDZY7Lep" role="3clF47">
+        <node concept="3clFbF" id="4XsNDZY8_nb" role="3cqZAp">
+          <node concept="2ShNRf" id="4XsNDZY8_n9" role="3clFbG">
+            <node concept="YeOm9" id="4XsNDZY8CnW" role="2ShVmc">
+              <node concept="1Y3b0j" id="4XsNDZY8CnZ" role="YeSDq">
+                <property role="2bfB8j" value="true" />
+                <ref role="37wK5l" node="1z4$59irJq1" resolve="TypecheckingService.Request" />
+                <ref role="1Y3XeK" node="1z4$59iohfJ" resolve="TypecheckingService.Request" />
+                <node concept="3Tm1VV" id="4XsNDZY8Co0" role="1B3o_S" />
+                <node concept="Xl_RD" id="4XsNDZY8AYy" role="37wK5m">
+                  <property role="Xl_RC" value="FindTemplates" />
+                </node>
+                <node concept="37vLTw" id="4XsNDZY8B4e" role="37wK5m">
+                  <ref role="3cqZAo" node="4XsNDZY8sF5" resolve="source" />
+                </node>
+                <node concept="3clFb_" id="4XsNDZY8Ee$" role="jymVt">
+                  <property role="TrG5h" value="get" />
+                  <node concept="_YKpA" id="4XsNDZY8Jyb" role="3clF45">
+                    <node concept="2sp9CU" id="4XsNDZY8LJB" role="_ZDj9" />
+                  </node>
+                  <node concept="3Tm1VV" id="4XsNDZY8EeA" role="1B3o_S" />
+                  <node concept="3clFbS" id="4XsNDZY8EeE" role="3clF47">
+                    <node concept="3SKdUt" id="4XsNDZY8Pj$" role="3cqZAp">
+                      <node concept="1PaTwC" id="4XsNDZY8Pj_" role="1aUNEU">
+                        <node concept="3oM_SD" id="4XsNDZY8PjA" role="1PaTwD">
+                          <property role="3oM_SC" value="ensure" />
+                        </node>
+                        <node concept="3oM_SD" id="4XsNDZY8PjB" role="1PaTwD">
+                          <property role="3oM_SC" value="we" />
+                        </node>
+                        <node concept="3oM_SD" id="4XsNDZY8PjC" role="1PaTwD">
+                          <property role="3oM_SC" value="can" />
+                        </node>
+                        <node concept="3oM_SD" id="4XsNDZY8PjD" role="1PaTwD">
+                          <property role="3oM_SC" value="read" />
+                        </node>
+                        <node concept="3oM_SD" id="4XsNDZY8PjE" role="1PaTwD">
+                          <property role="3oM_SC" value="the" />
+                        </node>
+                        <node concept="3oM_SD" id="4XsNDZY8PjF" role="1PaTwD">
+                          <property role="3oM_SC" value="model" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="4XsNDZY8PjG" role="3cqZAp">
+                      <node concept="2OqwBi" id="4XsNDZY8PjH" role="3clFbG">
+                        <node concept="2OqwBi" id="4XsNDZY8PjI" role="2Oq$k0">
+                          <node concept="37vLTw" id="4XsNDZY8PjJ" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                          </node>
+                          <node concept="liA8E" id="4XsNDZY8PjK" role="2OqNvi">
+                            <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="4XsNDZY8PjL" role="2OqNvi">
+                          <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="4XsNDZY8QD5" role="3cqZAp" />
+                    <node concept="3clFbF" id="4XsNDZYiaL1" role="3cqZAp">
+                      <node concept="2OqwBi" id="4XsNDZYieFK" role="3clFbG">
+                        <node concept="1rXfSq" id="4XsNDZYiaKZ" role="2Oq$k0">
+                          <ref role="37wK5l" node="4XsNDZY8YSe" resolve="calcApplicableTemplates" />
+                          <node concept="1rXfSq" id="4XsNDZYicdn" role="37wK5m">
+                            <ref role="37wK5l" node="1RYTbd85bdi" resolve="self" />
+                          </node>
+                          <node concept="37vLTw" id="4XsNDZYidaT" role="37wK5m">
+                            <ref role="3cqZAo" node="4XsNDZY8sF5" resolve="source" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="4XsNDZYigCP" role="2OqNvi">
+                          <ref role="37wK5l" node="1RYTbd8j4FJ" resolve="getValue" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="4XsNDZY8EeF" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
+                <node concept="_YKpA" id="4XsNDZY8J4y" role="2Ghqu4">
+                  <node concept="2sp9CU" id="4XsNDZY8JrQ" role="_ZDj9" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="1RYTbd7MH$f" role="jymVt" />
     <node concept="3clFbW" id="7kaxm0sEBCn" role="jymVt">
       <node concept="37vLTG" id="5cBWTAeiD_W" role="3clF46">
@@ -10533,6 +10643,144 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="4XsNDZY8QI5" role="jymVt" />
+    <node concept="3clFb_" id="4XsNDZY8YSe" role="jymVt">
+      <property role="TrG5h" value="calcApplicableTemplates" />
+      <node concept="37vLTG" id="4XsNDZY9qwG" role="3clF46">
+        <property role="TrG5h" value="request" />
+        <node concept="3uibUv" id="4XsNDZY9w_6" role="1tU5fm">
+          <ref role="3uigEE" node="1z4$59iohfJ" resolve="TypecheckingService.Request" />
+          <node concept="3qTvmN" id="4XsNDZY9$Gh" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4XsNDZY9AhH" role="3clF46">
+        <property role="TrG5h" value="input" />
+        <node concept="3Tqbb2" id="4XsNDZY9G2k" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="4XsNDZY92HC" role="3clF45">
+        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="TypecheckingService.Response" />
+        <node concept="_YKpA" id="4XsNDZY99dT" role="11_B2D">
+          <node concept="2sp9CU" id="4XsNDZY99eb" role="_ZDj9" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4XsNDZY8YSh" role="1B3o_S" />
+      <node concept="3clFbS" id="4XsNDZY8YSi" role="3clF47">
+        <node concept="3cpWs8" id="4XsNDZYbYVu" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZYbYVv" role="3cpWs9">
+            <property role="TrG5h" value="strategy" />
+            <node concept="3uibUv" id="4XsNDZYbXIU" role="1tU5fm">
+              <ref role="3uigEE" node="4XsNDZYbpLK" resolve="TypecheckingStrategy.FindTemplates" />
+            </node>
+            <node concept="2ShNRf" id="4XsNDZYbYVw" role="33vP2m">
+              <node concept="1pGfFk" id="4XsNDZYbYVx" role="2ShVmc">
+                <ref role="37wK5l" node="4XsNDZYbHNO" resolve="TypecheckingStrategy.FindTemplates" />
+                <node concept="37vLTw" id="4XsNDZYbYVy" role="37wK5m">
+                  <ref role="3cqZAo" node="4XsNDZY9qwG" resolve="request" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4XsNDZYcpfk" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZYcpfl" role="3cpWs9">
+            <property role="TrG5h" value="helpers" />
+            <node concept="_YKpA" id="4XsNDZYcldq" role="1tU5fm">
+              <node concept="3uibUv" id="4XsNDZYcldt" role="_ZDj9">
+                <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+              </node>
+            </node>
+            <node concept="1rXfSq" id="4XsNDZYcpfm" role="33vP2m">
+              <ref role="37wK5l" node="4XsNDZY9Lq7" resolve="findTemplateHelpers" />
+              <node concept="37vLTw" id="4XsNDZYcpfn" role="37wK5m">
+                <ref role="3cqZAo" node="4XsNDZY9qwG" resolve="request" />
+              </node>
+              <node concept="37vLTw" id="4XsNDZYcpfo" role="37wK5m">
+                <ref role="3cqZAo" node="4XsNDZY9AhH" resolve="input" />
+              </node>
+              <node concept="37vLTw" id="4XsNDZYcpfp" role="37wK5m">
+                <ref role="3cqZAo" node="4XsNDZYbYVv" resolve="strategy" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4XsNDZYcqVk" role="3cqZAp" />
+        <node concept="3cpWs8" id="4XsNDZYcSa5" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZYcSa6" role="3cpWs9">
+            <property role="TrG5h" value="ok" />
+            <node concept="10P_77" id="4XsNDZYcS4L" role="1tU5fm" />
+            <node concept="2OqwBi" id="4XsNDZYcSa7" role="33vP2m">
+              <node concept="2ShNRf" id="4XsNDZYcSa8" role="2Oq$k0">
+                <node concept="1pGfFk" id="4XsNDZYcSa9" role="2ShVmc">
+                  <ref role="37wK5l" node="6nFpYluGGhv" resolve="BlockingExecutor" />
+                  <node concept="37vLTw" id="4XsNDZYcSaa" role="37wK5m">
+                    <ref role="3cqZAo" node="4XsNDZY9qwG" resolve="request" />
+                  </node>
+                  <node concept="37vLTw" id="4XsNDZYcSab" role="37wK5m">
+                    <ref role="3cqZAo" node="4XsNDZYcpfl" resolve="helpers" />
+                  </node>
+                  <node concept="37vLTw" id="4XsNDZYcSac" role="37wK5m">
+                    <ref role="3cqZAo" node="4XsNDZYbYVv" resolve="strategy" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="4XsNDZYcSad" role="2OqNvi">
+                <ref role="37wK5l" node="6nFpYluGNy5" resolve="execute" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4XsNDZYetgB" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZYetgC" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="_YKpA" id="4XsNDZYeqgD" role="1tU5fm">
+              <node concept="2sp9CU" id="4XsNDZYeqgG" role="_ZDj9" />
+            </node>
+            <node concept="2ShNRf" id="4XsNDZYetgD" role="33vP2m">
+              <node concept="Tc6Ow" id="4XsNDZYetgE" role="2ShVmc">
+                <node concept="2sp9CU" id="4XsNDZYetgF" role="HW$YZ" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="4XsNDZYcTLI" role="3cqZAp">
+          <node concept="3clFbS" id="4XsNDZYcTLU" role="3clFbx">
+            <node concept="3cpWs6" id="4XsNDZYcU0y" role="3cqZAp">
+              <node concept="2OqwBi" id="4XsNDZYcU0z" role="3cqZAk">
+                <node concept="37vLTw" id="4XsNDZYcU0$" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4XsNDZYbYVv" resolve="strategy" />
+                </node>
+                <node concept="liA8E" id="4XsNDZYcU0_" role="2OqNvi">
+                  <ref role="37wK5l" node="4XsNDZYfRLS" resolve="populateResponse" />
+                  <node concept="2YIFZM" id="4XsNDZYcU0A" role="37wK5m">
+                    <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
+                    <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="TypecheckingService.Response" />
+                    <node concept="37vLTw" id="4XsNDZYetgG" role="37wK5m">
+                      <ref role="3cqZAo" node="4XsNDZYetgC" resolve="result" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="4XsNDZYcSae" role="3clFbw">
+            <ref role="3cqZAo" node="4XsNDZYcSa6" resolve="ok" />
+          </node>
+          <node concept="9aQIb" id="4XsNDZYeSS$" role="9aQIa">
+            <node concept="3clFbS" id="4XsNDZYeSS_" role="9aQI4">
+              <node concept="3cpWs6" id="4XsNDZYeYe4" role="3cqZAp">
+                <node concept="2YIFZM" id="4XsNDZYf58V" role="3cqZAk">
+                  <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
+                  <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="TypecheckingService.Response" />
+                  <node concept="37vLTw" id="4XsNDZYfa$6" role="37wK5m">
+                    <ref role="3cqZAo" node="4XsNDZYetgC" resolve="result" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="1T5MAgP$U$2" role="jymVt" />
     <node concept="3clFb_" id="1FOQehxnBew" role="jymVt">
       <property role="TrG5h" value="checkHelpers" />
@@ -10907,6 +11155,93 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="4XsNDZYacD6" role="jymVt" />
+    <node concept="3clFb_" id="4XsNDZY9Lq7" role="jymVt">
+      <property role="TrG5h" value="findTemplateHelpers" />
+      <node concept="3Tm6S6" id="4XsNDZY9Lq8" role="1B3o_S" />
+      <node concept="_YKpA" id="4XsNDZY9Lq9" role="3clF45">
+        <node concept="3uibUv" id="4XsNDZY9Lqa" role="_ZDj9">
+          <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4XsNDZY9Lqb" role="3clF46">
+        <property role="TrG5h" value="request" />
+        <node concept="3uibUv" id="4XsNDZY9Lqc" role="1tU5fm">
+          <ref role="3uigEE" node="1z4$59iohfJ" resolve="TypecheckingService.Request" />
+          <node concept="3qTvmN" id="4XsNDZY9Lqd" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4XsNDZY9Lqe" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="4XsNDZY9Lqf" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="4XsNDZY9Lqi" role="3clF46">
+        <property role="TrG5h" value="strategy" />
+        <node concept="3uibUv" id="4XsNDZY9Lqj" role="1tU5fm">
+          <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4XsNDZY9Lqm" role="3clF47">
+        <node concept="3cpWs8" id="4XsNDZY9Lqn" role="3cqZAp">
+          <node concept="3cpWsn" id="4XsNDZY9Lqo" role="3cpWs9">
+            <property role="TrG5h" value="acs" />
+            <node concept="3vKaQO" id="4XsNDZY9Lqp" role="1tU5fm">
+              <node concept="3uibUv" id="4XsNDZY9Lqq" role="3O5elw">
+                <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                <node concept="3uibUv" id="4XsNDZY9Lqr" role="11_B2D">
+                  <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4XsNDZY9Lqs" role="33vP2m">
+              <node concept="2YIFZM" id="4XsNDZY9Lqt" role="2Oq$k0">
+                <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
+                <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+              </node>
+              <node concept="liA8E" id="4XsNDZY9Lqu" role="2OqNvi">
+                <ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
+                <node concept="2ShNRf" id="4XsNDZY9Lqv" role="37wK5m">
+                  <node concept="2HTt$P" id="4XsNDZY9Lqw" role="2ShVmc">
+                    <node concept="3Tqbb2" id="4XsNDZY9Lqx" role="2HTBi0" />
+                    <node concept="37vLTw" id="4XsNDZY9Lqy" role="2HTEbv">
+                      <ref role="3cqZAo" node="4XsNDZY9Lqe" resolve="node" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="4XsNDZY9Lqz" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4XsNDZY9Lq$" role="3cqZAp" />
+        <node concept="3cpWs6" id="4XsNDZY9Lq_" role="3cqZAp">
+          <node concept="1rXfSq" id="4XsNDZY9LqA" role="3cqZAk">
+            <ref role="37wK5l" node="7i3KM7glTM9" resolve="helpers" />
+            <node concept="37vLTw" id="4XsNDZY9LqB" role="37wK5m">
+              <ref role="3cqZAo" node="4XsNDZY9Lqb" resolve="request" />
+            </node>
+            <node concept="2ShNRf" id="4XsNDZY9LqC" role="37wK5m">
+              <node concept="Tc6Ow" id="4XsNDZY9LqD" role="2ShVmc">
+                <node concept="3Tqbb2" id="4XsNDZY9LqE" role="HW$YZ" />
+                <node concept="37vLTw" id="4XsNDZY9LqF" role="HW$Y0">
+                  <ref role="3cqZAo" node="4XsNDZY9Lqe" resolve="node" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbT" id="4XsNDZYat7x" role="37wK5m" />
+            <node concept="37vLTw" id="4XsNDZY9LqH" role="37wK5m">
+              <ref role="3cqZAo" node="4XsNDZY9Lqo" resolve="acs" />
+            </node>
+            <node concept="37vLTw" id="4XsNDZY9LqI" role="37wK5m">
+              <ref role="3cqZAo" node="4XsNDZY9Lqi" resolve="strategy" />
+            </node>
+            <node concept="10Nm6u" id="4XsNDZYc3Bl" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="7i3KM7gm1cA" role="jymVt" />
     <node concept="3clFb_" id="7i3KM7glTM9" role="jymVt">
       <property role="TrG5h" value="helpers" />
@@ -11052,25 +11387,46 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7i3KM7gK1UC" role="3cqZAp">
-              <node concept="2OqwBi" id="7i3KM7gK1UD" role="3clFbG">
-                <node concept="37vLTw" id="7i3KM7gK1UE" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7i3KM7gI7pm" resolve="steps" />
+            <node concept="3cpWs8" id="4XsNDZYfHqA" role="3cqZAp">
+              <node concept="3cpWsn" id="4XsNDZYfHqB" role="3cpWs9">
+                <property role="TrG5h" value="typecheckingStep" />
+                <node concept="3uibUv" id="4XsNDZYbPPV" role="1tU5fm">
+                  <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
                 </node>
-                <node concept="TSZUe" id="7i3KM7gK1UF" role="2OqNvi">
-                  <node concept="2OqwBi" id="7i3KM7gK1UG" role="25WWJ7">
-                    <node concept="37vLTw" id="7i3KM7gK1UH" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7i3KM7gJskV" resolve="strategy" />
+                <node concept="2OqwBi" id="4XsNDZYfHqC" role="33vP2m">
+                  <node concept="37vLTw" id="4XsNDZYfHqD" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7i3KM7gJskV" resolve="strategy" />
+                  </node>
+                  <node concept="liA8E" id="4XsNDZYfHqE" role="2OqNvi">
+                    <ref role="37wK5l" node="7i3KM7gIGXj" resolve="typecheckingStep" />
+                    <node concept="37vLTw" id="4XsNDZYfHqF" role="37wK5m">
+                      <ref role="3cqZAo" node="7i3KM7glTNp" resolve="aspectClique" />
                     </node>
-                    <node concept="liA8E" id="7i3KM7gK7n0" role="2OqNvi">
-                      <ref role="37wK5l" node="7i3KM7gIGXj" resolve="typecheckingStep" />
-                      <node concept="37vLTw" id="7i3KM7gMMGG" role="37wK5m">
-                        <ref role="3cqZAo" node="7i3KM7glTNp" resolve="aspectClique" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="4XsNDZYfJ_8" role="3cqZAp">
+              <node concept="3clFbS" id="4XsNDZYfJ_a" role="3clFbx">
+                <node concept="3clFbF" id="7i3KM7gK1UC" role="3cqZAp">
+                  <node concept="2OqwBi" id="7i3KM7gK1UD" role="3clFbG">
+                    <node concept="37vLTw" id="7i3KM7gK1UE" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7i3KM7gI7pm" resolve="steps" />
+                    </node>
+                    <node concept="TSZUe" id="7i3KM7gK1UF" role="2OqNvi">
+                      <node concept="37vLTw" id="4XsNDZYfHqG" role="25WWJ7">
+                        <ref role="3cqZAo" node="4XsNDZYfHqB" resolve="typecheckingStep" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="3y3z36" id="4XsNDZYfKpK" role="3clFbw">
+                <node concept="10Nm6u" id="4XsNDZYfKsu" role="3uHU7w" />
+                <node concept="37vLTw" id="4XsNDZYfK3H" role="3uHU7B">
+                  <ref role="3cqZAo" node="4XsNDZYfHqB" resolve="typecheckingStep" />
+                </node>
+              </node>
             </node>
             <node concept="3clFbH" id="7i3KM7gKdWK" role="3cqZAp" />
             <node concept="3clFbF" id="7i3KM7glTNc" role="3cqZAp">
@@ -15403,6 +15759,7 @@
       <node concept="2tJIrI" id="7i3KM7gJdVc" role="jymVt" />
       <node concept="3clFb_" id="7i3KM7gIOdf" role="jymVt">
         <property role="TrG5h" value="applyTemplatesStep" />
+        <property role="1EzhhJ" value="true" />
         <node concept="37vLTG" id="7i3KM7gIUOR" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="7i3KM7gIVm_" role="1tU5fm">
@@ -15432,75 +15789,13 @@
           <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
           <node concept="3qTvmN" id="7i3KM7gIUOu" role="11_B2D" />
         </node>
-        <node concept="3clFbS" id="7i3KM7gIOdi" role="3clF47">
-          <node concept="3cpWs8" id="6nFpYlun4Ee" role="3cqZAp">
-            <node concept="3cpWsn" id="6nFpYlun4Ef" role="3cpWs9">
-              <property role="TrG5h" value="ruleProcessingSession" />
-              <node concept="3uibUv" id="6nFpYlun4qm" role="1tU5fm">
-                <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-              </node>
-              <node concept="1rXfSq" id="3OUB6BBxUqP" role="33vP2m">
-                <ref role="37wK5l" node="3OUB6BBxkCB" resolve="createRuleProcessingSession" />
-                <node concept="37vLTw" id="3OUB6BBxV4q" role="37wK5m">
-                  <ref role="3cqZAo" node="7i3KM7gIUOR" resolve="aspectClique" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="6nFpYlusfYc" role="3cqZAp" />
-          <node concept="3clFbF" id="6nFpYlusgov" role="3cqZAp">
-            <node concept="2ShNRf" id="6nFpYlusgor" role="3clFbG">
-              <node concept="1pGfFk" id="6nFpYlushfU" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
-                <node concept="37vLTw" id="6nFpYlushso" role="37wK5m">
-                  <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="ruleProcessingSession" />
-                </node>
-                <node concept="1rXfSq" id="61G6TdBAxrX" role="37wK5m">
-                  <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
-                  <node concept="37vLTw" id="6PWFJfG8SCT" role="37wK5m">
-                    <ref role="3cqZAo" node="7i3KM7gIUOR" resolve="aspectClique" />
-                  </node>
-                  <node concept="37vLTw" id="61G6TdBAxrY" role="37wK5m">
-                    <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="ruleProcessingSession" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="6nFpYlushsp" role="37wK5m">
-                  <ref role="3cqZAo" node="7i3KM7gIXYC" resolve="nodes" />
-                </node>
-                <node concept="37vLTw" id="61G6TdEblCH" role="37wK5m">
-                  <ref role="3cqZAo" node="61G6TdE5zcX" resolve="recursive" />
-                </node>
-                <node concept="3clFbT" id="3VwM5b67ZnH" role="37wK5m" />
-                <node concept="2OqwBi" id="61G6TdCopl$" role="37wK5m">
-                  <node concept="2OqwBi" id="1z4$59i_k3R" role="2Oq$k0">
-                    <node concept="37vLTw" id="61G6TdCl6qv" role="2Oq$k0">
-                      <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
-                    </node>
-                    <node concept="liA8E" id="1z4$59i_l75" role="2OqNvi">
-                      <ref role="37wK5l" node="1z4$59iwuVK" resolve="typecheckingService" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="61G6TdCov7_" role="2OqNvi">
-                    <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="6nFpYlushsr" role="37wK5m">
-                  <node concept="1pGfFk" id="1LBj9w_EIjy" role="2ShVmc">
-                    <ref role="37wK5l" to="ksgm:1LBj9w_EhDG" resolve="RulesPlanHandler" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="5EDW3XErDAu" role="37wK5m">
-                  <ref role="3cqZAo" node="5EDW3XErpy6" resolve="query" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
+        <node concept="3clFbS" id="7i3KM7gIOdi" role="3clF47" />
         <node concept="3Tmbuc" id="5Qx6_65qDQy" role="1B3o_S" />
       </node>
       <node concept="2tJIrI" id="61G6TdB_CjU" role="jymVt" />
       <node concept="3clFb_" id="7i3KM7gIGXj" role="jymVt">
         <property role="TrG5h" value="typecheckingStep" />
+        <property role="1EzhhJ" value="true" />
         <node concept="37vLTG" id="7i3KM7gMF1J" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="7i3KM7gMJmt" role="1tU5fm">
@@ -15515,29 +15810,7 @@
         <node concept="3uibUv" id="7i3KM7gJiH4" role="3clF45">
           <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
         </node>
-        <node concept="3clFbS" id="7i3KM7gIGXm" role="3clF47">
-          <node concept="3clFbF" id="7i3KM7gJnn4" role="3cqZAp">
-            <node concept="2ShNRf" id="7i3KM7gJnn6" role="3clFbG">
-              <node concept="1pGfFk" id="7i3KM7gJnn7" role="2ShVmc">
-                <ref role="37wK5l" node="3KN3A4vHiEF" resolve="TypecheckingStep" />
-                <node concept="2OqwBi" id="61G6TdCoQBA" role="37wK5m">
-                  <node concept="2OqwBi" id="1z4$59i_m33" role="2Oq$k0">
-                    <node concept="37vLTw" id="61G6TdCljBd" role="2Oq$k0">
-                      <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
-                    </node>
-                    <node concept="liA8E" id="1z4$59i_n5a" role="2OqNvi">
-                      <ref role="37wK5l" node="1z4$59iwuVK" resolve="typecheckingService" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="61G6TdCoRDX" role="2OqNvi">
-                    <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
-                  </node>
-                </node>
-                <node concept="10Nm6u" id="7i3KM7gJqho" role="37wK5m" />
-              </node>
-            </node>
-          </node>
-        </node>
+        <node concept="3clFbS" id="7i3KM7gIGXm" role="3clF47" />
         <node concept="3Tmbuc" id="5Qx6_65qKcD" role="1B3o_S" />
       </node>
       <node concept="2tJIrI" id="5Qx6_65q2fo" role="jymVt" />
@@ -15785,6 +16058,7 @@
       <node concept="2tJIrI" id="1RYTbd8e6mN" role="jymVt" />
       <node concept="3clFb_" id="1RYTbd8egNs" role="jymVt">
         <property role="TrG5h" value="populateResponse" />
+        <property role="1EzhhJ" value="true" />
         <node concept="37vLTG" id="1RYTbd8flJp" role="3clF46">
           <property role="TrG5h" value="response" />
           <node concept="3uibUv" id="1RYTbd8fpOA" role="1tU5fm">
@@ -15795,30 +16069,7 @@
           </node>
         </node>
         <node concept="3Tmbuc" id="1RYTbd8egNv" role="1B3o_S" />
-        <node concept="3clFbS" id="1RYTbd8egNw" role="3clF47">
-          <node concept="1X3_iC" id="1RYTbd8fOf7" role="lGtFl">
-            <property role="3V$3am" value="statement" />
-            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-            <node concept="3clFbF" id="1RYTbd8fvd2" role="8Wnug">
-              <node concept="2OqwBi" id="1RYTbd8fvmv" role="3clFbG">
-                <node concept="37vLTw" id="1RYTbd8fvd1" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1RYTbd8flJp" resolve="response" />
-                </node>
-                <node concept="liA8E" id="1RYTbd8fvUK" role="2OqNvi">
-                  <ref role="37wK5l" node="1RYTbd8cgqO" resolve="withReportItems" />
-                  <node concept="37vLTw" id="1RYTbd8fw2s" role="37wK5m">
-                    <ref role="3cqZAo" node="5Qx6_65qW78" resolve="collectedReportItems" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="1RYTbd8fPio" role="3cqZAp">
-            <node concept="37vLTw" id="1RYTbd8fPim" role="3clFbG">
-              <ref role="3cqZAo" node="1RYTbd8flJp" resolve="response" />
-            </node>
-          </node>
-        </node>
+        <node concept="3clFbS" id="1RYTbd8egNw" role="3clF47" />
         <node concept="3uibUv" id="1RYTbd8eSg_" role="3clF45">
           <ref role="3uigEE" node="1RYTbd8bNK8" resolve="TypecheckingService.Response" />
           <node concept="16syzq" id="1RYTbd8flJ3" role="11_B2D">
@@ -15988,6 +16239,414 @@
       </node>
     </node>
     <node concept="2tJIrI" id="61G6TdCquVw" role="jymVt" />
+    <node concept="312cEu" id="4XsNDZYbpLK" role="jymVt">
+      <property role="TrG5h" value="FindTemplates" />
+      <node concept="2tJIrI" id="4XsNDZYbBug" role="jymVt" />
+      <node concept="3clFbW" id="4XsNDZYbHNO" role="jymVt">
+        <node concept="37vLTG" id="4XsNDZYbHNP" role="3clF46">
+          <property role="TrG5h" value="request" />
+          <node concept="3uibUv" id="4XsNDZYbHNQ" role="1tU5fm">
+            <ref role="3uigEE" node="1z4$59iohfJ" resolve="TypecheckingService.Request" />
+            <node concept="3qTvmN" id="4XsNDZYbHNR" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="4XsNDZYbHNS" role="3clF45" />
+        <node concept="3Tmbuc" id="4XsNDZYbHNT" role="1B3o_S" />
+        <node concept="3clFbS" id="4XsNDZYbHO1" role="3clF47">
+          <node concept="XkiVB" id="4XsNDZYbHO3" role="3cqZAp">
+            <ref role="37wK5l" node="61G6TdCiqDU" resolve="TypecheckingStrategy.Default" />
+            <node concept="37vLTw" id="4XsNDZYbHO2" role="37wK5m">
+              <ref role="3cqZAo" node="4XsNDZYbHNP" resolve="request" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4XsNDZYhDx3" role="jymVt" />
+      <node concept="3Tm1VV" id="4XsNDZYbpLL" role="1B3o_S" />
+      <node concept="3uibUv" id="4XsNDZYb_ri" role="1zkMxy">
+        <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
+      </node>
+      <node concept="3clFb_" id="4XsNDZYbBO7" role="jymVt">
+        <property role="TrG5h" value="applyTemplatesStep" />
+        <node concept="37vLTG" id="4XsNDZYbBO8" role="3clF46">
+          <property role="TrG5h" value="aspectClique" />
+          <node concept="3uibUv" id="4XsNDZYbBO9" role="1tU5fm">
+            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <node concept="3qUE_q" id="4XsNDZYbBOa" role="11_B2D">
+              <node concept="3uibUv" id="4XsNDZYbBOb" role="3qUE_r">
+                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="4XsNDZYbBOc" role="3clF46">
+          <property role="TrG5h" value="nodes" />
+          <node concept="2I9FWS" id="4XsNDZYbBOd" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="4XsNDZYbBOe" role="3clF46">
+          <property role="TrG5h" value="recursive" />
+          <node concept="10P_77" id="4XsNDZYbBOf" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="4XsNDZYbBOg" role="3clF46">
+          <property role="TrG5h" value="query" />
+          <node concept="3uibUv" id="4XsNDZYbBOh" role="1tU5fm">
+            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="4XsNDZYbBOi" role="3clF45">
+          <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+          <node concept="3qTvmN" id="4XsNDZYbBOj" role="11_B2D" />
+        </node>
+        <node concept="3Tmbuc" id="4XsNDZYbBOl" role="1B3o_S" />
+        <node concept="3clFbS" id="4XsNDZYbBOm" role="3clF47">
+          <node concept="3clFbH" id="4XsNDZYgfUz" role="3cqZAp" />
+          <node concept="3cpWs8" id="4XsNDZYgxYq" role="3cqZAp">
+            <node concept="3cpWsn" id="4XsNDZYgxYr" role="3cpWs9">
+              <property role="TrG5h" value="processingSession" />
+              <node concept="3uibUv" id="4XsNDZYgsuJ" role="1tU5fm">
+                <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+              </node>
+              <node concept="1rXfSq" id="4XsNDZYgxYs" role="33vP2m">
+                <ref role="37wK5l" node="3OUB6BBxkCB" resolve="createRuleProcessingSession" />
+                <node concept="37vLTw" id="4XsNDZYgxYt" role="37wK5m">
+                  <ref role="3cqZAo" node="4XsNDZYbBO8" resolve="aspectClique" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="4XsNDZYgEfu" role="3cqZAp">
+            <node concept="3cpWsn" id="4XsNDZYgEfv" role="3cpWs9">
+              <property role="TrG5h" value="macroProcessing" />
+              <node concept="3uibUv" id="4XsNDZYgEdQ" role="1tU5fm">
+                <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+              </node>
+              <node concept="1rXfSq" id="4XsNDZYgEfw" role="33vP2m">
+                <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
+                <node concept="37vLTw" id="4XsNDZYgEfx" role="37wK5m">
+                  <ref role="3cqZAo" node="4XsNDZYbBO8" resolve="aspectClique" />
+                </node>
+                <node concept="37vLTw" id="4XsNDZYgEfy" role="37wK5m">
+                  <ref role="3cqZAo" node="4XsNDZYgxYr" resolve="processingSession" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4XsNDZYgF_V" role="3cqZAp" />
+          <node concept="3clFbF" id="4XsNDZYgfjs" role="3cqZAp">
+            <node concept="2ShNRf" id="6kREIVkWRFr" role="3clFbG">
+              <node concept="1pGfFk" id="6kREIVkWRFs" role="2ShVmc">
+                <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
+                <node concept="37vLTw" id="4XsNDZYgxYu" role="37wK5m">
+                  <ref role="3cqZAo" node="4XsNDZYgxYr" resolve="processingSession" />
+                </node>
+                <node concept="37vLTw" id="4XsNDZYgGxX" role="37wK5m">
+                  <ref role="3cqZAo" node="4XsNDZYgEfv" resolve="macroProcessing" />
+                </node>
+                <node concept="37vLTw" id="4XsNDZYglPF" role="37wK5m">
+                  <ref role="3cqZAo" node="4XsNDZYbBOc" resolve="nodes" />
+                </node>
+                <node concept="3clFbT" id="4XsNDZY64_Y" role="37wK5m" />
+                <node concept="3clFbT" id="4XsNDZY65$G" role="37wK5m" />
+                <node concept="2OqwBi" id="4XsNDZYgJaX" role="37wK5m">
+                  <node concept="2OqwBi" id="4XsNDZYgHst" role="2Oq$k0">
+                    <node concept="37vLTw" id="4XsNDZYgGAz" role="2Oq$k0">
+                      <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
+                    </node>
+                    <node concept="liA8E" id="4XsNDZYgITm" role="2OqNvi">
+                      <ref role="37wK5l" node="1z4$59iwuVK" resolve="typecheckingService" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="4XsNDZYgKyL" role="2OqNvi">
+                    <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6nFpYluqJHO" role="37wK5m">
+                  <node concept="1pGfFk" id="1LBj9w_ERR0" role="2ShVmc">
+                    <ref role="37wK5l" to="ksgm:1LBj9w_EhDG" resolve="RulesPlanHandler" />
+                  </node>
+                </node>
+                <node concept="10Nm6u" id="4XsNDZY66Ql" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4XsNDZYbBOn" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4XsNDZYbGPl" role="jymVt" />
+      <node concept="3clFb_" id="4XsNDZYbBOq" role="jymVt">
+        <property role="TrG5h" value="typecheckingStep" />
+        <node concept="37vLTG" id="4XsNDZYbBOr" role="3clF46">
+          <property role="TrG5h" value="aspectClique" />
+          <node concept="3uibUv" id="4XsNDZYbBOs" role="1tU5fm">
+            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <node concept="3qUE_q" id="4XsNDZYbBOt" role="11_B2D">
+              <node concept="3uibUv" id="4XsNDZYbBOu" role="3qUE_r">
+                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="4XsNDZYbBOv" role="3clF45">
+          <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
+        </node>
+        <node concept="3Tmbuc" id="4XsNDZYbBOx" role="1B3o_S" />
+        <node concept="3clFbS" id="4XsNDZYbBOy" role="3clF47">
+          <node concept="3clFbF" id="4XsNDZYbBO_" role="3cqZAp">
+            <node concept="10Nm6u" id="4XsNDZYbBO$" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4XsNDZYbBOz" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4XsNDZYgLO6" role="jymVt" />
+      <node concept="3clFb_" id="4XsNDZYgMfl" role="jymVt">
+        <property role="TrG5h" value="processEffect" />
+        <node concept="37vLTG" id="4XsNDZYgMfm" role="3clF46">
+          <property role="TrG5h" value="aspectClique" />
+          <node concept="3uibUv" id="4XsNDZYgMfn" role="1tU5fm">
+            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <node concept="3qTvmN" id="4XsNDZYgMfo" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="4XsNDZYgMfp" role="3clF46">
+          <property role="TrG5h" value="effect" />
+          <node concept="3uibUv" id="4XsNDZYgMfq" role="1tU5fm">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="4XsNDZYgMfr" role="3clF45" />
+        <node concept="3Tmbuc" id="4XsNDZYgMfs" role="1B3o_S" />
+        <node concept="3clFbS" id="4XsNDZYgMgR" role="3clF47">
+          <node concept="3clFbF" id="4XsNDZYh_$V" role="3cqZAp">
+            <node concept="2OqwBi" id="4XsNDZYh_G5" role="3clFbG">
+              <node concept="37vLTw" id="4XsNDZYh_$T" role="2Oq$k0">
+                <ref role="3cqZAo" node="4XsNDZYgMfp" resolve="effect" />
+              </node>
+              <node concept="liA8E" id="4XsNDZYh_VV" role="2OqNvi">
+                <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
+                <node concept="10M0yZ" id="4XsNDZYhPTQ" role="37wK5m">
+                  <ref role="3cqZAo" to="1yqb:4XsNDZYgUF5" resolve="RULE_TEMPLATES_INDEX" />
+                  <ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                </node>
+                <node concept="1bVj0M" id="4XsNDZYhC8T" role="37wK5m">
+                  <node concept="3clFbS" id="4XsNDZYhC8V" role="1bW5cS">
+                    <node concept="3cpWs8" id="4XsNDZYiupE" role="3cqZAp">
+                      <node concept="3cpWsn" id="4XsNDZYiupF" role="3cpWs9">
+                        <property role="TrG5h" value="args" />
+                        <node concept="10Q1$e" id="4XsNDZYipAu" role="1tU5fm">
+                          <node concept="3uibUv" id="4XsNDZYipAx" role="10Q1$1">
+                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="4XsNDZYiupG" role="33vP2m">
+                          <node concept="37vLTw" id="4XsNDZYiupH" role="2Oq$k0">
+                            <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
+                          </node>
+                          <node concept="liA8E" id="4XsNDZYiupI" role="2OqNvi">
+                            <ref role="37wK5l" node="1z4$59iCw2x" resolve="args" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbJ" id="4XsNDZYizpO" role="3cqZAp">
+                      <node concept="3clFbS" id="4XsNDZYizpQ" role="3clFbx">
+                        <node concept="3clFbF" id="4XsNDZYiQwn" role="3cqZAp">
+                          <node concept="2OqwBi" id="4XsNDZYiRdM" role="3clFbG">
+                            <node concept="37vLTw" id="4XsNDZYiUb3" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4XsNDZYiHb$" resolve="allTemplates" />
+                            </node>
+                            <node concept="X8dFx" id="4XsNDZYiRVS" role="2OqNvi">
+                              <node concept="2OqwBi" id="4XsNDZYiTch" role="25WWJ7">
+                                <node concept="37vLTw" id="4XsNDZYiTci" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4XsNDZYhCcr" resolve="ruleTemplateIndex" />
+                                </node>
+                                <node concept="liA8E" id="4XsNDZYiTcj" role="2OqNvi">
+                                  <ref role="37wK5l" to="hano:6fdr4UgfuGk" resolve="allRuleTemplates" />
+                                  <node concept="1eOMI4" id="4XsNDZYiV26" role="37wK5m">
+                                    <node concept="10QFUN" id="4XsNDZYiV27" role="1eOMHV">
+                                      <node concept="AH0OO" id="4XsNDZYiV28" role="10QFUP">
+                                        <node concept="3cmrfG" id="4XsNDZYiV29" role="AHEQo">
+                                          <property role="3cmrfH" value="0" />
+                                        </node>
+                                        <node concept="37vLTw" id="4XsNDZYiV2a" role="AHHXb">
+                                          <ref role="3cqZAo" node="4XsNDZYiupF" resolve="args" />
+                                        </node>
+                                      </node>
+                                      <node concept="3Tqbb2" id="4XsNDZYiV2b" role="10QFUM" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1Wc70l" id="4XsNDZYi_Kj" role="3clFbw">
+                        <node concept="2ZW3vV" id="4XsNDZYiApj" role="3uHU7w">
+                          <node concept="3Tqbb2" id="4XsNDZYiAGZ" role="2ZW6by" />
+                          <node concept="AH0OO" id="4XsNDZYiA7D" role="2ZW6bz">
+                            <node concept="3cmrfG" id="4XsNDZYiA8R" role="AHEQo">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="37vLTw" id="4XsNDZYi_Yg" role="AHHXb">
+                              <ref role="3cqZAo" node="4XsNDZYiupF" resolve="args" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3eOSWO" id="4XsNDZYi$O4" role="3uHU7B">
+                          <node concept="2OqwBi" id="4XsNDZYizFs" role="3uHU7B">
+                            <node concept="37vLTw" id="4XsNDZYizwl" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4XsNDZYiupF" resolve="args" />
+                            </node>
+                            <node concept="1Rwk04" id="4XsNDZYizQ$" role="2OqNvi" />
+                          </node>
+                          <node concept="3cmrfG" id="4XsNDZYi$Vv" role="3uHU7w">
+                            <property role="3cmrfH" value="0" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="4XsNDZYhCcr" role="1bW2Oz">
+                    <property role="TrG5h" value="ruleTemplateIndex" />
+                    <node concept="3uibUv" id="4XsNDZYhCLU" role="1tU5fm">
+                      <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4XsNDZYgMgW" role="3cqZAp">
+            <node concept="3nyPlj" id="4XsNDZYgMgV" role="3clFbG">
+              <ref role="37wK5l" node="5Qx6_65qdzK" resolve="processEffect" />
+              <node concept="37vLTw" id="4XsNDZYgMgT" role="37wK5m">
+                <ref role="3cqZAo" node="4XsNDZYgMfm" resolve="aspectClique" />
+              </node>
+              <node concept="37vLTw" id="4XsNDZYgMgU" role="37wK5m">
+                <ref role="3cqZAo" node="4XsNDZYgMfp" resolve="effect" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4XsNDZYgMgS" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4XsNDZYbGoa" role="jymVt" />
+      <node concept="3clFb_" id="4XsNDZYfRLS" role="jymVt">
+        <property role="TrG5h" value="populateResponse" />
+        <node concept="37vLTG" id="4XsNDZYfRLT" role="3clF46">
+          <property role="TrG5h" value="response" />
+          <node concept="3uibUv" id="4XsNDZYfRLU" role="1tU5fm">
+            <ref role="3uigEE" node="1RYTbd8bNK8" resolve="TypecheckingService.Response" />
+            <node concept="16syzq" id="4XsNDZYfRLV" role="11_B2D">
+              <ref role="16sUi3" node="4XsNDZYfRM0" resolve="T" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tmbuc" id="4XsNDZYfRLW" role="1B3o_S" />
+        <node concept="3uibUv" id="4XsNDZYfRLY" role="3clF45">
+          <ref role="3uigEE" node="1RYTbd8bNK8" resolve="TypecheckingService.Response" />
+          <node concept="16syzq" id="4XsNDZYfRLZ" role="11_B2D">
+            <ref role="16sUi3" node="4XsNDZYfRM0" resolve="T" />
+          </node>
+        </node>
+        <node concept="16euLQ" id="4XsNDZYfRM0" role="16eVyc">
+          <property role="TrG5h" value="T" />
+        </node>
+        <node concept="3clFbS" id="4XsNDZYfRM1" role="3clF47">
+          <node concept="3cpWs8" id="4XsNDZYj79s" role="3cqZAp">
+            <node concept="3cpWsn" id="4XsNDZYj79t" role="3cpWs9">
+              <property role="TrG5h" value="value" />
+              <node concept="16syzq" id="4XsNDZYj70T" role="1tU5fm">
+                <ref role="16sUi3" node="4XsNDZYfRM0" resolve="T" />
+              </node>
+              <node concept="2OqwBi" id="4XsNDZYj79u" role="33vP2m">
+                <node concept="37vLTw" id="4XsNDZYj79v" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4XsNDZYfRLT" resolve="response" />
+                </node>
+                <node concept="liA8E" id="4XsNDZYj79w" role="2OqNvi">
+                  <ref role="37wK5l" node="1RYTbd8j4FJ" resolve="getValue" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4XsNDZYj5Uz" role="3cqZAp">
+            <node concept="2OqwBi" id="4XsNDZYj8Ty" role="3clFbG">
+              <node concept="1eOMI4" id="4XsNDZYj7Cz" role="2Oq$k0">
+                <node concept="10QFUN" id="4XsNDZYj7Cy" role="1eOMHV">
+                  <node concept="37vLTw" id="4XsNDZYj7Cx" role="10QFUP">
+                    <ref role="3cqZAo" node="4XsNDZYj79t" resolve="value" />
+                  </node>
+                  <node concept="_YKpA" id="4XsNDZYj7DZ" role="10QFUM">
+                    <node concept="2sp9CU" id="4XsNDZYkkF5" role="_ZDj9" />
+                  </node>
+                </node>
+              </node>
+              <node concept="X8dFx" id="4XsNDZYj9Ck" role="2OqNvi">
+                <node concept="2OqwBi" id="4XsNDZYklFB" role="25WWJ7">
+                  <node concept="37vLTw" id="4XsNDZYj9QU" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4XsNDZYiHb$" resolve="allTemplates" />
+                  </node>
+                  <node concept="3$u5V9" id="4XsNDZYkmM_" role="2OqNvi">
+                    <node concept="1bVj0M" id="4XsNDZYkmMB" role="23t8la">
+                      <node concept="3clFbS" id="4XsNDZYkmMC" role="1bW5cS">
+                        <node concept="3clFbF" id="4XsNDZYknc1" role="3cqZAp">
+                          <node concept="2OqwBi" id="4XsNDZYknHH" role="3clFbG">
+                            <node concept="37vLTw" id="4XsNDZYknc0" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4XsNDZYkmMD" resolve="it" />
+                            </node>
+                            <node concept="liA8E" id="4XsNDZYkoPM" role="2OqNvi">
+                              <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="getTemplateRef" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="4XsNDZYkmMD" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="4XsNDZYkmME" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4XsNDZYjb9T" role="3cqZAp">
+            <node concept="37vLTw" id="4XsNDZYjb9R" role="3clFbG">
+              <ref role="3cqZAo" node="4XsNDZYfRLT" resolve="response" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4XsNDZYfRM2" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4XsNDZYiDq3" role="jymVt" />
+      <node concept="312cEg" id="4XsNDZYiHb$" role="jymVt">
+        <property role="TrG5h" value="allTemplates" />
+        <node concept="3Tm6S6" id="4XsNDZYiHb_" role="1B3o_S" />
+        <node concept="_YKpA" id="4XsNDZYiMYr" role="1tU5fm">
+          <node concept="3uibUv" id="4XsNDZYiP3k" role="_ZDj9">
+            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+            <node concept="3qTvmN" id="4XsNDZYiPoq" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="2ShNRf" id="4XsNDZYiPRO" role="33vP2m">
+          <node concept="Tc6Ow" id="4XsNDZYiPQB" role="2ShVmc">
+            <node concept="3uibUv" id="4XsNDZYiPQC" role="HW$YZ">
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+              <node concept="3qTvmN" id="4XsNDZYiPQD" role="11_B2D" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4XsNDZYbgSZ" role="jymVt" />
     <node concept="312cEu" id="3OUB6BASVwS" role="jymVt">
       <property role="TrG5h" value="Queries" />
       <node concept="2tJIrI" id="3OUB6BASVwT" role="jymVt" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 4a1a16f3..b38101c9 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -307,15 +307,11 @@
       </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
-        <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
-      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
-        <child id="2667874559098216723" name="text" index="3HnX3l" />
-      </concept>
       <concept id="6612597108003615641" name="jetbrains.mps.baseLanguage.javadoc.structure.HTMLElement" flags="ng" index="2U$1Ah">
         <property id="6612597108003615642" name="name" index="2U$1Ai" />
         <child id="6612597108003615643" name="line" index="2U$1Aj" />
@@ -507,188 +503,25 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="39eNUjlYwif" role="jymVt" />
-    <node concept="3clFbW" id="7kTeLbPt4na" role="jymVt">
-      <node concept="3cqZAl" id="7kTeLbPt4nb" role="3clF45" />
-      <node concept="3Tm1VV" id="7kTeLbPt4nc" role="1B3o_S" />
-      <node concept="3clFbS" id="7kTeLbPt4nd" role="3clF47">
-        <node concept="3clFbF" id="6nFpYluo50v" role="3cqZAp">
-          <node concept="37vLTI" id="6nFpYluo50x" role="3clFbG">
-            <node concept="2OqwBi" id="6nFpYluo7Rv" role="37vLTJ">
-              <node concept="Xjq3P" id="6nFpYluo7VR" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6nFpYluo7Ry" role="2OqNvi">
-                <ref role="2Oxat5" node="6nFpYluo50r" resolve="processingSession" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="6nFpYluo50_" role="37vLTx">
-              <ref role="3cqZAo" node="6nFpYlumWDt" resolve="session" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7kTeLbPt5$7" role="3cqZAp">
-          <node concept="37vLTI" id="7kTeLbPt5$9" role="3clFbG">
-            <node concept="2OqwBi" id="7kTeLbPt6tX" role="37vLTJ">
-              <node concept="Xjq3P" id="7kTeLbPt6yw" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7kTeLbPt6u0" role="2OqNvi">
-                <ref role="2Oxat5" node="7kTeLbPt5$3" resolve="nodes" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7kTeLbPt5$d" role="37vLTx">
-              <ref role="3cqZAo" node="7kTeLbPt4nq" resolve="inputNodes" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7kTeLbPt4nk" role="3cqZAp">
-          <node concept="37vLTI" id="7kTeLbPt4nl" role="3clFbG">
-            <node concept="2OqwBi" id="7kTeLbPt4nm" role="37vLTJ">
-              <node concept="Xjq3P" id="7kTeLbPt4nn" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7kTeLbPt4no" role="2OqNvi">
-                <ref role="2Oxat5" node="6kREIVkLEGt" resolve="repository" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7kTeLbPt4np" role="37vLTx">
-              <ref role="3cqZAo" node="7kTeLbPt4ns" resolve="repository" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6nFpYluqFer" role="3cqZAp">
-          <node concept="37vLTI" id="6nFpYluqFet" role="3clFbG">
-            <node concept="2OqwBi" id="6nFpYluqGJ3" role="37vLTJ">
-              <node concept="Xjq3P" id="6nFpYluqGRk" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6nFpYluqHj6" role="2OqNvi">
-                <ref role="2Oxat5" node="6nFpYluqFen" resolve="planHandler" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="6nFpYluqFex" role="37vLTx">
-              <ref role="3cqZAo" node="6nFpYluqCFz" resolve="planHandler" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="61G6TdBAp_V" role="3cqZAp">
-          <node concept="37vLTI" id="61G6TdBAr4$" role="3clFbG">
-            <node concept="2ShNRf" id="61G6TdBAtin" role="37vLTx">
-              <node concept="YeOm9" id="61G6TdBAtio" role="2ShVmc">
-                <node concept="1Y3b0j" id="61G6TdBAtip" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
-                  <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
-                  <node concept="3Tm1VV" id="61G6TdBAtiq" role="1B3o_S" />
-                  <node concept="2OqwBi" id="61G6TdBAtir" role="37wK5m">
-                    <node concept="37vLTw" id="61G6TdBAtis" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6nFpYluo50r" resolve="processingSession" />
-                    </node>
-                    <node concept="liA8E" id="61G6TdBAtit" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="61G6TdBAtiv" role="37wK5m">
-                    <ref role="3cqZAo" node="6nFpYluo50r" resolve="processingSession" />
-                  </node>
-                  <node concept="3clFb_" id="61G6TdBAtix" role="jymVt">
-                    <property role="TrG5h" value="provideFeedback" />
-                    <node concept="37vLTG" id="61G6TdBAtiy" role="3clF46">
-                      <property role="TrG5h" value="feedback" />
-                      <node concept="3uibUv" id="61G6TdBAtiz" role="1tU5fm">
-                        <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                      </node>
-                    </node>
-                    <node concept="3cqZAl" id="61G6TdBAti$" role="3clF45" />
-                    <node concept="3Tm1VV" id="61G6TdBAti_" role="1B3o_S" />
-                    <node concept="3clFbS" id="61G6TdBAtiA" role="3clF47">
-                      <node concept="3SKdUt" id="61G6TdBAtiB" role="3cqZAp">
-                        <node concept="1PaTwC" id="61G6TdBAtiC" role="1aUNEU">
-                          <node concept="3oM_SD" id="61G6TdBAtiD" role="1PaTwD">
-                            <property role="3oM_SC" value="FIXME" />
-                          </node>
-                          <node concept="3oM_SD" id="61G6TdBAtiE" role="1PaTwD">
-                            <property role="3oM_SC" value="provide" />
-                          </node>
-                          <node concept="3oM_SD" id="61G6TdBAtiF" role="1PaTwD">
-                            <property role="3oM_SC" value="appropriate" />
-                          </node>
-                          <node concept="3oM_SD" id="61G6TdBAtiG" role="1PaTwD">
-                            <property role="3oM_SC" value="reporting" />
-                          </node>
-                          <node concept="3oM_SD" id="61G6TdBAtiH" role="1PaTwD">
-                            <property role="3oM_SC" value="for" />
-                          </node>
-                          <node concept="3oM_SD" id="61G6TdBAtiI" role="1PaTwD">
-                            <property role="3oM_SC" value="typechecking" />
-                          </node>
-                          <node concept="3oM_SD" id="61G6TdBAtiJ" role="1PaTwD">
-                            <property role="3oM_SC" value="errors" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2AHcQZ" id="61G6TdBAtiK" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="61G6TdBAq53" role="37vLTJ">
-              <node concept="Xjq3P" id="61G6TdBAp_T" role="2Oq$k0" />
-              <node concept="2OwXpG" id="61G6TdBAqzJ" role="2OqNvi">
-                <ref role="2Oxat5" node="61G6TdBAens" resolve="macroProcessing" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1imVejVBR9L" role="3cqZAp">
-          <node concept="37vLTI" id="1imVejVBSHE" role="3clFbG">
-            <node concept="2ShNRf" id="1imVejVBTc0" role="37vLTx">
-              <node concept="HV5vD" id="1imVejVBTWK" role="2ShVmc">
-                <ref role="HV5vE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1imVejVBRDl" role="37vLTJ">
-              <node concept="Xjq3P" id="1imVejVBR9J" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1imVejVBS21" role="2OqNvi">
-                <ref role="2Oxat5" node="1imVejVA7w_" resolve="store" />
-              </node>
-            </node>
-          </node>
+    <node concept="2tJIrI" id="4XsNDZYgSCL" role="jymVt" />
+    <node concept="Wx3nA" id="4XsNDZYgUF5" role="jymVt">
+      <property role="TrG5h" value="RULE_TEMPLATES_INDEX" />
+      <node concept="3Tm1VV" id="4XsNDZYhLLF" role="1B3o_S" />
+      <node concept="3uibUv" id="4XsNDZYgVTH" role="1tU5fm">
+        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <node concept="3uibUv" id="4XsNDZYgWrp" role="11_B2D">
+          <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
         </node>
       </node>
-      <node concept="37vLTG" id="6nFpYlumWDt" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="6nFpYlumX8t" role="1tU5fm">
-          <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+      <node concept="2YIFZM" id="4XsNDZYgYoF" role="33vP2m">
+        <ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
+        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="3VsKOn" id="4XsNDZYgZqG" role="37wK5m">
+          <ref role="3VsUkX" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
         </node>
       </node>
-      <node concept="37vLTG" id="7kTeLbPt4nq" role="3clF46">
-        <property role="TrG5h" value="inputNodes" />
-        <node concept="2I9FWS" id="7kTeLbPt53o" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7kTeLbPt4ns" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="7kTeLbPt4nt" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6nFpYluqCFz" role="3clF46">
-        <property role="TrG5h" value="planHandler" />
-        <node concept="3uibUv" id="6nFpYluqD3K" role="1tU5fm">
-          <ref role="3uigEE" to="ksgm:7DvO2M9Uago" resolve="RulesPlanHandler" />
-        </node>
-      </node>
-      <node concept="P$JXv" id="3VwM5b67l_A" role="lGtFl">
-        <node concept="TZ5HI" id="3VwM5b67l_B" role="3nqlJM">
-          <node concept="TZ5HA" id="3VwM5b67l_C" role="3HnX3l" />
-        </node>
-        <node concept="TZ5HA" id="3VwM5b67mHW" role="TZ5H$">
-          <node concept="1dT_AC" id="3VwM5b67mHX" role="1dT_Ay">
-            <property role="1dT_AB" value="FIXME used only from a deprecated UI action" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="3VwM5b67l_D" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
     </node>
-    <node concept="2tJIrI" id="7WKNeR9fh8i" role="jymVt" />
+    <node concept="2tJIrI" id="39eNUjlYwif" role="jymVt" />
     <node concept="3clFbW" id="5EDW3XEoy55" role="jymVt">
       <node concept="3cqZAl" id="5EDW3XEoy56" role="3clF45" />
       <node concept="3Tm1VV" id="5EDW3XEoy57" role="1B3o_S" />
@@ -774,23 +607,6 @@
       <node concept="3cqZAl" id="1imVejVB$_i" role="3clF45" />
       <node concept="3Tm1VV" id="1imVejVB$_j" role="1B3o_S" />
       <node concept="3clFbS" id="1imVejVB$_k" role="3clF47">
-        <node concept="3clFbJ" id="1imVejVB$_l" role="3cqZAp">
-          <node concept="3clFbS" id="1imVejVB$_m" role="3clFbx">
-            <node concept="YS8fn" id="1imVejVB$_n" role="3cqZAp">
-              <node concept="2ShNRf" id="1imVejVB$_o" role="YScLw">
-                <node concept="1pGfFk" id="1imVejVB$_p" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="1imVejVB$_q" role="3clFbw">
-            <node concept="10Nm6u" id="1imVejVB$_r" role="3uHU7w" />
-            <node concept="37vLTw" id="1imVejVB$_s" role="3uHU7B">
-              <ref role="3cqZAo" node="1imVejVB$Aj" resolve="query" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="1imVejVB$_t" role="3cqZAp">
           <node concept="37vLTI" id="1imVejVB$_u" role="3clFbG">
             <node concept="2OqwBi" id="1imVejVB$_v" role="37vLTJ">
@@ -959,7 +775,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5EDW3XEoy54" role="jymVt" />
-    <node concept="2tJIrI" id="51ek2rQF7Zl" role="jymVt" />
     <node concept="3clFb_" id="51ek2rQF9Dx" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <node concept="37vLTG" id="51ek2rQF9Dy" role="3clF46">
@@ -1123,41 +938,6 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbH" id="3KN3A4vCMHE" role="3cqZAp" />
-                      <node concept="3SKdUt" id="6nFpYluoz_Y" role="3cqZAp">
-                        <node concept="1PaTwC" id="6nFpYluoz_Z" role="1aUNEU">
-                          <node concept="3oM_SD" id="6nFpYluozA1" role="1PaTwD">
-                            <property role="3oM_SC" value="TODO" />
-                          </node>
-                          <node concept="3oM_SD" id="6nFpYluo$CQ" role="1PaTwD">
-                            <property role="3oM_SC" value="move" />
-                          </node>
-                          <node concept="3oM_SD" id="6nFpYluo$CT" role="1PaTwD">
-                            <property role="3oM_SC" value="to" />
-                          </node>
-                          <node concept="3oM_SD" id="6nFpYluo$CX" role="1PaTwD">
-                            <property role="3oM_SC" value="effect" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="12QmIoyMCZG" role="3cqZAp">
-                        <node concept="37vLTI" id="12QmIoyMG$S" role="3clFbG">
-                          <node concept="2OqwBi" id="12QmIoyMIwn" role="37vLTx">
-                            <node concept="37vLTw" id="6nFpYluoxOE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6nFpYluo50r" resolve="processingSession" />
-                            </node>
-                            <node concept="liA8E" id="12QmIoyMJ_Z" role="2OqNvi">
-                              <ref role="37wK5l" to="hano:20Ay2VeR9qk" resolve="ruleTemplates" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="12QmIoyMDWS" role="37vLTJ">
-                            <node concept="Xjq3P" id="12QmIoyMCZE" role="2Oq$k0" />
-                            <node concept="2OwXpG" id="12QmIoyMF6g" role="2OqNvi">
-                              <ref role="2Oxat5" node="12QmIoyMACM" resolve="ruleTemplateIndex" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
                       <node concept="3clFbH" id="cmlg9OHFn3" role="3cqZAp" />
                       <node concept="3clFbF" id="3bpBM3Qd92Y" role="3cqZAp">
                         <node concept="37vLTI" id="3bpBM3Qd930" role="3clFbG">
@@ -1378,6 +1158,22 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="2OqwBi" id="4XsNDZYhbO9" role="37wK5m">
+                      <node concept="37vLTw" id="4XsNDZYhb11" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4XsNDZYgUF5" resolve="RULE_TEMPLATES_INDEX" />
+                      </node>
+                      <node concept="liA8E" id="4XsNDZYhcy9" role="2OqNvi">
+                        <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
+                        <node concept="2OqwBi" id="4XsNDZYm2af" role="37wK5m">
+                          <node concept="37vLTw" id="4XsNDZYm2ag" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6nFpYluo50r" resolve="processingSession" />
+                          </node>
+                          <node concept="liA8E" id="4XsNDZYm2ah" role="2OqNvi">
+                            <ref role="37wK5l" to="hano:20Ay2VeR9qk" resolve="ruleTemplates" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
                 <node concept="3clFbH" id="51ek2rQH77e" role="3cqZAp" />
@@ -1479,21 +1275,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="Hg6Enc44mH" role="jymVt" />
-    <node concept="3clFb_" id="20Ay2VeR9qk" role="jymVt">
-      <property role="TrG5h" value="ruleTemplates" />
-      <node concept="3Tm1VV" id="20Ay2VeR9qm" role="1B3o_S" />
-      <node concept="3clFbS" id="20Ay2VeR9qn" role="3clF47">
-        <node concept="3clFbF" id="12QmIoyMC21" role="3cqZAp">
-          <node concept="37vLTw" id="12QmIoyMC20" role="3clFbG">
-            <ref role="3cqZAo" node="12QmIoyMACM" resolve="ruleTemplateIndex" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="1Ss4_iXX4Ss" role="3clF45">
-        <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7WKNeR9kCIM" role="jymVt" />
     <node concept="3uibUv" id="1pPth$lACR_" role="1zkMxy">
       <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
       <node concept="3uibUv" id="799SgOKe$yP" role="11_B2D">
@@ -1566,13 +1347,6 @@
         <ref role="3uigEE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
       </node>
     </node>
-    <node concept="312cEg" id="12QmIoyMACM" role="jymVt">
-      <property role="TrG5h" value="ruleTemplateIndex" />
-      <node concept="3Tm6S6" id="6nFpYlurCQq" role="1B3o_S" />
-      <node concept="3uibUv" id="12QmIoyMBE$" role="1tU5fm">
-        <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="1pPth$lAzAx">
     <property role="2bfB8j" value="false" />