diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
index b97cd1f5..eb176c90 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
@@ -1071,6 +1071,78 @@
       </node>
     </node>
     <node concept="2tJIrI" id="77AxcO4ZrEu" role="jymVt" />
+    <node concept="3clFb_" id="7nkyKX7mcq7" role="jymVt">
+      <property role="TrG5h" value="hasHead" />
+      <node concept="10P_77" id="7nkyKX7mds5" role="3clF45" />
+      <node concept="3Tm1VV" id="7nkyKX7mcqa" role="1B3o_S" />
+      <node concept="3clFbS" id="7nkyKX7mcqb" role="3clF47">
+        <node concept="3clFbF" id="7nkyKX7mgDd" role="3cqZAp">
+          <node concept="3fqX7Q" id="7nkyKX7mh4R" role="3clFbG">
+            <node concept="1eOMI4" id="7nkyKX7mh4T" role="3fr31v">
+              <node concept="1Wc70l" id="7nkyKX7mh9o" role="1eOMHV">
+                <node concept="2OqwBi" id="7nkyKX7mhkG" role="3uHU7w">
+                  <node concept="37vLTw" id="7nkyKX7mhdR" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
+                  </node>
+                  <node concept="liA8E" id="7nkyKX7mhwW" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="7nkyKX7mh4U" role="3uHU7B">
+                  <node concept="37vLTw" id="7nkyKX7mh4V" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
+                  </node>
+                  <node concept="liA8E" id="7nkyKX7mh4W" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7nkyKX7miFS" role="jymVt" />
+    <node concept="3clFb_" id="7nkyKX7mh_a" role="jymVt">
+      <property role="TrG5h" value="hasGuard" />
+      <node concept="10P_77" id="7nkyKX7mh_b" role="3clF45" />
+      <node concept="3Tm1VV" id="7nkyKX7mh_c" role="1B3o_S" />
+      <node concept="3clFbS" id="7nkyKX7mh_d" role="3clF47">
+        <node concept="3clFbF" id="7nkyKX7mnyT" role="3cqZAp">
+          <node concept="3fqX7Q" id="7nkyKX7mnyR" role="3clFbG">
+            <node concept="2OqwBi" id="7nkyKX7mnHG" role="3fr31v">
+              <node concept="37vLTw" id="7nkyKX7mtuO" role="2Oq$k0">
+                <ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
+              </node>
+              <node concept="liA8E" id="7nkyKX7mnTd" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7nkyKX7mp2d" role="jymVt" />
+    <node concept="3clFb_" id="7nkyKX7mnWq" role="jymVt">
+      <property role="TrG5h" value="hasBody" />
+      <node concept="10P_77" id="7nkyKX7mnWr" role="3clF45" />
+      <node concept="3Tm1VV" id="7nkyKX7mnWs" role="1B3o_S" />
+      <node concept="3clFbS" id="7nkyKX7mnWt" role="3clF47">
+        <node concept="3clFbF" id="7nkyKX7mnWu" role="3cqZAp">
+          <node concept="3fqX7Q" id="7nkyKX7mnWv" role="3clFbG">
+            <node concept="2OqwBi" id="7nkyKX7mnWw" role="3fr31v">
+              <node concept="37vLTw" id="7nkyKX7mnWx" role="2Oq$k0">
+                <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="body" />
+              </node>
+              <node concept="liA8E" id="7nkyKX7mnWy" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7nkyKX7mboQ" role="jymVt" />
     <node concept="3clFb_" id="77AxcO4ZwMR" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="merge" />
@@ -1816,6 +1888,37 @@
   <node concept="312cEu" id="7eGEHDlc$f7">
     <property role="TrG5h" value="UserConstraint" />
     <node concept="2tJIrI" id="7eGEHDlc$f8" role="jymVt" />
+    <node concept="2YIFZL" id="7nkyKX7sUU5" role="jymVt">
+      <property role="TrG5h" value="singleton" />
+      <node concept="37vLTG" id="7nkyKX7sUU6" role="3clF46">
+        <property role="TrG5h" value="id" />
+        <node concept="17QB3L" id="7nkyKX7sUU7" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7nkyKX7sUUa" role="3clF45">
+        <ref role="3uigEE" node="7eGEHDlc$f7" resolve="UserConstraint" />
+      </node>
+      <node concept="3Tm1VV" id="7nkyKX7sUUb" role="1B3o_S" />
+      <node concept="3clFbS" id="7nkyKX7sUUc" role="3clF47">
+        <node concept="3clFbF" id="7nkyKX7sUUd" role="3cqZAp">
+          <node concept="2ShNRf" id="7nkyKX7sUUe" role="3clFbG">
+            <node concept="1pGfFk" id="7nkyKX7sUUf" role="2ShVmc">
+              <ref role="37wK5l" node="7eGEHDlc$gd" resolve="UserConstraint" />
+              <node concept="2YIFZM" id="7nkyKX7sUUg" role="37wK5m">
+                <ref role="37wK5l" node="54i3FxcZQAb" resolve="user" />
+                <ref role="1Pybhc" node="54i3FxcZHHF" resolve="ConstraintSymbol" />
+                <node concept="37vLTw" id="7nkyKX7sUUh" role="37wK5m">
+                  <ref role="3cqZAo" node="7nkyKX7sUU6" resolve="id" />
+                </node>
+                <node concept="3cmrfG" id="7nkyKX7sUUi" role="37wK5m">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7eGEHDlc$fm" role="jymVt" />
     <node concept="2YIFZL" id="7eGEHDlc$f9" role="jymVt">
       <property role="TrG5h" value="unitary" />
       <node concept="37vLTG" id="7eGEHDlc$fa" role="3clF46">
@@ -1855,7 +1958,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7eGEHDlc$fm" role="jymVt" />
+    <node concept="2tJIrI" id="7nkyKX7sUUk" role="jymVt" />
     <node concept="2YIFZL" id="7eGEHDlc$fn" role="jymVt">
       <property role="TrG5h" value="binary" />
       <node concept="37vLTG" id="7eGEHDlc$fo" role="3clF46">
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/util.mps b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/util.mps
index 8d561e83..57102f42 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/util.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/util.mps
@@ -80,9 +80,6 @@
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
-        <child id="1070534760952" name="componentType" index="10Q1$1" />
-      </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <property id="1075300953594" name="abstractClass" index="1sVAO0" />
@@ -184,13 +181,6 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1184950988562" name="jetbrains.mps.baseLanguage.structure.ArrayCreator" flags="nn" index="3$_iS1">
-        <child id="1184951007469" name="componentType" index="3$_nBY" />
-        <child id="1184952969026" name="dimensionExpression" index="3$GQph" />
-      </concept>
-      <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
-        <child id="1184953288404" name="expression" index="3$I4v7" />
-      </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -205,7 +195,6 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
-      <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -339,28 +328,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7Oc59RSElSV" role="jymVt" />
-    <node concept="Wx3nA" id="7Oc59RSEoxj" role="jymVt">
-      <property role="TrG5h" value="ZERO_ERRORS" />
-      <node concept="3Tm6S6" id="7Oc59RSEoxi" role="1B3o_S" />
-      <node concept="10Q1$e" id="7Oc59RSEoxb" role="1tU5fm">
-        <node concept="3uibUv" id="7Oc59RSEoxc" role="10Q1$1">
-          <ref role="3uigEE" node="7Oc59RSEjjA" resolve="ReportedError" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="7Oc59RSEoxd" role="33vP2m">
-        <node concept="3$_iS1" id="7Oc59RSEoxe" role="2ShVmc">
-          <node concept="3$GHV9" id="7Oc59RSEoxf" role="3$GQph">
-            <node concept="3cmrfG" id="7Oc59RSEoxg" role="3$I4v7">
-              <property role="3cmrfH" value="0" />
-            </node>
-          </node>
-          <node concept="3uibUv" id="7Oc59RSEoxh" role="3$_nBY">
-            <ref role="3uigEE" node="7Oc59RSEjjA" resolve="ReportedError" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7Oc59RSEp_w" role="jymVt" />
     <node concept="Wx3nA" id="7Oc59RSEmdT" role="jymVt">
       <property role="TrG5h" value="OK_RESULT" />
       <node concept="3Tm6S6" id="7Oc59RSEmdS" role="1B3o_S" />
@@ -385,8 +352,9 @@
     <node concept="3clFb_" id="7Oc59RSEnG3" role="jymVt">
       <property role="TrG5h" value="errors" />
       <property role="1EzhhJ" value="true" />
-      <node concept="10Q1$e" id="7Oc59RSEnN_" role="3clF45">
-        <node concept="3uibUv" id="7Oc59RSEnKm" role="10Q1$1">
+      <node concept="3uibUv" id="7nkyKX7v6k0" role="3clF45">
+        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+        <node concept="3uibUv" id="7nkyKX7v6$H" role="11_B2D">
           <ref role="3uigEE" node="7Oc59RSEjjA" resolve="ReportedError" />
         </node>
       </node>
@@ -407,6 +375,22 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7Oc59RSEjfq" role="jymVt" />
+    <node concept="3clFb_" id="7nkyKX7v7xb" role="jymVt">
+      <property role="TrG5h" value="and" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="7nkyKX7v8km" role="3clF46">
+        <property role="TrG5h" value="that" />
+        <node concept="3uibUv" id="7nkyKX7v8$H" role="1tU5fm">
+          <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="7nkyKX7v7OX" role="3clF45">
+        <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+      </node>
+      <node concept="3Tm1VV" id="7nkyKX7v7xe" role="1B3o_S" />
+      <node concept="3clFbS" id="7nkyKX7v7xf" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7nkyKX7v1JM" role="jymVt" />
     <node concept="3clFb_" id="7Oc59RSJr0t" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="toString" />
@@ -425,7 +409,9 @@
                 <node concept="1rXfSq" id="7Oc59RSJwFn" role="2Oq$k0">
                   <ref role="37wK5l" node="7Oc59RSEnG3" resolve="errors" />
                 </node>
-                <node concept="1Rwk04" id="7Oc59RSJxxE" role="2OqNvi" />
+                <node concept="liA8E" id="7nkyKX7vfHY" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~Collection.size():int" resolve="size" />
+                </node>
               </node>
               <node concept="3cpWs3" id="7Oc59RSJuJa" role="3uHU7B">
                 <node concept="2OqwBi" id="7Oc59RSJssQ" role="3uHU7B">
@@ -465,19 +451,55 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="7nkyKX7v8SU" role="jymVt" />
+      <node concept="3clFb_" id="7nkyKX7v8YO" role="jymVt">
+        <property role="TrG5h" value="and" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="37vLTG" id="7nkyKX7v8YP" role="3clF46">
+          <property role="TrG5h" value="that" />
+          <node concept="3uibUv" id="7nkyKX7v8YQ" role="1tU5fm">
+            <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="7nkyKX7v8YR" role="3clF45">
+          <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+        </node>
+        <node concept="3Tm1VV" id="7nkyKX7v8YS" role="1B3o_S" />
+        <node concept="3clFbS" id="7nkyKX7v8YU" role="3clF47">
+          <node concept="3clFbF" id="7nkyKX7v9mp" role="3cqZAp">
+            <node concept="3K4zz7" id="7nkyKX7v9wF" role="3clFbG">
+              <node concept="Xjq3P" id="7nkyKX7v9$Y" role="3K4E3e" />
+              <node concept="37vLTw" id="7nkyKX7v9Ar" role="3K4GZi">
+                <ref role="3cqZAo" node="7nkyKX7v8YP" resolve="that" />
+              </node>
+              <node concept="2OqwBi" id="7nkyKX7v9p3" role="3K4Cdx">
+                <node concept="37vLTw" id="7nkyKX7v9mo" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7nkyKX7v8YP" resolve="that" />
+                </node>
+                <node concept="liA8E" id="7nkyKX7v9rB" role="2OqNvi">
+                  <ref role="37wK5l" node="7Oc59RS_hsj" resolve="isSuccessful" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7nkyKX7v9dJ" role="jymVt" />
       <node concept="3clFb_" id="7Oc59RSJpwi" role="jymVt">
         <property role="TrG5h" value="errors" />
         <property role="1EzhhJ" value="false" />
-        <node concept="10Q1$e" id="7Oc59RSJpwj" role="3clF45">
-          <node concept="3uibUv" id="7Oc59RSJpwk" role="10Q1$1">
+        <node concept="3uibUv" id="7nkyKX7v6MF" role="3clF45">
+          <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+          <node concept="3uibUv" id="7nkyKX7v6PJ" role="11_B2D">
             <ref role="3uigEE" node="7Oc59RSEjjA" resolve="ReportedError" />
           </node>
         </node>
         <node concept="3Tm1VV" id="7Oc59RSJpwl" role="1B3o_S" />
         <node concept="3clFbS" id="7Oc59RSJpwm" role="3clF47">
-          <node concept="3clFbF" id="7Oc59RSJpwn" role="3cqZAp">
-            <node concept="37vLTw" id="7Oc59RSJpws" role="3clFbG">
-              <ref role="3cqZAo" node="7Oc59RSEoxj" resolve="ZERO_ERRORS" />
+          <node concept="3clFbF" id="7nkyKX7v6HU" role="3cqZAp">
+            <node concept="2YIFZM" id="7nkyKX7v6Kr" role="3clFbG">
+              <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
+              <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             </node>
           </node>
         </node>
@@ -512,13 +534,81 @@
                   <ref role="2Oxat5" node="7Oc59RSEpOr" resolve="errors" />
                 </node>
               </node>
-              <node concept="37vLTw" id="7Oc59RSEpOE" role="37vLTx">
-                <ref role="3cqZAo" node="7Oc59RSEpH8" resolve="errors" />
+              <node concept="2YIFZM" id="7nkyKX7v2p8" role="37vLTx">
+                <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+                <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
+                <node concept="37vLTw" id="7nkyKX7v2u2" role="37wK5m">
+                  <ref role="3cqZAo" node="7Oc59RSEpH8" resolve="errors" />
+                </node>
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="7nkyKX7vaoB" role="jymVt" />
+      <node concept="3clFbW" id="7nkyKX7va7j" role="jymVt">
+        <node concept="37vLTG" id="7nkyKX7vbud" role="3clF46">
+          <property role="TrG5h" value="results" />
+          <node concept="8X2XB" id="7nkyKX7vc2Y" role="1tU5fm">
+            <node concept="3uibUv" id="7nkyKX7vbNQ" role="8Xvag">
+              <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7nkyKX7va7n" role="3clF45" />
+        <node concept="3Tm1VV" id="7nkyKX7va7o" role="1B3o_S" />
+        <node concept="3clFbS" id="7nkyKX7va7p" role="3clF47">
+          <node concept="3clFbF" id="7nkyKX7va7q" role="3cqZAp">
+            <node concept="37vLTI" id="7nkyKX7va7r" role="3clFbG">
+              <node concept="2OqwBi" id="7nkyKX7va7s" role="37vLTJ">
+                <node concept="Xjq3P" id="7nkyKX7va7t" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7nkyKX7va7u" role="2OqNvi">
+                  <ref role="2Oxat5" node="7Oc59RSEpOr" resolve="errors" />
+                </node>
+              </node>
+              <node concept="2ShNRf" id="7nkyKX7vcwc" role="37vLTx">
+                <node concept="1pGfFk" id="7nkyKX7vcQr" role="2ShVmc">
+                  <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
+                  <node concept="3uibUv" id="7nkyKX7vcZj" role="1pMfVU">
+                    <ref role="3uigEE" node="7Oc59RSEjjA" resolve="ReportedError" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1DcWWT" id="7nkyKX7vdtv" role="3cqZAp">
+            <node concept="3clFbS" id="7nkyKX7vdtx" role="2LFqv$">
+              <node concept="3clFbF" id="7nkyKX7vdMr" role="3cqZAp">
+                <node concept="2OqwBi" id="7nkyKX7vdXo" role="3clFbG">
+                  <node concept="37vLTw" id="7nkyKX7vdMp" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7Oc59RSEpOr" resolve="errors" />
+                  </node>
+                  <node concept="liA8E" id="7nkyKX7veew" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
+                    <node concept="2OqwBi" id="7nkyKX7veoK" role="37wK5m">
+                      <node concept="37vLTw" id="7nkyKX7velW" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7nkyKX7vdty" resolve="r" />
+                      </node>
+                      <node concept="liA8E" id="7nkyKX7vetH" role="2OqNvi">
+                        <ref role="37wK5l" node="7Oc59RSEnG3" resolve="errors" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWsn" id="7nkyKX7vdty" role="1Duv9x">
+              <property role="TrG5h" value="r" />
+              <node concept="3uibUv" id="7nkyKX7vd$8" role="1tU5fm">
+                <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7nkyKX7vdHQ" role="1DdaDG">
+              <ref role="3cqZAo" node="7nkyKX7vbud" resolve="results" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="7Oc59RSElZe" role="jymVt" />
       <node concept="3clFb_" id="7Oc59RSElUY" role="jymVt">
         <property role="TrG5h" value="isSuccessful" />
@@ -532,19 +622,63 @@
         </node>
       </node>
       <node concept="2tJIrI" id="7Oc59RSElXP" role="jymVt" />
+      <node concept="3clFb_" id="7nkyKX7v9C7" role="jymVt">
+        <property role="TrG5h" value="and" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="37vLTG" id="7nkyKX7v9C8" role="3clF46">
+          <property role="TrG5h" value="that" />
+          <node concept="3uibUv" id="7nkyKX7v9C9" role="1tU5fm">
+            <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="7nkyKX7v9Ca" role="3clF45">
+          <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+        </node>
+        <node concept="3Tm1VV" id="7nkyKX7v9Cb" role="1B3o_S" />
+        <node concept="3clFbS" id="7nkyKX7v9Cd" role="3clF47">
+          <node concept="3clFbF" id="7nkyKX7veXK" role="3cqZAp">
+            <node concept="3K4zz7" id="7nkyKX7vf8w" role="3clFbG">
+              <node concept="Xjq3P" id="7nkyKX7vfdb" role="3K4E3e" />
+              <node concept="2OqwBi" id="7nkyKX7vf0Q" role="3K4Cdx">
+                <node concept="37vLTw" id="7nkyKX7veXI" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7nkyKX7v9C8" resolve="that" />
+                </node>
+                <node concept="liA8E" id="7nkyKX7vf3u" role="2OqNvi">
+                  <ref role="37wK5l" node="7Oc59RS_hsj" resolve="isSuccessful" />
+                </node>
+              </node>
+              <node concept="2ShNRf" id="7nkyKX7veAz" role="3K4GZi">
+                <node concept="1pGfFk" id="7nkyKX7veUe" role="2ShVmc">
+                  <ref role="37wK5l" node="7nkyKX7va7j" resolve="Result.FAILURE" />
+                  <node concept="Xjq3P" id="7nkyKX7vfkh" role="37wK5m" />
+                  <node concept="37vLTw" id="7nkyKX7vfmx" role="37wK5m">
+                    <ref role="3cqZAo" node="7nkyKX7v9C8" resolve="that" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7nkyKX7v9SU" role="jymVt" />
       <node concept="3clFb_" id="7Oc59RSEqG2" role="jymVt">
         <property role="TrG5h" value="errors" />
         <property role="1EzhhJ" value="false" />
-        <node concept="10Q1$e" id="7Oc59RSEqG3" role="3clF45">
-          <node concept="3uibUv" id="7Oc59RSEqG4" role="10Q1$1">
+        <node concept="3uibUv" id="7nkyKX7v46u" role="3clF45">
+          <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+          <node concept="3uibUv" id="7nkyKX7v4oi" role="11_B2D">
             <ref role="3uigEE" node="7Oc59RSEjjA" resolve="ReportedError" />
           </node>
         </node>
         <node concept="3Tm1VV" id="7Oc59RSEqG5" role="1B3o_S" />
         <node concept="3clFbS" id="7Oc59RSEqG7" role="3clF47">
-          <node concept="3clFbF" id="7Oc59RSEqOb" role="3cqZAp">
-            <node concept="37vLTw" id="7Oc59RSEqOa" role="3clFbG">
-              <ref role="3cqZAo" node="7Oc59RSEpOr" resolve="errors" />
+          <node concept="3clFbF" id="7nkyKX7v4QN" role="3cqZAp">
+            <node concept="2YIFZM" id="7nkyKX7v4VU" role="3clFbG">
+              <ref role="37wK5l" to="33ny:~Collections.unmodifiableCollection(java.util.Collection):java.util.Collection" resolve="unmodifiableCollection" />
+              <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+              <node concept="37vLTw" id="7nkyKX7v5n9" role="37wK5m">
+                <ref role="3cqZAo" node="7Oc59RSEpOr" resolve="errors" />
+              </node>
             </node>
           </node>
         </node>
@@ -576,8 +710,9 @@
       <node concept="312cEg" id="7Oc59RSEpOr" role="jymVt">
         <property role="TrG5h" value="errors" />
         <node concept="3Tm6S6" id="7Oc59RSEpOs" role="1B3o_S" />
-        <node concept="10Q1$e" id="7Oc59RSEq$a" role="1tU5fm">
-          <node concept="3uibUv" id="7Oc59RSEqtZ" role="10Q1$1">
+        <node concept="3uibUv" id="7nkyKX7v21Y" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="7nkyKX7v29x" role="11_B2D">
             <ref role="3uigEE" node="7Oc59RSEjjA" resolve="ReportedError" />
           </node>
         </node>
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index 0aa1ecef..1e9e8210 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -488,7 +488,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
@@ -821,7 +820,40 @@
         </node>
       </node>
       <node concept="3clFbS" id="3xj1UscsvyC" role="3clF47">
-        <node concept="3clFbH" id="3xj1UscsvyD" role="3cqZAp" />
+        <node concept="3cpWs8" id="7nkyKX7mVqR" role="3cqZAp">
+          <node concept="3cpWsn" id="7nkyKX7mVqS" role="3cpWs9">
+            <property role="TrG5h" value="main" />
+            <node concept="3uibUv" id="7nkyKX7mVqP" role="1tU5fm">
+              <ref role="3uigEE" to="nc4n:7eGEHDlc$ap" resolve="RuleBuilder" />
+            </node>
+            <node concept="2ShNRf" id="7nkyKX7mVqT" role="33vP2m">
+              <node concept="1pGfFk" id="7nkyKX7mVqU" role="2ShVmc">
+                <ref role="37wK5l" to="nc4n:6lpwCiZjdph" resolve="RuleBuilder" />
+                <node concept="Xl_RD" id="7nkyKX7mVqV" role="37wK5m">
+                  <property role="Xl_RC" value="main" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7nkyKX7sTVM" role="3cqZAp">
+          <node concept="2OqwBi" id="7nkyKX7sU6W" role="3clFbG">
+            <node concept="37vLTw" id="7nkyKX7sTVK" role="2Oq$k0">
+              <ref role="3cqZAo" node="7nkyKX7mVqS" resolve="main" />
+            </node>
+            <node concept="liA8E" id="7nkyKX7sUg2" role="2OqNvi">
+              <ref role="37wK5l" to="nc4n:7eGEHDlc$bq" resolve="appendHeadReplaced" />
+              <node concept="2YIFZM" id="7nkyKX7sWMr" role="37wK5m">
+                <ref role="37wK5l" to="nc4n:7nkyKX7sUU5" resolve="singleton" />
+                <ref role="1Pybhc" to="nc4n:7eGEHDlc$f7" resolve="UserConstraint" />
+                <node concept="Xl_RD" id="7nkyKX7sWT3" role="37wK5m">
+                  <property role="Xl_RC" value="main" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7nkyKX7sWVX" role="3cqZAp" />
         <node concept="3cpWs8" id="3xj1UscsvyE" role="3cqZAp">
           <node concept="3cpWsn" id="3xj1UscsvyF" role="3cpWs9">
             <property role="TrG5h" value="generator" />
@@ -834,243 +866,271 @@
                 <node concept="37vLTw" id="3xj1UscsvA6" role="37wK5m">
                   <ref role="3cqZAo" node="3xj1Uscsv_Y" resolve="rtc" />
                 </node>
+                <node concept="37vLTw" id="7nkyKX7mVQb" role="37wK5m">
+                  <ref role="3cqZAo" node="7nkyKX7mVqS" resolve="main" />
+                </node>
               </node>
             </node>
           </node>
         </node>
         <node concept="3clFbH" id="3xj1UscsvyX" role="3cqZAp" />
-        <node concept="3cpWs8" id="3xj1UsctHLj" role="3cqZAp">
-          <node concept="3cpWsn" id="3xj1UsctHLm" role="3cpWs9">
-            <property role="TrG5h" value="errors" />
-            <node concept="10Oyi0" id="3xj1UsctHLh" role="1tU5fm" />
-            <node concept="3cmrfG" id="3xj1UsctHWs" role="33vP2m">
-              <property role="3cmrfH" value="0" />
+        <node concept="3cpWs8" id="7nkyKX7vtmM" role="3cqZAp">
+          <node concept="3cpWsn" id="7nkyKX7vtmN" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="3uibUv" id="7nkyKX7vtmO" role="1tU5fm">
+              <ref role="3uigEE" to="4t1t:7Oc59RSEjdb" resolve="Result" />
+            </node>
+            <node concept="2YIFZM" id="7nkyKX7vtCO" role="33vP2m">
+              <ref role="37wK5l" to="4t1t:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="4t1t:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
         <node concept="3clFbH" id="3xj1UsctHWG" role="3cqZAp" />
-        <node concept="3clFbF" id="3x8pcoFu$A1" role="3cqZAp">
-          <node concept="d57v9" id="3x8pcoFu$A2" role="3clFbG">
-            <node concept="2YIFZM" id="3x8pcoFu$A3" role="37vLTx">
-              <ref role="1Pybhc" node="3Qp4N06byjn" resolve="CollectRuleTemplates" />
-              <ref role="37wK5l" node="5NuEpF1pEFm" resolve="generateRulesWithNoInput" />
-              <node concept="37vLTw" id="3x8pcoFu$A4" role="37wK5m">
-                <ref role="3cqZAo" node="3xj1UscsvyF" resolve="generator" />
+        <node concept="3clFbF" id="7nkyKX7vEI8" role="3cqZAp">
+          <node concept="37vLTI" id="7nkyKX7vEI9" role="3clFbG">
+            <node concept="2OqwBi" id="7nkyKX7vEIa" role="37vLTx">
+              <node concept="37vLTw" id="7nkyKX7vEIb" role="2Oq$k0">
+                <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
               </node>
-              <node concept="37vLTw" id="3x8pcoFu$A5" role="37wK5m">
-                <ref role="3cqZAo" node="3xj1UscsvA0" resolve="handler" />
-              </node>
-              <node concept="3clFbT" id="3x8pcoFuQWG" role="37wK5m">
-                <property role="3clFbU" value="false" />
+              <node concept="liA8E" id="7nkyKX7vEIc" role="2OqNvi">
+                <ref role="37wK5l" to="4t1t:7nkyKX7v7xb" resolve="and" />
+                <node concept="2OqwBi" id="7nkyKX7vEId" role="37wK5m">
+                  <node concept="37vLTw" id="7nkyKX7vEIe" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3xj1UscsvyF" resolve="generator" />
+                  </node>
+                  <node concept="liA8E" id="7nkyKX7vEIf" role="2OqNvi">
+                    <ref role="37wK5l" to="bdf1:5NuEpF1pL7f" resolve="generateAllWithNoInput" />
+                    <node concept="37vLTw" id="7nkyKX7vEIg" role="37wK5m">
+                      <ref role="3cqZAo" node="3xj1UscsvA0" resolve="handler" />
+                    </node>
+                    <node concept="3clFbT" id="7nkyKX7vETc" role="37wK5m">
+                      <property role="3clFbU" value="false" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
-            <node concept="37vLTw" id="3x8pcoFu$A6" role="37vLTJ">
-              <ref role="3cqZAo" node="3xj1UsctHLm" resolve="errors" />
+            <node concept="37vLTw" id="7nkyKX7vEIi" role="37vLTJ">
+              <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
             </node>
           </node>
         </node>
         <node concept="3clFbH" id="3x8pcoFu_iw" role="3cqZAp" />
-        <node concept="3clFbF" id="3xj1UscsVnA" role="3cqZAp">
-          <node concept="d57v9" id="3xj1UsctIbg" role="3clFbG">
-            <node concept="37vLTw" id="3xj1UsctIwZ" role="37vLTJ">
-              <ref role="3cqZAo" node="3xj1UsctHLm" resolve="errors" />
+        <node concept="3clFbF" id="7nkyKX7vF3w" role="3cqZAp">
+          <node concept="37vLTI" id="7nkyKX7vF3x" role="3clFbG">
+            <node concept="2OqwBi" id="7nkyKX7vF3y" role="37vLTx">
+              <node concept="37vLTw" id="7nkyKX7vF3z" role="2Oq$k0">
+                <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
+              </node>
+              <node concept="liA8E" id="7nkyKX7vF3$" role="2OqNvi">
+                <ref role="37wK5l" to="4t1t:7nkyKX7v7xb" resolve="and" />
+                <node concept="2OqwBi" id="7nkyKX7vF3_" role="37wK5m">
+                  <node concept="37vLTw" id="7nkyKX7vF3A" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3xj1UscsvyF" resolve="generator" />
+                  </node>
+                  <node concept="liA8E" id="7nkyKX7vF3B" role="2OqNvi">
+                    <ref role="37wK5l" to="bdf1:12yN8DyNqcj" resolve="generateAll" />
+                    <node concept="37vLTw" id="7nkyKX7vF3C" role="37wK5m">
+                      <ref role="3cqZAo" node="2Rw7mr8Sa0e" resolve="root" />
+                    </node>
+                    <node concept="37vLTw" id="7nkyKX7vF3D" role="37wK5m">
+                      <ref role="3cqZAo" node="3xj1UscsvA0" resolve="handler" />
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
-            <node concept="2YIFZM" id="3xj1UscsVn_" role="37vLTx">
-              <ref role="1Pybhc" node="3Qp4N06byjn" resolve="CollectRuleTemplates" />
-              <ref role="37wK5l" node="3xj1UscsVnv" resolve="generateRulesInRoot" />
-              <node concept="37vLTw" id="3xj1UscsVny" role="37wK5m">
-                <ref role="3cqZAo" node="3xj1UscsvyF" resolve="generator" />
-              </node>
-              <node concept="37vLTw" id="3xj1UscsVnz" role="37wK5m">
-                <ref role="3cqZAo" node="2Rw7mr8Sa0e" resolve="root" />
-              </node>
-              <node concept="37vLTw" id="3xj1UscsVn$" role="37wK5m">
-                <ref role="3cqZAo" node="3xj1UscsvA0" resolve="handler" />
-              </node>
+            <node concept="37vLTw" id="7nkyKX7vF3E" role="37vLTJ">
+              <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
             </node>
           </node>
         </node>
         <node concept="3clFbH" id="5NuEpF1r6$3" role="3cqZAp" />
-        <node concept="3clFbF" id="5NuEpF1r8KC" role="3cqZAp">
-          <node concept="d57v9" id="5NuEpF1ra3T" role="3clFbG">
-            <node concept="2YIFZM" id="5NuEpF1rq1d" role="37vLTx">
-              <ref role="1Pybhc" node="3Qp4N06byjn" resolve="CollectRuleTemplates" />
-              <ref role="37wK5l" node="5NuEpF1pEFm" resolve="generateRulesWithNoInput" />
-              <node concept="37vLTw" id="5NuEpF1roHd" role="37wK5m">
-                <ref role="3cqZAo" node="3xj1UscsvyF" resolve="generator" />
+        <node concept="3clFbF" id="7nkyKX7vFeZ" role="3cqZAp">
+          <node concept="37vLTI" id="7nkyKX7vFf0" role="3clFbG">
+            <node concept="2OqwBi" id="7nkyKX7vFf1" role="37vLTx">
+              <node concept="37vLTw" id="7nkyKX7vFf2" role="2Oq$k0">
+                <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
               </node>
-              <node concept="37vLTw" id="5NuEpF1rpvb" role="37wK5m">
-                <ref role="3cqZAo" node="3xj1UscsvA0" resolve="handler" />
-              </node>
-              <node concept="3clFbT" id="3x8pcoFuRbq" role="37wK5m">
-                <property role="3clFbU" value="true" />
+              <node concept="liA8E" id="7nkyKX7vFf3" role="2OqNvi">
+                <ref role="37wK5l" to="4t1t:7nkyKX7v7xb" resolve="and" />
+                <node concept="2OqwBi" id="7nkyKX7vFf4" role="37wK5m">
+                  <node concept="37vLTw" id="7nkyKX7vFf5" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3xj1UscsvyF" resolve="generator" />
+                  </node>
+                  <node concept="liA8E" id="7nkyKX7vFf6" role="2OqNvi">
+                    <ref role="37wK5l" to="bdf1:5NuEpF1pL7f" resolve="generateAllWithNoInput" />
+                    <node concept="37vLTw" id="7nkyKX7vFf7" role="37wK5m">
+                      <ref role="3cqZAo" node="3xj1UscsvA0" resolve="handler" />
+                    </node>
+                    <node concept="3clFbT" id="7nkyKX7vFq7" role="37wK5m">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
-            <node concept="37vLTw" id="5NuEpF1r8KA" role="37vLTJ">
-              <ref role="3cqZAo" node="3xj1UsctHLm" resolve="errors" />
+            <node concept="37vLTw" id="7nkyKX7vFf9" role="37vLTJ">
+              <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7nkyKX7nEHZ" role="3cqZAp" />
+        <node concept="3clFbF" id="7nkyKX7vF$r" role="3cqZAp">
+          <node concept="37vLTI" id="7nkyKX7vF$s" role="3clFbG">
+            <node concept="2OqwBi" id="7nkyKX7vF$t" role="37vLTx">
+              <node concept="37vLTw" id="7nkyKX7vF$u" role="2Oq$k0">
+                <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
+              </node>
+              <node concept="liA8E" id="7nkyKX7vF$v" role="2OqNvi">
+                <ref role="37wK5l" to="4t1t:7nkyKX7v7xb" resolve="and" />
+                <node concept="2OqwBi" id="7nkyKX7vF$w" role="37wK5m">
+                  <node concept="37vLTw" id="7nkyKX7vF$x" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3xj1UscsvyF" resolve="generator" />
+                  </node>
+                  <node concept="liA8E" id="7nkyKX7vF$y" role="2OqNvi">
+                    <ref role="37wK5l" to="bdf1:7nkyKX7ncaN" resolve="generateMain" />
+                    <node concept="37vLTw" id="7nkyKX7vF$z" role="37wK5m">
+                      <ref role="3cqZAo" node="2Rw7mr8Sa0e" resolve="root" />
+                    </node>
+                    <node concept="37vLTw" id="7nkyKX7vF$$" role="37wK5m">
+                      <ref role="3cqZAo" node="3xj1UscsvA0" resolve="handler" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="7nkyKX7vF$_" role="37vLTJ">
+              <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
             </node>
           </node>
         </node>
         <node concept="3clFbH" id="3xj1UscsvzJ" role="3cqZAp" />
+        <node concept="3clFbF" id="7nkyKX7vyX_" role="3cqZAp">
+          <node concept="1rXfSq" id="7nkyKX7vyXz" role="3clFbG">
+            <ref role="37wK5l" node="7nkyKX7nByt" resolve="logFeedback" />
+            <node concept="37vLTw" id="7nkyKX7vz93" role="37wK5m">
+              <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
+            </node>
+          </node>
+        </node>
         <node concept="34ab3g" id="3xj1Uscsv_F" role="3cqZAp">
           <property role="35gtTG" value="info" />
-          <node concept="3cpWs3" id="3xj1Uscsv_G" role="34bqiv">
-            <node concept="37vLTw" id="3xj1UscsvA5" role="3uHU7w">
+          <node concept="2YIFZM" id="7nkyKX7xHyq" role="34bqiv">
+            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+            <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+            <node concept="37vLTw" id="7nkyKX7xHI0" role="37wK5m">
               <ref role="3cqZAo" node="3xj1UscsvA0" resolve="handler" />
             </node>
-            <node concept="Xl_RD" id="3xj1Uscsv_I" role="3uHU7B">
-              <property role="Xl_RC" value="handler&gt; " />
-            </node>
           </node>
         </node>
         <node concept="3clFbH" id="3xj1Uscsv_J" role="3cqZAp" />
         <node concept="3cpWs6" id="3xj1Uscu4fR" role="3cqZAp">
-          <node concept="37vLTw" id="3xj1Uscu4hU" role="3cqZAk">
-            <ref role="3cqZAo" node="3xj1UsctHLm" resolve="errors" />
+          <node concept="2OqwBi" id="7nkyKX7v$pm" role="3cqZAk">
+            <node concept="2OqwBi" id="7nkyKX7v$6J" role="2Oq$k0">
+              <node concept="37vLTw" id="7nkyKX7vzWH" role="2Oq$k0">
+                <ref role="3cqZAo" node="7nkyKX7vtmN" resolve="result" />
+              </node>
+              <node concept="liA8E" id="7nkyKX7v$er" role="2OqNvi">
+                <ref role="37wK5l" to="4t1t:7Oc59RSEnG3" resolve="errors" />
+              </node>
+            </node>
+            <node concept="liA8E" id="7nkyKX7v$Nv" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Collection.size():int" resolve="size" />
+            </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="3xj1Usct3GN" role="jymVt" />
-    <node concept="2YIFZL" id="3xj1UscsVnv" role="jymVt">
-      <property role="TrG5h" value="generateRulesInRoot" />
-      <node concept="3Tm6S6" id="3xj1UscsVnw" role="1B3o_S" />
-      <node concept="10Oyi0" id="3xj1UsctHbY" role="3clF45" />
-      <node concept="37vLTG" id="3xj1UscsVnj" role="3clF46">
-        <property role="TrG5h" value="generator" />
-        <node concept="3uibUv" id="3xj1UscsVnk" role="1tU5fm">
-          <ref role="3uigEE" to="bdf1:12yN8DyF_E1" resolve="TypecheckingRuleGenerator" />
+    <node concept="2tJIrI" id="7nkyKX7n5cc" role="jymVt" />
+    <node concept="2YIFZL" id="7nkyKX7nByt" role="jymVt">
+      <property role="TrG5h" value="logFeedback" />
+      <node concept="3Tm6S6" id="7nkyKX7nByu" role="1B3o_S" />
+      <node concept="3cqZAl" id="7nkyKX7vziR" role="3clF45" />
+      <node concept="37vLTG" id="7nkyKX7nByl" role="3clF46">
+        <property role="TrG5h" value="result" />
+        <node concept="3uibUv" id="7nkyKX7nBym" role="1tU5fm">
+          <ref role="3uigEE" to="4t1t:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
-      <node concept="37vLTG" id="3xj1UscsVnl" role="3clF46">
-        <property role="TrG5h" value="root" />
-        <node concept="3Tqbb2" id="3xj1UscsVnm" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3xj1UscsVnn" role="3clF46">
-        <property role="TrG5h" value="handler" />
-        <node concept="3uibUv" id="3xj1UscsVno" role="1tU5fm">
-          <ref role="3uigEE" to="nc4n:7eGEHDlcEJ0" resolve="ConstraintRulesHandler" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3xj1UscsVmD" role="3clF47">
-        <node concept="3cpWs8" id="3xj1UscsVmE" role="3cqZAp">
-          <node concept="3cpWsn" id="3xj1UscsVmF" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="3uibUv" id="3xj1UscsVmG" role="1tU5fm">
-              <ref role="3uigEE" to="4t1t:7Oc59RSEjdb" resolve="Result" />
+      <node concept="3clFbS" id="7nkyKX7nBxH" role="3clF47">
+        <node concept="3clFbJ" id="7nkyKX7nBxI" role="3cqZAp">
+          <node concept="2OqwBi" id="7nkyKX7nBxJ" role="3clFbw">
+            <node concept="37vLTw" id="7nkyKX7nByo" role="2Oq$k0">
+              <ref role="3cqZAo" node="7nkyKX7nByl" resolve="result" />
             </node>
-            <node concept="2OqwBi" id="3xj1UscsVmH" role="33vP2m">
-              <node concept="37vLTw" id="3xj1UscsVns" role="2Oq$k0">
-                <ref role="3cqZAo" node="3xj1UscsVnj" resolve="generator" />
-              </node>
-              <node concept="liA8E" id="3xj1UscsVmJ" role="2OqNvi">
-                <ref role="37wK5l" to="bdf1:12yN8DyNqcj" resolve="generateAll" />
-                <node concept="37vLTw" id="3xj1UscsVnr" role="37wK5m">
-                  <ref role="3cqZAo" node="3xj1UscsVnl" resolve="root" />
-                </node>
-                <node concept="37vLTw" id="3xj1UscsVnq" role="37wK5m">
-                  <ref role="3cqZAo" node="3xj1UscsVnn" resolve="handler" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="3xj1UscsVmU" role="3cqZAp">
-          <node concept="2OqwBi" id="3xj1UscsVng" role="3clFbw">
-            <node concept="37vLTw" id="3xj1UscsVnh" role="2Oq$k0">
-              <ref role="3cqZAo" node="3xj1UscsVmF" resolve="result" />
-            </node>
-            <node concept="liA8E" id="3xj1UscsVni" role="2OqNvi">
+            <node concept="liA8E" id="7nkyKX7nBxL" role="2OqNvi">
               <ref role="37wK5l" to="4t1t:7Oc59RS_hsj" resolve="isSuccessful" />
             </node>
           </node>
-          <node concept="3clFbS" id="3xj1Usct_75" role="3clFbx">
-            <node concept="34ab3g" id="3xj1UscsVmM" role="3cqZAp">
+          <node concept="3clFbS" id="7nkyKX7nBxM" role="3clFbx">
+            <node concept="34ab3g" id="7nkyKX7nBxN" role="3cqZAp">
               <property role="35gtTG" value="info" />
-              <node concept="3cpWs3" id="3xj1UscsVmN" role="34bqiv">
-                <node concept="3cpWs3" id="3xj1UscsVmO" role="3uHU7B">
-                  <node concept="3cpWs3" id="3xj1UscsVmP" role="3uHU7B">
-                    <node concept="Xl_RD" id="3xj1UscsVmQ" role="3uHU7B">
-                      <property role="Xl_RC" value="result&gt; " />
-                    </node>
-                    <node concept="37vLTw" id="3xj1UscsVmR" role="3uHU7w">
-                      <ref role="3cqZAo" node="3xj1UscsVmF" resolve="result" />
-                    </node>
-                  </node>
-                  <node concept="Xl_RD" id="3xj1UscsVmS" role="3uHU7w">
-                    <property role="Xl_RC" value=" @" />
-                  </node>
+              <node concept="3cpWs3" id="7nkyKX7nBxO" role="34bqiv">
+                <node concept="Xl_RD" id="7nkyKX7nBxP" role="3uHU7B">
+                  <property role="Xl_RC" value="collecting rule templates: " />
                 </node>
-                <node concept="37vLTw" id="3xj1UscsVnp" role="3uHU7w">
-                  <ref role="3cqZAo" node="3xj1UscsVnl" resolve="root" />
+                <node concept="37vLTw" id="7nkyKX7nByn" role="3uHU7w">
+                  <ref role="3cqZAo" node="7nkyKX7nByl" resolve="result" />
                 </node>
               </node>
             </node>
-            <node concept="3cpWs6" id="3xj1UsctAdR" role="3cqZAp">
-              <node concept="3cmrfG" id="3xj1UsctAu7" role="3cqZAk">
-                <property role="3cmrfH" value="0" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="5NuEpF1r5pl" role="3cqZAp" />
+            <node concept="3clFbH" id="7nkyKX7nBxT" role="3cqZAp" />
           </node>
-          <node concept="9aQIb" id="3xj1Usct_Dk" role="9aQIa">
-            <node concept="3clFbS" id="3xj1UscsVmV" role="9aQI4">
-              <node concept="3clFbF" id="3xj1UscsVmW" role="3cqZAp">
-                <node concept="2OqwBi" id="3xj1UscsVmX" role="3clFbG">
-                  <node concept="2OqwBi" id="3xj1UscsVmY" role="2Oq$k0">
-                    <node concept="2OqwBi" id="3xj1UscsVmZ" role="2Oq$k0">
-                      <node concept="37vLTw" id="3xj1UscsVn0" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3xj1UscsVmF" resolve="result" />
+          <node concept="9aQIb" id="7nkyKX7nBxU" role="9aQIa">
+            <node concept="3clFbS" id="7nkyKX7nBxV" role="9aQI4">
+              <node concept="1DcWWT" id="7nkyKX7vgRJ" role="3cqZAp">
+                <node concept="3clFbS" id="7nkyKX7vgRL" role="2LFqv$">
+                  <node concept="34ab3g" id="7nkyKX7nBy6" role="3cqZAp">
+                    <property role="35gtTG" value="warn" />
+                    <property role="34fQS0" value="true" />
+                    <node concept="3cpWs3" id="7nkyKX7nBy7" role="34bqiv">
+                      <node concept="37vLTw" id="7nkyKX7nBy8" role="3uHU7w">
+                        <ref role="3cqZAo" node="7nkyKX7vgRN" resolve="e" />
                       </node>
-                      <node concept="liA8E" id="3xj1UscsVn1" role="2OqNvi">
-                        <ref role="37wK5l" to="4t1t:7Oc59RSEnG3" resolve="errors" />
+                      <node concept="Xl_RD" id="7nkyKX7nBy9" role="3uHU7B">
+                        <property role="Xl_RC" value="error collecting rule templates: " />
                       </node>
                     </node>
-                    <node concept="39bAoz" id="3xj1UscsVn2" role="2OqNvi" />
-                  </node>
-                  <node concept="2es0OD" id="3xj1UscsVn3" role="2OqNvi">
-                    <node concept="1bVj0M" id="3xj1UscsVn4" role="23t8la">
-                      <node concept="3clFbS" id="3xj1UscsVn5" role="1bW5cS">
-                        <node concept="34ab3g" id="3xj1UscsVn6" role="3cqZAp">
-                          <property role="35gtTG" value="warn" />
-                          <property role="34fQS0" value="true" />
-                          <node concept="3cpWs3" id="3xj1UscsVn7" role="34bqiv">
-                            <node concept="37vLTw" id="3xj1UscsVn8" role="3uHU7w">
-                              <ref role="3cqZAo" node="3xj1UscsVnd" resolve="e" />
-                            </node>
-                            <node concept="Xl_RD" id="3xj1UscsVn9" role="3uHU7B">
-                              <property role="Xl_RC" value="error&gt; " />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="3xj1UscsVna" role="34bMjA">
-                            <node concept="37vLTw" id="3xj1UscsVnb" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3xj1UscsVnd" resolve="e" />
-                            </node>
-                            <node concept="liA8E" id="3xj1UscsVnc" role="2OqNvi">
-                              <ref role="37wK5l" to="4t1t:7Oc59RSJGG8" resolve="exception" />
-                            </node>
-                          </node>
-                        </node>
+                    <node concept="2OqwBi" id="7nkyKX7nBya" role="34bMjA">
+                      <node concept="37vLTw" id="7nkyKX7nByb" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7nkyKX7vgRN" resolve="e" />
                       </node>
-                      <node concept="Rh6nW" id="3xj1UscsVnd" role="1bW2Oz">
-                        <property role="TrG5h" value="e" />
-                        <node concept="2jxLKc" id="3xj1UscsVne" role="1tU5fm" />
+                      <node concept="liA8E" id="7nkyKX7nByc" role="2OqNvi">
+                        <ref role="37wK5l" to="4t1t:7Oc59RSJGG8" resolve="exception" />
                       </node>
                     </node>
                   </node>
                 </node>
+                <node concept="3cpWsn" id="7nkyKX7vgRN" role="1Duv9x">
+                  <property role="TrG5h" value="e" />
+                  <node concept="3uibUv" id="7nkyKX7vgRR" role="1tU5fm">
+                    <ref role="3uigEE" to="4t1t:7Oc59RSEjjA" resolve="ReportedError" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="7nkyKX7vgRS" role="1DdaDG">
+                  <node concept="37vLTw" id="7nkyKX7vgRT" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7nkyKX7nByl" resolve="result" />
+                  </node>
+                  <node concept="liA8E" id="7nkyKX7vgRU" role="2OqNvi">
+                    <ref role="37wK5l" to="4t1t:7Oc59RSEnG3" resolve="errors" />
+                  </node>
+                </node>
               </node>
-              <node concept="3cpWs6" id="3xj1UsctAWM" role="3cqZAp">
-                <node concept="2OqwBi" id="3xj1UsctFJ3" role="3cqZAk">
-                  <node concept="2OqwBi" id="3xj1UsctEXP" role="2Oq$k0">
-                    <node concept="37vLTw" id="3xj1UsctEqJ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3xj1UscsVmF" resolve="result" />
+              <node concept="3clFbF" id="7nkyKX7vzzr" role="3cqZAp">
+                <node concept="2OqwBi" id="7nkyKX7nByg" role="3clFbG">
+                  <node concept="2OqwBi" id="7nkyKX7nByh" role="2Oq$k0">
+                    <node concept="37vLTw" id="7nkyKX7nByq" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7nkyKX7nByl" resolve="result" />
                     </node>
-                    <node concept="liA8E" id="3xj1UsctFsL" role="2OqNvi">
+                    <node concept="liA8E" id="7nkyKX7nByj" role="2OqNvi">
                       <ref role="37wK5l" to="4t1t:7Oc59RSEnG3" resolve="errors" />
                     </node>
                   </node>
-                  <node concept="1Rwk04" id="3xj1UsctGGJ" role="2OqNvi" />
+                  <node concept="liA8E" id="7nkyKX7vgdo" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~Collection.size():int" resolve="size" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -1078,144 +1138,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="5NuEpF1pFrp" role="jymVt" />
-    <node concept="2YIFZL" id="5NuEpF1pEFm" role="jymVt">
-      <property role="TrG5h" value="generateRulesWithNoInput" />
-      <node concept="3Tm6S6" id="5NuEpF1pEFn" role="1B3o_S" />
-      <node concept="10Oyi0" id="5NuEpF1pEFo" role="3clF45" />
-      <node concept="37vLTG" id="5NuEpF1pEFp" role="3clF46">
-        <property role="TrG5h" value="generator" />
-        <node concept="3uibUv" id="5NuEpF1pEFq" role="1tU5fm">
-          <ref role="3uigEE" to="bdf1:12yN8DyF_E1" resolve="TypecheckingRuleGenerator" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5NuEpF1pEFt" role="3clF46">
-        <property role="TrG5h" value="handler" />
-        <node concept="3uibUv" id="5NuEpF1pEFu" role="1tU5fm">
-          <ref role="3uigEE" to="nc4n:7eGEHDlcEJ0" resolve="ConstraintRulesHandler" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3x8pcoFu_wy" role="3clF46">
-        <property role="TrG5h" value="postProcess" />
-        <node concept="10P_77" id="3x8pcoFu_TC" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="5NuEpF1pEFv" role="3clF47">
-        <node concept="3cpWs8" id="5NuEpF1pEFw" role="3cqZAp">
-          <node concept="3cpWsn" id="5NuEpF1pEFx" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="3uibUv" id="5NuEpF1pEFy" role="1tU5fm">
-              <ref role="3uigEE" to="4t1t:7Oc59RSEjdb" resolve="Result" />
-            </node>
-            <node concept="2OqwBi" id="5NuEpF1pEFz" role="33vP2m">
-              <node concept="37vLTw" id="5NuEpF1pEF$" role="2Oq$k0">
-                <ref role="3cqZAo" node="5NuEpF1pEFp" resolve="generator" />
-              </node>
-              <node concept="liA8E" id="5NuEpF1pEF_" role="2OqNvi">
-                <ref role="37wK5l" to="bdf1:5NuEpF1pL7f" resolve="generateAllWithNoInput" />
-                <node concept="37vLTw" id="5NuEpF1pEFB" role="37wK5m">
-                  <ref role="3cqZAo" node="5NuEpF1pEFt" resolve="handler" />
-                </node>
-                <node concept="37vLTw" id="3x8pcoFuQ43" role="37wK5m">
-                  <ref role="3cqZAo" node="3x8pcoFu_wy" resolve="postProcess" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="5NuEpF1pEFC" role="3cqZAp">
-          <node concept="2OqwBi" id="5NuEpF1pEFD" role="3clFbw">
-            <node concept="37vLTw" id="5NuEpF1pEFE" role="2Oq$k0">
-              <ref role="3cqZAo" node="5NuEpF1pEFx" resolve="result" />
-            </node>
-            <node concept="liA8E" id="5NuEpF1pEFF" role="2OqNvi">
-              <ref role="37wK5l" to="4t1t:7Oc59RS_hsj" resolve="isSuccessful" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="5NuEpF1pEFG" role="3clFbx">
-            <node concept="34ab3g" id="5NuEpF1pEFH" role="3cqZAp">
-              <property role="35gtTG" value="info" />
-              <node concept="3cpWs3" id="5NuEpF1pEFK" role="34bqiv">
-                <node concept="Xl_RD" id="5NuEpF1pEFL" role="3uHU7B">
-                  <property role="Xl_RC" value="result&gt; " />
-                </node>
-                <node concept="37vLTw" id="5NuEpF1pEFM" role="3uHU7w">
-                  <ref role="3cqZAo" node="5NuEpF1pEFx" resolve="result" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs6" id="5NuEpF1pEFP" role="3cqZAp">
-              <node concept="3cmrfG" id="5NuEpF1pEFQ" role="3cqZAk">
-                <property role="3cmrfH" value="0" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="5NuEpF1r5bj" role="3cqZAp" />
-          </node>
-          <node concept="9aQIb" id="5NuEpF1pEFR" role="9aQIa">
-            <node concept="3clFbS" id="5NuEpF1pEFS" role="9aQI4">
-              <node concept="3clFbF" id="5NuEpF1pEFT" role="3cqZAp">
-                <node concept="2OqwBi" id="5NuEpF1pEFU" role="3clFbG">
-                  <node concept="2OqwBi" id="5NuEpF1pEFV" role="2Oq$k0">
-                    <node concept="2OqwBi" id="5NuEpF1pEFW" role="2Oq$k0">
-                      <node concept="37vLTw" id="5NuEpF1pEFX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5NuEpF1pEFx" resolve="result" />
-                      </node>
-                      <node concept="liA8E" id="5NuEpF1pEFY" role="2OqNvi">
-                        <ref role="37wK5l" to="4t1t:7Oc59RSEnG3" resolve="errors" />
-                      </node>
-                    </node>
-                    <node concept="39bAoz" id="5NuEpF1pEFZ" role="2OqNvi" />
-                  </node>
-                  <node concept="2es0OD" id="5NuEpF1pEG0" role="2OqNvi">
-                    <node concept="1bVj0M" id="5NuEpF1pEG1" role="23t8la">
-                      <node concept="3clFbS" id="5NuEpF1pEG2" role="1bW5cS">
-                        <node concept="34ab3g" id="5NuEpF1pEG3" role="3cqZAp">
-                          <property role="35gtTG" value="warn" />
-                          <property role="34fQS0" value="true" />
-                          <node concept="3cpWs3" id="5NuEpF1pEG4" role="34bqiv">
-                            <node concept="37vLTw" id="5NuEpF1pEG5" role="3uHU7w">
-                              <ref role="3cqZAo" node="5NuEpF1pEGa" resolve="e" />
-                            </node>
-                            <node concept="Xl_RD" id="5NuEpF1pEG6" role="3uHU7B">
-                              <property role="Xl_RC" value="error&gt; " />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="5NuEpF1pEG7" role="34bMjA">
-                            <node concept="37vLTw" id="5NuEpF1pEG8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5NuEpF1pEGa" resolve="e" />
-                            </node>
-                            <node concept="liA8E" id="5NuEpF1pEG9" role="2OqNvi">
-                              <ref role="37wK5l" to="4t1t:7Oc59RSJGG8" resolve="exception" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="5NuEpF1pEGa" role="1bW2Oz">
-                        <property role="TrG5h" value="e" />
-                        <node concept="2jxLKc" id="5NuEpF1pEGb" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="5NuEpF1pEGc" role="3cqZAp">
-                <node concept="2OqwBi" id="5NuEpF1pEGd" role="3cqZAk">
-                  <node concept="2OqwBi" id="5NuEpF1pEGe" role="2Oq$k0">
-                    <node concept="37vLTw" id="5NuEpF1pEGf" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5NuEpF1pEFx" resolve="result" />
-                    </node>
-                    <node concept="liA8E" id="5NuEpF1pEGg" role="2OqNvi">
-                      <ref role="37wK5l" to="4t1t:7Oc59RSEnG3" resolve="errors" />
-                    </node>
-                  </node>
-                  <node concept="1Rwk04" id="5NuEpF1pEGh" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3Qp4N06bynP" role="jymVt" />
+    <node concept="2tJIrI" id="7nkyKX7nCRK" role="jymVt" />
     <node concept="2YIFZL" id="3Qp4N06bynQ" role="jymVt">
       <property role="TrG5h" value="getRuleManifest" />
       <node concept="3Tm6S6" id="3Qp4N06bynR" role="1B3o_S" />
diff --git a/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps b/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps
index c771417f..6212add2 100644
--- a/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps
+++ b/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps
@@ -300,6 +300,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="7nkyKX7m8kM" role="3cqZAp">
+          <node concept="37vLTI" id="7nkyKX7m8kO" role="3clFbG">
+            <node concept="2OqwBi" id="7nkyKX7m8kS" role="37vLTJ">
+              <node concept="Xjq3P" id="7nkyKX7m8kV" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7nkyKX7m8kR" role="2OqNvi">
+                <ref role="2Oxat5" node="7nkyKX7m8kI" resolve="main" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7nkyKX7m8kW" role="37vLTx">
+              <ref role="3cqZAo" node="7nkyKX7m7wP" resolve="main" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="7Oc59RSyA1q" role="3clF46">
         <property role="TrG5h" value="collection" />
@@ -307,6 +320,190 @@
           <ref role="3uigEE" to="138j:6fdr4UgftiG" resolve="RuleTemplateCollection" />
         </node>
       </node>
+      <node concept="37vLTG" id="7nkyKX7m7wP" role="3clF46">
+        <property role="TrG5h" value="main" />
+        <node concept="3uibUv" id="7nkyKX7m8gn" role="1tU5fm">
+          <ref role="3uigEE" to="nc4n:7eGEHDlc$ap" resolve="RuleBuilder" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Oc59RSyviB" role="jymVt" />
+    <node concept="3clFb_" id="7nkyKX7ncaN" role="jymVt">
+      <property role="TrG5h" value="generateMain" />
+      <node concept="37vLTG" id="7nkyKX7njPd" role="3clF46">
+        <property role="TrG5h" value="root" />
+        <node concept="3Tqbb2" id="7nkyKX7njPe" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7nkyKX7njPf" role="3clF46">
+        <property role="TrG5h" value="handler" />
+        <node concept="3uibUv" id="7nkyKX7njPg" role="1tU5fm">
+          <ref role="3uigEE" to="nc4n:7eGEHDlcEJ0" resolve="ConstraintRulesHandler" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="7nkyKX7nfei" role="3clF45">
+        <ref role="3uigEE" to="4t1t:7Oc59RSEjdb" resolve="Result" />
+      </node>
+      <node concept="3Tm1VV" id="7nkyKX7nej_" role="1B3o_S" />
+      <node concept="3clFbS" id="7nkyKX7ncaR" role="3clF47">
+        <node concept="3cpWs8" id="7nkyKX7ng8P" role="3cqZAp">
+          <node concept="3cpWsn" id="7nkyKX7ng8Q" role="3cpWs9">
+            <property role="TrG5h" value="errors" />
+            <node concept="_YKpA" id="7nkyKX7ng8R" role="1tU5fm">
+              <node concept="3uibUv" id="7nkyKX7ng8S" role="_ZDj9">
+                <ref role="3uigEE" to="4t1t:7Oc59RSEjjA" resolve="ReportedError" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7nkyKX7ng8T" role="33vP2m">
+              <node concept="Tc6Ow" id="7nkyKX7ng8U" role="2ShVmc">
+                <node concept="3uibUv" id="7nkyKX7ng8V" role="HW$YZ">
+                  <ref role="3uigEE" to="4t1t:7Oc59RSEjjA" resolve="ReportedError" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7nkyKX7nkHB" role="3cqZAp" />
+        <node concept="SfApY" id="7nkyKX7nl0O" role="3cqZAp">
+          <node concept="3clFbS" id="7nkyKX7nl0Q" role="SfCbr">
+            <node concept="3cpWs8" id="7nkyKX7nlpa" role="3cqZAp">
+              <node concept="3cpWsn" id="7nkyKX7nlpb" role="3cpWs9">
+                <property role="TrG5h" value="rule" />
+                <node concept="3uibUv" id="7nkyKX7nlp9" role="1tU5fm">
+                  <ref role="3uigEE" to="nc4n:7eGEHDlc$9y" resolve="ConstraintRule" />
+                </node>
+                <node concept="2OqwBi" id="7nkyKX7nlpc" role="33vP2m">
+                  <node concept="37vLTw" id="7nkyKX7nlpd" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7nkyKX7m8kI" resolve="main" />
+                  </node>
+                  <node concept="liA8E" id="7nkyKX7nlpe" role="2OqNvi">
+                    <ref role="37wK5l" to="nc4n:7eGEHDlc$ck" resolve="toRule" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7nkyKX7nlM0" role="3cqZAp">
+              <node concept="2OqwBi" id="7nkyKX7nlSO" role="3clFbG">
+                <node concept="37vLTw" id="7nkyKX7nlLY" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7nkyKX7njPf" resolve="handler" />
+                </node>
+                <node concept="liA8E" id="7nkyKX7nlVs" role="2OqNvi">
+                  <ref role="37wK5l" to="nc4n:7eGEHDlcF9o" resolve="addRule" />
+                  <node concept="37vLTw" id="7nkyKX7nmaO" role="37wK5m">
+                    <ref role="3cqZAo" node="7nkyKX7nlpb" resolve="rule" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="7nkyKX7nmhE" role="3cqZAp" />
+          </node>
+          <node concept="TDmWw" id="7nkyKX7nl0R" role="TEbGg">
+            <node concept="3cpWsn" id="7nkyKX7nl0T" role="TDEfY">
+              <property role="TrG5h" value="e" />
+              <node concept="3uibUv" id="7nkyKX7nmdZ" role="1tU5fm">
+                <ref role="3uigEE" to="nc4n:7Oc59RS$wKP" resolve="InvalidRuleException" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="7nkyKX7nl0X" role="TDEfX">
+              <node concept="3cpWs8" id="7nkyKX7nmlg" role="3cqZAp">
+                <node concept="3cpWsn" id="7nkyKX7nmlh" role="3cpWs9">
+                  <property role="TrG5h" value="details" />
+                  <node concept="17QB3L" id="7nkyKX7nmli" role="1tU5fm" />
+                  <node concept="3K4zz7" id="7nkyKX7nmlj" role="33vP2m">
+                    <node concept="Xl_RD" id="7nkyKX7nmlk" role="3K4GZi">
+                      <property role="Xl_RC" value="" />
+                    </node>
+                    <node concept="3y3z36" id="7nkyKX7nmll" role="3K4Cdx">
+                      <node concept="10Nm6u" id="7nkyKX7nmlm" role="3uHU7w" />
+                      <node concept="37vLTw" id="7nkyKX7nmln" role="3uHU7B">
+                        <ref role="3cqZAo" node="7nkyKX7njPd" resolve="root" />
+                      </node>
+                    </node>
+                    <node concept="3cpWs3" id="7nkyKX7nmlo" role="3K4E3e">
+                      <node concept="2OqwBi" id="7nkyKX7nmlp" role="3uHU7w">
+                        <node concept="2JrnkZ" id="7nkyKX7nmlq" role="2Oq$k0">
+                          <node concept="37vLTw" id="7nkyKX7nmlr" role="2JrQYb">
+                            <ref role="3cqZAo" node="7nkyKX7njPd" resolve="root" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="7nkyKX7nmls" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                        </node>
+                      </node>
+                      <node concept="3cpWs3" id="7nkyKX7nmlt" role="3uHU7B">
+                        <node concept="3cpWs3" id="7nkyKX7nmlu" role="3uHU7B">
+                          <node concept="Xl_RD" id="7nkyKX7nmlv" role="3uHU7B">
+                            <property role="Xl_RC" value=" triggered by " />
+                          </node>
+                          <node concept="2OqwBi" id="7nkyKX7nmlw" role="3uHU7w">
+                            <node concept="37vLTw" id="7nkyKX7nmlx" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7nkyKX7njPd" resolve="root" />
+                            </node>
+                            <node concept="2qgKlT" id="7nkyKX7nmly" role="2OqNvi">
+                              <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="7nkyKX7nmlz" role="3uHU7w">
+                          <property role="Xl_RC" value="@" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="7nkyKX7nml$" role="3cqZAp">
+                <node concept="2OqwBi" id="7nkyKX7nml_" role="3clFbG">
+                  <node concept="37vLTw" id="7nkyKX7nmlA" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7nkyKX7ng8Q" resolve="errors" />
+                  </node>
+                  <node concept="TSZUe" id="7nkyKX7nmlB" role="2OqNvi">
+                    <node concept="2ShNRf" id="7nkyKX7nmlC" role="25WWJ7">
+                      <node concept="1pGfFk" id="7nkyKX7nmlD" role="2ShVmc">
+                        <ref role="37wK5l" to="4t1t:7Oc59RSAqpA" resolve="ReportedError" />
+                        <node concept="3cpWs3" id="7nkyKX7nmlE" role="37wK5m">
+                          <node concept="37vLTw" id="7nkyKX7nmlF" role="3uHU7w">
+                            <ref role="3cqZAo" node="7nkyKX7nmlh" resolve="details" />
+                          </node>
+                          <node concept="2OqwBi" id="7nkyKX7nmlJ" role="3uHU7B">
+                            <node concept="37vLTw" id="7nkyKX7nmlK" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7nkyKX7nl0T" resolve="e" />
+                            </node>
+                            <node concept="liA8E" id="7nkyKX7nmlL" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7nkyKX7nrdm" role="3cqZAp" />
+        <node concept="3cpWs6" id="7nkyKX7nru7" role="3cqZAp">
+          <node concept="3K4zz7" id="7nkyKX7nru8" role="3cqZAk">
+            <node concept="2YIFZM" id="7nkyKX7nru9" role="3K4E3e">
+              <ref role="37wK5l" to="4t1t:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="4t1t:7Oc59RSEjdb" resolve="Result" />
+            </node>
+            <node concept="2YIFZM" id="7nkyKX7nrua" role="3K4GZi">
+              <ref role="1Pybhc" to="4t1t:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="4t1t:7Oc59RSFgim" resolve="FAIL" />
+              <node concept="37vLTw" id="7nkyKX7nrub" role="37wK5m">
+                <ref role="3cqZAo" node="7nkyKX7ng8Q" resolve="errors" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7nkyKX7nruc" role="3K4Cdx">
+              <node concept="37vLTw" id="7nkyKX7nrud" role="2Oq$k0">
+                <ref role="3cqZAo" node="7nkyKX7ng8Q" resolve="errors" />
+              </node>
+              <node concept="1v1jN8" id="7nkyKX7nrue" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7Oc59RSy_Bt" role="jymVt" />
     <node concept="3clFb_" id="5NuEpF1pL7f" role="jymVt">
@@ -1219,6 +1416,35 @@
             <node concept="3clFbH" id="7t5VLKHaDXn" role="3cqZAp" />
             <node concept="2Gpval" id="tIwzd1I3Wy" role="3cqZAp">
               <node concept="3clFbS" id="tIwzd1I3Wz" role="2LFqv$">
+                <node concept="3clFbJ" id="7nkyKX7muZc" role="3cqZAp">
+                  <node concept="3clFbS" id="7nkyKX7muZe" role="3clFbx">
+                    <node concept="3clFbF" id="7nkyKX7mw8C" role="3cqZAp">
+                      <node concept="2OqwBi" id="7nkyKX7mwfr" role="3clFbG">
+                        <node concept="37vLTw" id="7nkyKX7mw8A" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7nkyKX7m8kI" resolve="main" />
+                        </node>
+                        <node concept="liA8E" id="7nkyKX7mwk9" role="2OqNvi">
+                          <ref role="37wK5l" to="nc4n:77AxcO4ZwMR" resolve="merge" />
+                          <node concept="2GrUjf" id="7nkyKX7mwtE" role="37wK5m">
+                            <ref role="2Gs0qQ" node="tIwzd1I3Xb" resolve="builder" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3N13vt" id="7nkyKX7mwHG" role="3cqZAp" />
+                  </node>
+                  <node concept="3fqX7Q" id="7nkyKX7mvS7" role="3clFbw">
+                    <node concept="2OqwBi" id="7nkyKX7mvS9" role="3fr31v">
+                      <node concept="2GrUjf" id="7nkyKX7mvSa" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="tIwzd1I3Xb" resolve="builder" />
+                      </node>
+                      <node concept="liA8E" id="7nkyKX7mvSb" role="2OqNvi">
+                        <ref role="37wK5l" to="nc4n:7nkyKX7mcq7" resolve="hasHead" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="7nkyKX7mwTu" role="3cqZAp" />
                 <node concept="SfApY" id="tIwzd1I3W$" role="3cqZAp">
                   <node concept="3clFbS" id="tIwzd1I3W_" role="SfCbr">
                     <node concept="3cpWs8" id="tIwzd1I3WA" role="3cqZAp">
@@ -1432,7 +1658,7 @@
             <ref role="3cqZAo" node="tIwzd1I3Xm" resolve="allTemplates" />
           </node>
         </node>
-        <node concept="3clFbH" id="tIwzd1Iira" role="3cqZAp" />
+        <node concept="3clFbH" id="7nkyKX7n9UN" role="3cqZAp" />
         <node concept="3clFbF" id="tIwzd1Ii5C" role="3cqZAp">
           <node concept="37vLTw" id="tIwzd1Ii5A" role="3clFbG">
             <ref role="3cqZAo" node="tIwzd1IbDT" resolve="reqd" />
@@ -1440,7 +1666,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7Oc59RSyviB" role="jymVt" />
+    <node concept="2tJIrI" id="7nkyKX7nb0M" role="jymVt" />
     <node concept="312cEu" id="5ntLU8Glzc7" role="jymVt">
       <property role="2bfB8j" value="true" />
       <property role="TrG5h" value="TemplateApplicator" />
@@ -1765,6 +1991,13 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="12yN8DyF_E2" role="1B3o_S" />
+    <node concept="312cEg" id="7nkyKX7m8kI" role="jymVt">
+      <property role="TrG5h" value="main" />
+      <node concept="3Tm6S6" id="7nkyKX7m8kJ" role="1B3o_S" />
+      <node concept="3uibUv" id="7nkyKX7m8kL" role="1tU5fm">
+        <ref role="3uigEE" to="nc4n:7eGEHDlc$ap" resolve="RuleBuilder" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="12yN8DyNqdl">
     <property role="TrG5h" value="NodeWalker" />