diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 7ac69f84..a65fb2c8 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -1716,126 +1716,70 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="2jxMt584Ru7" role="3cqZAp" />
+        <node concept="3cpWs8" id="4MqhgXUCPqL" role="3cqZAp">
+          <node concept="3cpWsn" id="4MqhgXUCPqM" role="3cpWs9">
+            <property role="TrG5h" value="allRules" />
+            <node concept="_YKpA" id="4MqhgXUCPqH" role="1tU5fm">
+              <node concept="3uibUv" id="4MqhgXUCPqK" role="_ZDj9">
+                <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="4MqhgXUCPqN" role="33vP2m">
+              <node concept="Tc6Ow" id="4MqhgXUCPqO" role="2ShVmc">
+                <node concept="3uibUv" id="4MqhgXUCPqP" role="HW$YZ">
+                  <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="4MqhgXUPgU4" role="3cqZAp">
+          <node concept="3clFbS" id="4MqhgXUPgU7" role="2LFqv$">
+            <node concept="3clFbF" id="4MqhgXUMDP5" role="3cqZAp">
+              <node concept="2OqwBi" id="4MqhgXUMErd" role="3clFbG">
+                <node concept="37vLTw" id="4MqhgXUMDP3" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4MqhgXUCPqM" resolve="allRules" />
+                </node>
+                <node concept="X8dFx" id="4MqhgXUMFuM" role="2OqNvi">
+                  <node concept="37vLTw" id="4MqhgXUPjiz" role="25WWJ7">
+                    <ref role="3cqZAo" node="4MqhgXUPgU8" resolve="rules" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="4MqhgXUPgU8" role="1Duv9x">
+            <property role="TrG5h" value="rules" />
+            <node concept="_YKpA" id="4MqhgXUPgUc" role="1tU5fm">
+              <node concept="3uibUv" id="4MqhgXUPgUd" role="_ZDj9">
+                <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="4MqhgXUPgUe" role="1DdaDG">
+            <node concept="37vLTw" id="4MqhgXUPgUf" role="2Oq$k0">
+              <ref role="3cqZAo" node="4MqhgXUMgHN" resolve="location2rules" />
+            </node>
+            <node concept="T8wYR" id="4MqhgXUPgUg" role="2OqNvi" />
+          </node>
+        </node>
         <node concept="3clFbF" id="4MqhgXUNKmT" role="3cqZAp">
           <node concept="2ShNRf" id="4MqhgXUNKmP" role="3clFbG">
             <node concept="1pGfFk" id="4MqhgXUNKOX" role="2ShVmc">
-              <ref role="37wK5l" node="4MqhgXUM$CT" resolve="RulesListBuilder.RulesListImpl" />
+              <ref role="37wK5l" node="4MqhgXUM$CT" resolve="RulesListImpl" />
+              <node concept="37vLTw" id="2jxMt584R0F" role="37wK5m">
+                <ref role="3cqZAo" node="4MqhgXUMb9p" resolve="name" />
+              </node>
+              <node concept="37vLTw" id="2jxMt584Ree" role="37wK5m">
+                <ref role="3cqZAo" node="4MqhgXUCPqM" resolve="allRules" />
+              </node>
             </node>
           </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4MqhgXUMb3H" role="jymVt" />
-    <node concept="312cEu" id="4MqhgXUMzTQ" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="RulesListImpl" />
-      <node concept="2tJIrI" id="4MqhgXUM$3u" role="jymVt" />
-      <node concept="3clFbW" id="4MqhgXUM$CT" role="jymVt">
-        <node concept="3cqZAl" id="4MqhgXUM$CV" role="3clF45" />
-        <node concept="3Tm6S6" id="4MqhgXUM$Jk" role="1B3o_S" />
-        <node concept="3clFbS" id="4MqhgXUM$CX" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="4MqhgXUM$ym" role="jymVt" />
-      <node concept="3clFb_" id="4MqhgXUM$3K" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="name" />
-        <property role="DiZV1" value="false" />
-        <property role="od$2w" value="false" />
-        <node concept="3Tm1VV" id="4MqhgXUM$3L" role="1B3o_S" />
-        <node concept="3uibUv" id="4MqhgXUM$3N" role="3clF45">
-          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-        </node>
-        <node concept="3clFbS" id="4MqhgXUM$3O" role="3clF47">
-          <node concept="3clFbF" id="4MqhgXUM$bb" role="3cqZAp">
-            <node concept="37vLTw" id="4MqhgXUM$ba" role="3clFbG">
-              <ref role="3cqZAo" node="4MqhgXUMb9p" resolve="name" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="4MqhgXUM$3P" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4MqhgXUM$rD" role="jymVt" />
-      <node concept="3clFb_" id="4MqhgXUM$40" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="rules" />
-        <property role="DiZV1" value="false" />
-        <property role="od$2w" value="false" />
-        <node concept="3Tm1VV" id="4MqhgXUM$41" role="1B3o_S" />
-        <node concept="3uibUv" id="4MqhgXUM$43" role="3clF45">
-          <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-          <node concept="3uibUv" id="4MqhgXUM$44" role="11_B2D">
-            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4MqhgXUM$45" role="3clF47">
-          <node concept="3cpWs8" id="4MqhgXUCPqL" role="3cqZAp">
-            <node concept="3cpWsn" id="4MqhgXUCPqM" role="3cpWs9">
-              <property role="TrG5h" value="allRules" />
-              <node concept="_YKpA" id="4MqhgXUCPqH" role="1tU5fm">
-                <node concept="3uibUv" id="4MqhgXUCPqK" role="_ZDj9">
-                  <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
-                </node>
-              </node>
-              <node concept="2ShNRf" id="4MqhgXUCPqN" role="33vP2m">
-                <node concept="Tc6Ow" id="4MqhgXUCPqO" role="2ShVmc">
-                  <node concept="3uibUv" id="4MqhgXUCPqP" role="HW$YZ">
-                    <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1DcWWT" id="4MqhgXUPgU4" role="3cqZAp">
-            <node concept="3clFbS" id="4MqhgXUPgU7" role="2LFqv$">
-              <node concept="3clFbF" id="4MqhgXUMDP5" role="3cqZAp">
-                <node concept="2OqwBi" id="4MqhgXUMErd" role="3clFbG">
-                  <node concept="37vLTw" id="4MqhgXUMDP3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MqhgXUCPqM" resolve="allRules" />
-                  </node>
-                  <node concept="X8dFx" id="4MqhgXUMFuM" role="2OqNvi">
-                    <node concept="37vLTw" id="4MqhgXUPjiz" role="25WWJ7">
-                      <ref role="3cqZAo" node="4MqhgXUPgU8" resolve="rules" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWsn" id="4MqhgXUPgU8" role="1Duv9x">
-              <property role="TrG5h" value="rules" />
-              <node concept="_YKpA" id="4MqhgXUPgUc" role="1tU5fm">
-                <node concept="3uibUv" id="4MqhgXUPgUd" role="_ZDj9">
-                  <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="4MqhgXUPgUe" role="1DdaDG">
-              <node concept="37vLTw" id="4MqhgXUPgUf" role="2Oq$k0">
-                <ref role="3cqZAo" node="4MqhgXUMgHN" resolve="location2rules" />
-              </node>
-              <node concept="T8wYR" id="4MqhgXUPgUg" role="2OqNvi" />
-            </node>
-          </node>
-          <node concept="3clFbF" id="4MqhgXUM_3o" role="3cqZAp">
-            <node concept="2OqwBi" id="4MqhgXUMGPA" role="3clFbG">
-              <node concept="37vLTw" id="4MqhgXUM_3m" role="2Oq$k0">
-                <ref role="3cqZAo" node="4MqhgXUCPqM" resolve="allRules" />
-              </node>
-              <node concept="26Dbio" id="4MqhgXUMHQy" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="4MqhgXUM$46" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4MqhgXUM$3z" role="jymVt" />
-      <node concept="3Tm1VV" id="4MqhgXUMzTR" role="1B3o_S" />
-      <node concept="3uibUv" id="4MqhgXUM$3j" role="1zkMxy">
-        <ref role="3uigEE" to="av0y:~RulesList" resolve="RulesList" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="4MqhgXUMzKi" role="jymVt" />
     <node concept="312cEg" id="4MqhgXUMb9p" role="jymVt">
       <property role="TrG5h" value="name" />
@@ -8962,5 +8906,121 @@
     </node>
     <node concept="3Tm1VV" id="4$YN6QudkOJ" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="4MqhgXUMzTQ">
+    <property role="2bfB8j" value="true" />
+    <property role="TrG5h" value="RulesListImpl" />
+    <node concept="2tJIrI" id="4MqhgXUM$3u" role="jymVt" />
+    <node concept="3clFbW" id="4MqhgXUM$CT" role="jymVt">
+      <node concept="37vLTG" id="2jxMt584M2F" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="2jxMt584Mcf" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2jxMt584FXr" role="3clF46">
+        <property role="TrG5h" value="rules" />
+        <node concept="_YKpA" id="2jxMt584G50" role="1tU5fm">
+          <node concept="3uibUv" id="2jxMt584GaA" role="_ZDj9">
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4MqhgXUM$CV" role="3clF45" />
+      <node concept="3Tm1VV" id="2jxMt584FBG" role="1B3o_S" />
+      <node concept="3clFbS" id="4MqhgXUM$CX" role="3clF47">
+        <node concept="3clFbF" id="2jxMt584IJp" role="3cqZAp">
+          <node concept="37vLTI" id="2jxMt584JSb" role="3clFbG">
+            <node concept="2OqwBi" id="2jxMt584KTq" role="37vLTx">
+              <node concept="37vLTw" id="2jxMt584Kaa" role="2Oq$k0">
+                <ref role="3cqZAo" node="2jxMt584FXr" resolve="rules" />
+              </node>
+              <node concept="26Dbio" id="2jxMt584LFu" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="2jxMt584IRD" role="37vLTJ">
+              <node concept="Xjq3P" id="2jxMt584IJo" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2jxMt584J3L" role="2OqNvi">
+                <ref role="2Oxat5" node="2jxMt584H9j" resolve="rules" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2jxMt584NH7" role="3cqZAp">
+          <node concept="37vLTI" id="2jxMt584Oxi" role="3clFbG">
+            <node concept="37vLTw" id="2jxMt584OHI" role="37vLTx">
+              <ref role="3cqZAo" node="2jxMt584M2F" resolve="name" />
+            </node>
+            <node concept="2OqwBi" id="2jxMt584NVD" role="37vLTJ">
+              <node concept="Xjq3P" id="2jxMt584NH5" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2jxMt584O8d" role="2OqNvi">
+                <ref role="2Oxat5" node="2jxMt584Njj" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4MqhgXUM$ym" role="jymVt" />
+    <node concept="312cEg" id="2jxMt584H9j" role="jymVt">
+      <property role="TrG5h" value="rules" />
+      <node concept="3Tm6S6" id="2jxMt584GL4" role="1B3o_S" />
+      <node concept="_YKpA" id="2jxMt584GZB" role="1tU5fm">
+        <node concept="3uibUv" id="2jxMt584Hzl" role="_ZDj9">
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="2jxMt584Njj" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="3Tm6S6" id="2jxMt584MKP" role="1B3o_S" />
+      <node concept="17QB3L" id="2jxMt584Nds" role="1tU5fm" />
+    </node>
+    <node concept="2tJIrI" id="2jxMt584Idf" role="jymVt" />
+    <node concept="3clFb_" id="4MqhgXUM$3K" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="name" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="4MqhgXUM$3L" role="1B3o_S" />
+      <node concept="3uibUv" id="4MqhgXUM$3N" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+      </node>
+      <node concept="3clFbS" id="4MqhgXUM$3O" role="3clF47">
+        <node concept="3clFbF" id="4MqhgXUM$bb" role="3cqZAp">
+          <node concept="37vLTw" id="2jxMt5853Y1" role="3clFbG">
+            <ref role="3cqZAo" node="2jxMt584Njj" resolve="name" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4MqhgXUM$3P" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4MqhgXUM$rD" role="jymVt" />
+    <node concept="3clFb_" id="4MqhgXUM$40" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="rules" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="4MqhgXUM$41" role="1B3o_S" />
+      <node concept="3uibUv" id="4MqhgXUM$43" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
+        <node concept="3uibUv" id="4MqhgXUM$44" role="11_B2D">
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4MqhgXUM$45" role="3clF47">
+        <node concept="3clFbF" id="2jxMt584SG4" role="3cqZAp">
+          <node concept="37vLTw" id="2jxMt584T1J" role="3clFbG">
+            <ref role="3cqZAo" node="2jxMt584H9j" resolve="rules" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4MqhgXUM$46" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4MqhgXUM$3z" role="jymVt" />
+    <node concept="3uibUv" id="4MqhgXUM$3j" role="1zkMxy">
+      <ref role="3uigEE" to="av0y:~RulesList" resolve="RulesList" />
+    </node>
+  </node>
 </model>