diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index bc7f5896..afef5157 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -47,8 +47,8 @@
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
     <import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" implicit="true" />
   </imports>
   <registry>
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
@@ -2123,6 +2123,102 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="4jcOV4hx2aj" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
+      <node concept="1Koe21" id="4jcOV4hxR3N" role="1lVwrX">
+        <node concept="3clFb_" id="4jcOV4hxR3O" role="1Koe22">
+          <property role="TrG5h" value="context" />
+          <node concept="3cqZAl" id="4jcOV4hxR3P" role="3clF45" />
+          <node concept="3Tm1VV" id="4jcOV4hxR3Q" role="1B3o_S" />
+          <node concept="3clFbS" id="4jcOV4hxR3R" role="3clF47">
+            <node concept="3clFbF" id="4jcOV4hxR3S" role="3cqZAp">
+              <node concept="2OqwBi" id="4jcOV4hxR3T" role="3clFbG">
+                <node concept="2OqwBi" id="4jcOV4hxR3U" role="2Oq$k0">
+                  <node concept="2ShNRf" id="4jcOV4hxR3V" role="2Oq$k0">
+                    <node concept="1pGfFk" id="4jcOV4hxR3W" role="2ShVmc">
+                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <node concept="10M0yZ" id="4jcOV4hxRdl" role="37wK5m">
+                        <ref role="3cqZAo" to="cxk7:4jcOV4hx9DP" resolve="FEEDBACK_SYM" />
+                        <ref role="1PxDUh" to="cxk7:4jcOV4hx9Du" resolve="ProvideFeedbackPredicate" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="4jcOV4hxR3Y" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <node concept="10Nm6u" id="4jcOV4hxR3Z" role="37wK5m">
+                      <node concept="5jKBG" id="4jcOV4hxR40" role="lGtFl">
+                        <ref role="v9R2y" node="1HWyn8iTl_Y" resolve="LateParameter_expression" />
+                      </node>
+                    </node>
+                    <node concept="Xl_RD" id="4jcOV4hxRwG" role="37wK5m">
+                      <node concept="17Uvod" id="4jcOV4hxRwK" role="lGtFl">
+                        <property role="2qtEX9" value="value" />
+                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                        <node concept="3zFVjK" id="4jcOV4hxRwL" role="3zH0cK">
+                          <node concept="3clFbS" id="4jcOV4hxRwM" role="2VODD2">
+                            <node concept="3clFbF" id="4jcOV4hxTS4" role="3cqZAp">
+                              <node concept="2OqwBi" id="4jcOV4hxU8e" role="3clFbG">
+                                <node concept="30H73N" id="4jcOV4hxTS3" role="2Oq$k0" />
+                                <node concept="3TrcHB" id="4jcOV4hxUmI" role="2OqNvi">
+                                  <ref role="3TsBF5" to="wq2x:4jcOV4hu0nK" resolve="severity" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="4jcOV4hxR41" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                </node>
+                <node concept="raruj" id="4jcOV4hxR42" role="lGtFl" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="4jcOV4hEQk4" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:4jcOV4hExo0" resolve="FailConstraint" />
+      <node concept="1Koe21" id="4jcOV4hEQk5" role="1lVwrX">
+        <node concept="3clFb_" id="4jcOV4hEQk6" role="1Koe22">
+          <property role="TrG5h" value="context" />
+          <node concept="3cqZAl" id="4jcOV4hEQk7" role="3clF45" />
+          <node concept="3Tm1VV" id="4jcOV4hEQk8" role="1B3o_S" />
+          <node concept="3clFbS" id="4jcOV4hEQk9" role="3clF47">
+            <node concept="3clFbF" id="4jcOV4hEQka" role="3cqZAp">
+              <node concept="2OqwBi" id="4jcOV4hEQkb" role="3clFbG">
+                <node concept="2OqwBi" id="4jcOV4hEQkc" role="2Oq$k0">
+                  <node concept="2ShNRf" id="4jcOV4hEQkd" role="2Oq$k0">
+                    <node concept="1pGfFk" id="4jcOV4hEQke" role="2ShVmc">
+                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <node concept="10M0yZ" id="4jcOV4hEQvj" role="37wK5m">
+                        <ref role="3cqZAo" to="cxk7:4jcOV4hENDE" resolve="FAIL_SYM" />
+                        <ref role="1PxDUh" to="cxk7:4jcOV4hENDg" resolve="FailPredicate" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="4jcOV4hEQkg" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <node concept="10Nm6u" id="4jcOV4hEQkh" role="37wK5m">
+                      <node concept="5jKBG" id="4jcOV4hEQki" role="lGtFl">
+                        <ref role="v9R2y" node="1HWyn8iTl_Y" resolve="LateParameter_expression" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="4jcOV4hEQkr" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                </node>
+                <node concept="raruj" id="4jcOV4hEQks" role="lGtFl" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="6yUEjXvTwe$" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:60zk4o7reud" resolve="LogicalContextExpression" />
       <node concept="1Koe21" id="6yUEjXvT$ta" role="1lVwrX">
@@ -2264,6 +2360,12 @@
                           <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
                         </node>
                       </node>
+                      <node concept="37vLTG" id="4jcOV4hlqbU" role="3clF46">
+                        <property role="TrG5h" value="_invocationContext" />
+                        <node concept="3uibUv" id="4jcOV4hlqbV" role="1tU5fm">
+                          <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
+                        </node>
+                      </node>
                       <node concept="37vLTG" id="1HWyn8juJKI" role="3clF46">
                         <property role="TrG5h" value="args" />
                         <node concept="8X2XB" id="1HWyn8juJKJ" role="1tU5fm">
@@ -2468,6 +2570,12 @@
                           <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
                         </node>
                       </node>
+                      <node concept="37vLTG" id="4jcOV4hlpiM" role="3clF46">
+                        <property role="TrG5h" value="_invocationContext" />
+                        <node concept="3uibUv" id="4jcOV4hlpiN" role="1tU5fm">
+                          <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
+                        </node>
+                      </node>
                       <node concept="37vLTG" id="3pMFS1zdixt" role="3clF46">
                         <property role="TrG5h" value="args" />
                         <node concept="8X2XB" id="3pMFS1zdixu" role="1tU5fm">
@@ -12282,6 +12390,12 @@
                       <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
                     </node>
                   </node>
+                  <node concept="37vLTG" id="4jcOV4hliBa" role="3clF46">
+                    <property role="TrG5h" value="_invocationContext" />
+                    <node concept="3uibUv" id="4jcOV4hliCP" role="1tU5fm">
+                      <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
+                    </node>
+                  </node>
                   <node concept="37vLTG" id="1HWyn8iTlBr" role="3clF46">
                     <property role="TrG5h" value="args" />
                     <node concept="8X2XB" id="1HWyn8iTlBs" role="1tU5fm">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 2a4e0f4b..c24a668c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -47,7 +47,6 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
@@ -67,9 +66,6 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </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="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -93,7 +89,6 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
@@ -105,9 +100,6 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -130,12 +122,6 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
-      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
@@ -161,18 +147,10 @@
         <child id="1803469493727536396" name="concept" index="hTh3Z" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
-      <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
-      </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
-      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
-        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
-      </concept>
       <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
@@ -185,21 +163,11 @@
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
-      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="5944356402132808749" name="jetbrains.mps.lang.smodel.structure.ConceptSwitchStatement" flags="nn" index="1_3QMa">
-        <child id="5944356402132808753" name="case" index="1_3QMm" />
-        <child id="5944356402132808752" name="expression" index="1_3QMn" />
-      </concept>
-      <concept id="5944356402132808754" name="jetbrains.mps.lang.smodel.structure.SubconceptCase" flags="ng" index="1_3QMl">
-        <child id="1163670677455" name="concept" index="3Kbmr1" />
-        <child id="1163670683720" name="body" index="3Kbo56" />
-      </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -276,154 +244,6 @@
   <node concept="13h7C7" id="4EfgX2E$3BI">
     <property role="3GE5qa" value="constraint" />
     <ref role="13h7C2" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
-    <node concept="13i0hz" id="4EfgX2E$3E9" role="13h7CS">
-      <property role="TrG5h" value="toJava" />
-      <node concept="3Tm1VV" id="4EfgX2E$3Ea" role="1B3o_S" />
-      <node concept="3clFbS" id="4EfgX2E$3Eb" role="3clF47">
-        <node concept="3SKdUt" id="2KSgAgV9$z$" role="3cqZAp">
-          <node concept="3SKdUq" id="2KSgAgV9$zA" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: remove this" />
-          </node>
-        </node>
-        <node concept="1_3QMa" id="4EfgX2E$Mtv" role="3cqZAp">
-          <node concept="2OqwBi" id="3U_KxQf9kcN" role="1_3QMn">
-            <node concept="2OqwBi" id="3U_KxQf9kcO" role="2Oq$k0">
-              <node concept="13iPFW" id="3U_KxQf9kcP" role="2Oq$k0" />
-              <node concept="3TrEf2" id="3U_KxQf9kcQ" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" resolve="expression" />
-              </node>
-            </node>
-            <node concept="2yIwOk" id="5Z2pjOG_XvZ" role="2OqNvi" />
-          </node>
-          <node concept="1_3QMl" id="4EfgX2E$N44" role="1_3QMm">
-            <node concept="3gn64h" id="4EfgX2E$N4Z" role="3Kbmr1">
-              <ref role="3gnhBz" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
-            </node>
-            <node concept="3clFbS" id="4EfgX2E$N46" role="3Kbo56">
-              <node concept="3cpWs8" id="4EfgX2E$Qpx" role="3cqZAp">
-                <node concept="3cpWsn" id="4EfgX2E$Qpy" role="3cpWs9">
-                  <property role="TrG5h" value="smd" />
-                  <node concept="3Tqbb2" id="4EfgX2E$Qpv" role="1tU5fm">
-                    <ref role="ehGHo" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
-                  </node>
-                  <node concept="2OqwBi" id="4EfgX2E$QyW" role="33vP2m">
-                    <node concept="1PxgMI" id="4EfgX2E$Qpz" role="2Oq$k0">
-                      <node concept="2OqwBi" id="4EfgX2E$Qp$" role="1m5AlR">
-                        <node concept="13iPFW" id="4EfgX2E$Qp_" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="4EfgX2E$QpA" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" resolve="expression" />
-                        </node>
-                      </node>
-                      <node concept="chp4Y" id="6fXjIfxgneJ" role="3oSUPX">
-                        <ref role="cht4Q" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
-                      </node>
-                    </node>
-                    <node concept="3TrEf2" id="4EfgX2E$R7t" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tpee:fIYIWN3" resolve="staticMethodDeclaration" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="4EfgX2E$PNv" role="3cqZAp">
-                <node concept="3cpWs3" id="4EfgX2E$XqM" role="3cqZAk">
-                  <node concept="Xl_RD" id="4EfgX2E$Xwo" role="3uHU7w">
-                    <property role="Xl_RC" value="()" />
-                  </node>
-                  <node concept="3cpWs3" id="4EfgX2E$V9J" role="3uHU7B">
-                    <node concept="3cpWs3" id="4EfgX2E$UFi" role="3uHU7B">
-                      <node concept="3cpWs3" id="4EfgX2EE6Te" role="3uHU7B">
-                        <node concept="2OqwBi" id="4EfgX2EEb$j" role="3uHU7w">
-                          <node concept="1PxgMI" id="4EfgX2EEbam" role="2Oq$k0">
-                            <node concept="2OqwBi" id="4EfgX2EE7im" role="1m5AlR">
-                              <node concept="37vLTw" id="4EfgX2EE73f" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4EfgX2E$Qpy" resolve="smd" />
-                              </node>
-                              <node concept="1mfA1w" id="4EfgX2EE920" role="2OqNvi" />
-                            </node>
-                            <node concept="chp4Y" id="6fXjIfxgnf9" role="3oSUPX">
-                              <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
-                            </node>
-                          </node>
-                          <node concept="3TrcHB" id="4EfgX2EEcd0" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                        <node concept="3cpWs3" id="4EfgX2EE64k" role="3uHU7B">
-                          <node concept="2OqwBi" id="4EfgX2E$Uhg" role="3uHU7B">
-                            <node concept="2JrnkZ" id="4EfgX2E$Uf4" role="2Oq$k0">
-                              <node concept="2OqwBi" id="4EfgX2E$R$Y" role="2JrQYb">
-                                <node concept="37vLTw" id="4EfgX2E$RlW" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4EfgX2E$Qpy" resolve="smd" />
-                                </node>
-                                <node concept="I4A8Y" id="4EfgX2E$Sra" role="2OqNvi" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="4EfgX2E$Utd" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SModel.getModelName():java.lang.String" resolve="getModelName" />
-                            </node>
-                          </node>
-                          <node concept="Xl_RD" id="4EfgX2EE6bk" role="3uHU7w">
-                            <property role="Xl_RC" value="." />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Xl_RD" id="4EfgX2E$ULz" role="3uHU7w">
-                        <property role="Xl_RC" value="." />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="4EfgX2E$Vxy" role="3uHU7w">
-                      <node concept="37vLTw" id="4EfgX2E$Vj1" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4EfgX2E$Qpy" resolve="smd" />
-                      </node>
-                      <node concept="3TrcHB" id="4EfgX2E$Wpo" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4EfgX2E$QuI" role="3cqZAp" />
-            </node>
-          </node>
-          <node concept="1_3QMl" id="4EfgX2E$N52" role="1_3QMm">
-            <node concept="3gn64h" id="4EfgX2E$N60" role="3Kbmr1">
-              <ref role="3gnhBz" to="tpee:fzclF81" resolve="BooleanConstant" />
-            </node>
-            <node concept="3clFbS" id="4EfgX2E$N54" role="3Kbo56">
-              <node concept="3cpWs6" id="3x8pcoFehB0" role="3cqZAp">
-                <node concept="2YIFZM" id="3x8pcoFeoo8" role="3cqZAk">
-                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(boolean):java.lang.String" resolve="valueOf" />
-                  <node concept="2OqwBi" id="3x8pcoFej2u" role="37wK5m">
-                    <node concept="1PxgMI" id="3x8pcoFejIl" role="2Oq$k0">
-                      <node concept="2OqwBi" id="3x8pcoFeipH" role="1m5AlR">
-                        <node concept="13iPFW" id="3x8pcoFehXU" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="3x8pcoFeiM5" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" resolve="expression" />
-                        </node>
-                      </node>
-                      <node concept="chp4Y" id="6fXjIfxgneO" role="3oSUPX">
-                        <ref role="cht4Q" to="tpee:fzclF81" resolve="BooleanConstant" />
-                      </node>
-                    </node>
-                    <node concept="3TrcHB" id="3x8pcoFekiC" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpee:fzclF82" resolve="value" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="4EfgX2E$N7Z" role="3cqZAp" />
-        <node concept="3cpWs6" id="4EfgX2E$N93" role="3cqZAp">
-          <node concept="Xl_RD" id="4EfgX2E$Z9S" role="3cqZAk">
-            <property role="Xl_RC" value="??? unsupported expression ???" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="4EfgX2E$3Eh" role="3clF45" />
-    </node>
     <node concept="13i0hz" id="1HWyn8iQi_1" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
@@ -1688,5 +1508,55 @@
       <node concept="3clFbS" id="6OXbTDz3CCH" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="4jcOV4hwVWX">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="13h7C2" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
+    <node concept="13hLZK" id="4jcOV4hwVWY" role="13h7CW">
+      <node concept="3clFbS" id="4jcOV4hwVWZ" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="4jcOV4hwXdE" role="13h7CS">
+      <property role="TrG5h" value="code" />
+      <ref role="13i0hy" node="1HWyn8iQiyf" resolve="code" />
+      <node concept="3Tm1VV" id="4jcOV4hwXdF" role="1B3o_S" />
+      <node concept="3clFbS" id="4jcOV4hwXdI" role="3clF47">
+        <node concept="3clFbF" id="4jcOV4hwXg9" role="3cqZAp">
+          <node concept="2OqwBi" id="4jcOV4hwXqt" role="3clFbG">
+            <node concept="13iPFW" id="4jcOV4hwXg8" role="2Oq$k0" />
+            <node concept="3TrEf2" id="4jcOV4hwXP2" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:4jcOV4hwicZ" resolve="message" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="4jcOV4hwXdJ" role="3clF45">
+        <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+      </node>
+    </node>
+  </node>
+  <node concept="13h7C7" id="4jcOV4hEGlW">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="13h7C2" to="wq2x:4jcOV4hExo0" resolve="FailConstraint" />
+    <node concept="13i0hz" id="4jcOV4hEGm7" role="13h7CS">
+      <property role="TrG5h" value="code" />
+      <ref role="13i0hy" node="1HWyn8iQiyf" resolve="code" />
+      <node concept="3Tm1VV" id="4jcOV4hEGm8" role="1B3o_S" />
+      <node concept="3clFbS" id="4jcOV4hEGm9" role="3clF47">
+        <node concept="3clFbF" id="4jcOV4hEGma" role="3cqZAp">
+          <node concept="2OqwBi" id="4jcOV4hEGmb" role="3clFbG">
+            <node concept="13iPFW" id="4jcOV4hEGmc" role="2Oq$k0" />
+            <node concept="3TrEf2" id="4jcOV4hEGAf" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:4jcOV4hEDv3" resolve="message" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="4jcOV4hEGme" role="3clF45">
+        <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+      </node>
+    </node>
+    <node concept="13hLZK" id="4jcOV4hEGlX" role="13h7CW">
+      <node concept="3clFbS" id="4jcOV4hEGlY" role="2VODD2" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 4f371f02..29dd5002 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -1300,5 +1300,157 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="4jcOV4hwMzQ">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="1M2myG" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
+    <node concept="9S07l" id="4jcOV4hwMzR" role="9Vyp8">
+      <node concept="3clFbS" id="4jcOV4hwMzS" role="2VODD2">
+        <node concept="3cpWs8" id="4jcOV4hwMIQ" role="3cqZAp">
+          <node concept="3cpWsn" id="4jcOV4hwMIR" role="3cpWs9">
+            <property role="TrG5h" value="acceptable" />
+            <node concept="10P_77" id="4jcOV4hwMIS" role="1tU5fm" />
+            <node concept="2OqwBi" id="4jcOV4hwMIT" role="33vP2m">
+              <node concept="2OqwBi" id="4jcOV4hwMIU" role="2Oq$k0">
+                <node concept="nLn13" id="4jcOV4hwMIV" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="4jcOV4hwMIW" role="2OqNvi">
+                  <node concept="3gmYPX" id="4jcOV4hwMIX" role="1xVPHs">
+                    <node concept="3gn64h" id="4jcOV4hwMIZ" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
+                    </node>
+                    <node concept="3gn64h" id="4jcOV4hwMJ0" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                    </node>
+                  </node>
+                  <node concept="1xIGOp" id="4jcOV4hwMJ1" role="1xVPHs" />
+                </node>
+              </node>
+              <node concept="3x8VRR" id="4jcOV4hwMJ2" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4jcOV4hwMJ3" role="3cqZAp" />
+        <node concept="3cpWs8" id="4jcOV4hwMJ4" role="3cqZAp">
+          <node concept="3cpWsn" id="4jcOV4hwMJ5" role="3cpWs9">
+            <property role="TrG5h" value="methk" />
+            <node concept="3uibUv" id="4jcOV4hwMJ6" role="1tU5fm">
+              <ref role="3uigEE" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+            </node>
+            <node concept="2YIFZM" id="4jcOV4hwMJ7" role="33vP2m">
+              <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
+              <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
+              <node concept="2OqwBi" id="4jcOV4hwMJ8" role="37wK5m">
+                <node concept="nLn13" id="4jcOV4hwMJ9" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="4jcOV4hwMJa" role="2OqNvi">
+                  <node concept="1xMEDy" id="4jcOV4hwMJb" role="1xVPHs">
+                    <node concept="chp4Y" id="4jcOV4hwMJc" role="ri$Ld">
+                      <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4jcOV4hwMJd" role="3cqZAp">
+          <node concept="3vZ8r8" id="4jcOV4hwMJe" role="3clFbG">
+            <node concept="3clFbC" id="4jcOV4hwMJj" role="37vLTx">
+              <node concept="37vLTw" id="4jcOV4hwMJk" role="3uHU7B">
+                <ref role="3cqZAo" node="4jcOV4hwMJ5" resolve="methk" />
+              </node>
+              <node concept="Rm8GO" id="4jcOV4hwMJl" role="3uHU7w">
+                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4jcOV4hwMJm" role="37vLTJ">
+              <ref role="3cqZAo" node="4jcOV4hwMIR" resolve="acceptable" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4jcOV4hwMJn" role="3cqZAp" />
+        <node concept="3clFbF" id="4jcOV4hwMJo" role="3cqZAp">
+          <node concept="37vLTw" id="4jcOV4hwMJp" role="3clFbG">
+            <ref role="3cqZAo" node="4jcOV4hwMIR" resolve="acceptable" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="1M2fIO" id="4jcOV4hEFqh">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="1M2myG" to="wq2x:4jcOV4hExo0" resolve="FailConstraint" />
+    <node concept="9S07l" id="4jcOV4hEFqi" role="9Vyp8">
+      <node concept="3clFbS" id="4jcOV4hEFqj" role="2VODD2">
+        <node concept="3cpWs8" id="4jcOV4hEF_h" role="3cqZAp">
+          <node concept="3cpWsn" id="4jcOV4hEF_i" role="3cpWs9">
+            <property role="TrG5h" value="acceptable" />
+            <node concept="10P_77" id="4jcOV4hEF_j" role="1tU5fm" />
+            <node concept="2OqwBi" id="4jcOV4hEF_k" role="33vP2m">
+              <node concept="2OqwBi" id="4jcOV4hEF_l" role="2Oq$k0">
+                <node concept="nLn13" id="4jcOV4hEF_m" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="4jcOV4hEF_n" role="2OqNvi">
+                  <node concept="3gmYPX" id="4jcOV4hEF_o" role="1xVPHs">
+                    <node concept="3gn64h" id="4jcOV4hEF_p" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
+                    </node>
+                    <node concept="3gn64h" id="4jcOV4hEF_q" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                    </node>
+                  </node>
+                  <node concept="1xIGOp" id="4jcOV4hEF_r" role="1xVPHs" />
+                </node>
+              </node>
+              <node concept="3x8VRR" id="4jcOV4hEF_s" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4jcOV4hEF_t" role="3cqZAp" />
+        <node concept="3cpWs8" id="4jcOV4hEF_u" role="3cqZAp">
+          <node concept="3cpWsn" id="4jcOV4hEF_v" role="3cpWs9">
+            <property role="TrG5h" value="methk" />
+            <node concept="3uibUv" id="4jcOV4hEF_w" role="1tU5fm">
+              <ref role="3uigEE" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+            </node>
+            <node concept="2YIFZM" id="4jcOV4hEF_x" role="33vP2m">
+              <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
+              <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
+              <node concept="2OqwBi" id="4jcOV4hEF_y" role="37wK5m">
+                <node concept="nLn13" id="4jcOV4hEF_z" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="4jcOV4hEF_$" role="2OqNvi">
+                  <node concept="1xMEDy" id="4jcOV4hEF__" role="1xVPHs">
+                    <node concept="chp4Y" id="4jcOV4hEF_A" role="ri$Ld">
+                      <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4jcOV4hEF_B" role="3cqZAp">
+          <node concept="3vZ8r8" id="4jcOV4hEF_C" role="3clFbG">
+            <node concept="3clFbC" id="4jcOV4hEF_D" role="37vLTx">
+              <node concept="37vLTw" id="4jcOV4hEF_E" role="3uHU7B">
+                <ref role="3cqZAo" node="4jcOV4hEF_v" resolve="methk" />
+              </node>
+              <node concept="Rm8GO" id="4jcOV4hEF_F" role="3uHU7w">
+                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4jcOV4hEF_G" role="37vLTJ">
+              <ref role="3cqZAo" node="4jcOV4hEF_i" resolve="acceptable" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4jcOV4hEF_H" role="3cqZAp" />
+        <node concept="3clFbF" id="4jcOV4hEF_I" role="3cqZAp">
+          <node concept="37vLTw" id="4jcOV4hEF_J" role="3clFbG">
+            <ref role="3cqZAo" node="4jcOV4hEF_i" resolve="acceptable" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 0d4ac796..67ea14ca 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -83,6 +83,7 @@
       <concept id="562388756446465666" name="jetbrains.mps.lang.editor.structure.MigratedSideTransformMenuAttribute" flags="ng" index="yp4Wq">
         <property id="562388756446465811" name="transformTag" index="yp4Ub" />
       </concept>
+      <concept id="8371900013785948369" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Parameter" flags="ig" index="2$S_p_" />
       <concept id="6718020819487620876" name="jetbrains.mps.lang.editor.structure.TransformationMenuReference_Default" flags="ng" index="A1WHr" />
       <concept id="6718020819487620873" name="jetbrains.mps.lang.editor.structure.TransformationMenuReference_Named" flags="ng" index="A1WHu">
         <reference id="6718020819487620874" name="menu" index="A1WHt" />
@@ -93,6 +94,10 @@
       <concept id="3473224453637651916" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform_PlaceInCellHolder" flags="ng" index="CtIbL">
         <property id="3473224453637651917" name="placeInCell" index="CtIbK" />
       </concept>
+      <concept id="308059530142752797" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Parameterized" flags="ng" index="2F$Pav">
+        <child id="8371900013785948359" name="part" index="2$S_pN" />
+        <child id="8371900013785948365" name="parameterQuery" index="2$S_pT" />
+      </concept>
       <concept id="1638911550608571617" name="jetbrains.mps.lang.editor.structure.TransformationMenu_Default" flags="ng" index="IW6AY" />
       <concept id="1638911550608610798" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Execute" flags="ig" index="IWg2L" />
       <concept id="1638911550608610278" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Action" flags="ng" index="IWgqT">
@@ -332,6 +337,7 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -355,6 +361,7 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -389,6 +396,12 @@
       </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
       <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
       <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
@@ -415,6 +428,8 @@
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1143512015885" name="jetbrains.mps.lang.smodel.structure.Node_GetNextSiblingOperation" flags="nn" index="YCak7" />
+      <concept id="1240171359678" name="jetbrains.mps.lang.smodel.structure.EnumMember_ValueOperation" flags="nn" index="2ZYiMu" />
+      <concept id="1240173327827" name="jetbrains.mps.lang.smodel.structure.EnumMember_NameOperation" flags="nn" index="305NjN" />
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
@@ -440,6 +455,14 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
+      <concept id="1240930118027" name="jetbrains.mps.lang.smodel.structure.SEnumOperationInvocation" flags="nn" index="3HcIyF">
+        <reference id="1240930118028" name="enumDeclaration" index="3HcIyG" />
+        <child id="1240930317927" name="operation" index="3Hdvt7" />
+      </concept>
+      <concept id="1240930444812" name="jetbrains.mps.lang.smodel.structure.SEnum_MemberForNameOperation" flags="ng" index="3HdYsG">
+        <child id="1240930444813" name="nameExpression" index="3HdYsH" />
+      </concept>
+      <concept id="1240930444980" name="jetbrains.mps.lang.smodel.structure.SEnum_MembersOperation" flags="ng" index="3HdYuk" />
       <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
         <child id="1140131861877" name="replacementNode" index="1P9ThW" />
       </concept>
@@ -474,6 +497,9 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
       <concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
         <child id="1176906787974" name="rightExpression" index="576Qk" />
       </concept>
@@ -482,8 +508,10 @@
         <child id="1235573175711" name="elementType" index="2HTBi0" />
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
@@ -4908,5 +4936,157 @@
       <node concept="l2Vlx" id="72RDgINeSRh" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="4jcOV4hu0nh">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="1XX52x" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
+    <node concept="3EZMnI" id="4jcOV4hu0nj" role="2wV5jI">
+      <node concept="3EZMnI" id="4jcOV4hvop4" role="3EZMnx">
+        <ref role="1k5W1q" to="qgy9:7ksQUDZuyMD" resolve="Backquote" />
+        <node concept="3F0A7n" id="4jcOV4hu0nN" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:4jcOV4hu0nK" resolve="severity" />
+          <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
+        </node>
+        <node concept="3F0ifn" id="4jcOV4hvop6" role="3EZMnx">
+          <property role="3F0ifm" value="(" />
+          <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+        </node>
+        <node concept="3F1sOY" id="4jcOV4hwiHR" role="3EZMnx">
+          <property role="1cu_pB" value="2" />
+          <ref role="1NtTu8" to="wq2x:4jcOV4hwicZ" resolve="message" />
+        </node>
+        <node concept="VPM3Z" id="4jcOV4hvop8" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3vyZuw" id="4jcOV4hvop9" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F0ifn" id="4jcOV4hvopa" role="3EZMnx">
+          <property role="3F0ifm" value=")" />
+          <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+        </node>
+        <node concept="l2Vlx" id="4jcOV4hvopb" role="2iSdaV" />
+      </node>
+      <node concept="l2Vlx" id="4jcOV4hu0nm" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3p36aQ" id="4jcOV4hu0ov">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="aqKnT" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
+    <node concept="2F$Pav" id="4jcOV4hu0oy" role="3ft7WO">
+      <node concept="3eGOop" id="4jcOV4huidp" role="2$S_pN">
+        <node concept="ucgPf" id="4jcOV4huidr" role="3aKz83">
+          <node concept="3clFbS" id="4jcOV4huidt" role="2VODD2">
+            <node concept="3cpWs8" id="4jcOV4hujRI" role="3cqZAp">
+              <node concept="3cpWsn" id="4jcOV4hujRJ" role="3cpWs9">
+                <property role="TrG5h" value="pfc" />
+                <node concept="3Tqbb2" id="4jcOV4hujRG" role="1tU5fm">
+                  <ref role="ehGHo" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
+                </node>
+                <node concept="2ShNRf" id="4jcOV4hujRK" role="33vP2m">
+                  <node concept="3zrR0B" id="4jcOV4hujRL" role="2ShVmc">
+                    <node concept="3Tqbb2" id="4jcOV4hujRM" role="3zrR0E">
+                      <ref role="ehGHo" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="4jcOV4huiqV" role="3cqZAp">
+              <node concept="2OqwBi" id="4jcOV4hulqk" role="3clFbG">
+                <node concept="2OqwBi" id="4jcOV4hukg0" role="2Oq$k0">
+                  <node concept="37vLTw" id="4jcOV4hujRN" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4jcOV4hujRJ" resolve="pfc" />
+                  </node>
+                  <node concept="3TrcHB" id="4jcOV4hukux" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:4jcOV4hu0nK" resolve="severity" />
+                  </node>
+                </node>
+                <node concept="tyxLq" id="4jcOV4humkV" role="2OqNvi">
+                  <node concept="2OqwBi" id="4jcOV4hvnED" role="tz02z">
+                    <node concept="3HcIyF" id="4jcOV4hvnbG" role="2Oq$k0">
+                      <ref role="3HcIyG" to="wq2x:4jcOV4hu0ns" resolve="FeedbackSeverity" />
+                      <node concept="3HdYsG" id="4jcOV4hvnmT" role="3Hdvt7">
+                        <node concept="2ZBlsa" id="4jcOV4hvntV" role="3HdYsH" />
+                      </node>
+                    </node>
+                    <node concept="2ZYiMu" id="4jcOV4hvoik" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="4jcOV4hundg" role="3cqZAp">
+              <node concept="37vLTw" id="4jcOV4hunde" role="3clFbG">
+                <ref role="3cqZAo" node="4jcOV4hujRJ" resolve="pfc" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="4jcOV4hu0oS" role="2ZBHrp" />
+      <node concept="2$S_p_" id="4jcOV4hu0oV" role="2$S_pT">
+        <node concept="3clFbS" id="4jcOV4hu0oW" role="2VODD2">
+          <node concept="3clFbF" id="4jcOV4hu4W6" role="3cqZAp">
+            <node concept="2OqwBi" id="4jcOV4hu5UD" role="3clFbG">
+              <node concept="3HcIyF" id="4jcOV4hu4W3" role="2Oq$k0">
+                <ref role="3HcIyG" to="wq2x:4jcOV4hu0ns" resolve="FeedbackSeverity" />
+                <node concept="3HdYuk" id="4jcOV4hu56h" role="3Hdvt7" />
+              </node>
+              <node concept="3$u5V9" id="4jcOV4hu7vq" role="2OqNvi">
+                <node concept="1bVj0M" id="4jcOV4hu7vs" role="23t8la">
+                  <node concept="3clFbS" id="4jcOV4hu7vt" role="1bW5cS">
+                    <node concept="3clFbF" id="4jcOV4hu7E2" role="3cqZAp">
+                      <node concept="2OqwBi" id="4jcOV4hueIK" role="3clFbG">
+                        <node concept="37vLTw" id="4jcOV4hu7E1" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4jcOV4hu7vu" resolve="it" />
+                        </node>
+                        <node concept="305NjN" id="4jcOV4hvmOC" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="4jcOV4hu7vu" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="4jcOV4hu7vv" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="4jcOV4hE$4_">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="1XX52x" to="wq2x:4jcOV4hExo0" resolve="FailConstraint" />
+    <node concept="3EZMnI" id="4jcOV4hEDuJ" role="2wV5jI">
+      <node concept="3EZMnI" id="4jcOV4hEDuK" role="3EZMnx">
+        <ref role="1k5W1q" to="qgy9:7ksQUDZuyMD" resolve="Backquote" />
+        <node concept="PMmxH" id="4jcOV4hEDuL" role="3EZMnx">
+          <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
+          <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        </node>
+        <node concept="3F0ifn" id="4jcOV4hEDuM" role="3EZMnx">
+          <property role="3F0ifm" value="(" />
+          <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+        </node>
+        <node concept="3F1sOY" id="4jcOV4hEDuN" role="3EZMnx">
+          <property role="1cu_pB" value="2" />
+          <ref role="1NtTu8" to="wq2x:4jcOV4hEDv3" resolve="message" />
+        </node>
+        <node concept="VPM3Z" id="4jcOV4hEDuO" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3vyZuw" id="4jcOV4hEDuP" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F0ifn" id="4jcOV4hEDuQ" role="3EZMnx">
+          <property role="3F0ifm" value=")" />
+          <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+        </node>
+        <node concept="l2Vlx" id="4jcOV4hEDuR" role="2iSdaV" />
+      </node>
+      <node concept="l2Vlx" id="4jcOV4hEDuS" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 55253b93..4cd6c360 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -23,6 +23,7 @@
       </concept>
       <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration" flags="ng" index="AxPO7">
         <reference id="1083171729157" name="memberDataType" index="M4eZT" />
+        <reference id="1083241965437" name="defaultMember" index="Qgau1" />
         <child id="1083172003582" name="member" index="M5hS2" />
       </concept>
       <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ig" index="M4N5e">
@@ -354,7 +355,7 @@
     <node concept="1TJgyj" id="4EfgX2EvGcc" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expression" />
-      <property role="20lbJX" value="0..1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="5372587443968983820" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
@@ -1270,5 +1271,69 @@
     <property role="34LRSv" value="repository" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
   </node>
+  <node concept="1TIwiD" id="4jcOV4hu088">
+    <property role="EcuMT" value="4957570047283823112" />
+    <property role="3GE5qa" value="constraint" />
+    <property role="TrG5h" value="ProvideFeedbackConstraint" />
+    <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
+    <node concept="1TJgyj" id="4jcOV4hwicZ" role="1TKVEi">
+      <property role="IQ2ns" value="4957570047284421439" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="message" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="1TJgyi" id="4jcOV4hu0nK" role="1TKVEl">
+      <property role="IQ2nx" value="4957570047283824112" />
+      <property role="TrG5h" value="severity" />
+      <ref role="AX2Wp" node="4jcOV4hu0ns" resolve="FeedbackSeverity" />
+    </node>
+    <node concept="PrWs8" id="4jcOV4hwWdd" role="PzmwI">
+      <ref role="PrY4T" node="1HWyn8iLEBo" resolve="LateParameter" />
+    </node>
+  </node>
+  <node concept="AxPO7" id="4jcOV4hu0ns">
+    <property role="3GE5qa" value="constraint" />
+    <property role="TrG5h" value="FeedbackSeverity" />
+    <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
+    <ref role="Qgau1" node="4jcOV4hu0nu" />
+    <node concept="M4N5e" id="4jcOV4hu0nt" role="M5hS2">
+      <property role="1uS6qv" value="DEBUG" />
+      <property role="1uS6qo" value="debug" />
+    </node>
+    <node concept="M4N5e" id="4jcOV4hu0nu" role="M5hS2">
+      <property role="1uS6qv" value="INFO" />
+      <property role="1uS6qo" value="info" />
+    </node>
+    <node concept="M4N5e" id="4jcOV4hu0nx" role="M5hS2">
+      <property role="1uS6qv" value="WARN" />
+      <property role="1uS6qo" value="warning" />
+    </node>
+    <node concept="M4N5e" id="4jcOV4hu0n_" role="M5hS2">
+      <property role="1uS6qv" value="ERROR" />
+      <property role="1uS6qo" value="error" />
+    </node>
+    <node concept="M4N5e" id="4jcOV4hu0nE" role="M5hS2">
+      <property role="1uS6qv" value="FATAL" />
+      <property role="1uS6qo" value="fatal" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="4jcOV4hExo0">
+    <property role="EcuMT" value="4957570047287105024" />
+    <property role="3GE5qa" value="constraint" />
+    <property role="TrG5h" value="FailConstraint" />
+    <property role="34LRSv" value="fail" />
+    <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
+    <node concept="1TJgyj" id="4jcOV4hEDv3" role="1TKVEi">
+      <property role="IQ2ns" value="4957570047287138243" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="message" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="PrWs8" id="4jcOV4hEyRj" role="PzmwI">
+      <ref role="PrY4T" node="1HWyn8iLEBo" resolve="LateParameter" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index def99cf7..b8492ec4 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -249,6 +249,15 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
+      <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
+        <child id="1163670592366" name="defaultBlock" index="3Kb1Dw" />
+        <child id="1163670766145" name="expression" index="3KbGdf" />
+        <child id="1163670772911" name="case" index="3KbHQx" />
+      </concept>
+      <concept id="1163670641947" name="jetbrains.mps.baseLanguage.structure.SwitchCase" flags="ng" index="3KbdKl">
+        <child id="1163670677455" name="expression" index="3Kbmr1" />
+        <child id="1163670683720" name="body" index="3Kbo56" />
+      </concept>
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -836,73 +845,68 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="8odmgCo0jL" role="3cqZAp">
-          <node concept="37vLTI" id="8odmgCo34v" role="3clFbG">
-            <node concept="2OqwBi" id="8odmgCo4nu" role="37vLTx">
-              <node concept="37vLTw" id="8odmgCo4hH" role="2Oq$k0">
+        <node concept="3clFbF" id="4jcOV4hNqRv" role="3cqZAp">
+          <node concept="37vLTI" id="4jcOV4hNsy6" role="3clFbG">
+            <node concept="2OqwBi" id="4jcOV4hNu6D" role="37vLTx">
+              <node concept="37vLTw" id="4jcOV4hNu0C" role="2Oq$k0">
                 <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
               </node>
-              <node concept="liA8E" id="8odmgCo4yk" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withFailureHandler(jetbrains.mps.logic.reactor.evaluation.FailureHandler):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withFailureHandler" />
-                <node concept="2ShNRf" id="8odmgCo4zw" role="37wK5m">
-                  <node concept="YeOm9" id="8odmgCo4Lc" role="2ShVmc">
-                    <node concept="1Y3b0j" id="8odmgCo4Lf" role="YeSDq">
+              <node concept="liA8E" id="4jcOV4hNuYP" role="2OqNvi">
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withFeedbackHandler(jetbrains.mps.logic.reactor.evaluation.EvaluationFeedbackHandler):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withFeedbackHandler" />
+                <node concept="2ShNRf" id="4jcOV4hNv2p" role="37wK5m">
+                  <node concept="YeOm9" id="4jcOV4hNvgg" role="2ShVmc">
+                    <node concept="1Y3b0j" id="4jcOV4hNvgj" role="YeSDq">
                       <property role="2bfB8j" value="true" />
-                      <ref role="1Y3XeK" to="w7la:~FailureHandler" resolve="FailureHandler" />
+                      <ref role="1Y3XeK" to="w7la:~EvaluationFeedbackHandler" resolve="EvaluationFeedbackHandler" />
                       <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                      <node concept="3Tm1VV" id="8odmgCo4Lg" role="1B3o_S" />
-                      <node concept="3clFb_" id="8odmgCo4Lh" role="jymVt">
-                        <property role="1EzhhJ" value="false" />
-                        <property role="TrG5h" value="handleFailure" />
-                        <property role="DiZV1" value="false" />
-                        <property role="od$2w" value="false" />
-                        <node concept="3Tm1VV" id="8odmgCo4Li" role="1B3o_S" />
-                        <node concept="3uibUv" id="8odmgCo4Lk" role="3clF45">
-                          <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
-                        </node>
-                        <node concept="37vLTG" id="8odmgCo4Ll" role="3clF46">
-                          <property role="TrG5h" value="failure" />
-                          <node concept="3uibUv" id="8odmgCo4Lm" role="1tU5fm">
-                            <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
-                          </node>
-                        </node>
-                        <node concept="37vLTG" id="8odmgCo4Ln" role="3clF46">
+                      <node concept="3Tm1VV" id="4jcOV4hNvgk" role="1B3o_S" />
+                      <node concept="3clFb_" id="4jcOV4hNvgm" role="jymVt">
+                        <property role="TrG5h" value="handleFeedback" />
+                        <node concept="3Tm1VV" id="4jcOV4hNvgn" role="1B3o_S" />
+                        <node concept="10P_77" id="4jcOV4hNvgp" role="3clF45" />
+                        <node concept="37vLTG" id="4jcOV4hNvgq" role="3clF46">
                           <property role="TrG5h" value="rule" />
-                          <node concept="3uibUv" id="8odmgCo4Lo" role="1tU5fm">
+                          <node concept="3uibUv" id="4jcOV4hNvgr" role="1tU5fm">
                             <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
                           </node>
                         </node>
-                        <node concept="3clFbS" id="8odmgCo4Lp" role="3clF47">
-                          <node concept="3clFbH" id="6EY0p2wrM_E" role="3cqZAp" />
-                          <node concept="3clFbJ" id="8odmgCoHk0" role="3cqZAp">
-                            <node concept="3clFbS" id="8odmgCoHk2" role="3clFbx">
-                              <node concept="3cpWs8" id="73aHuggd5S3" role="3cqZAp">
-                                <node concept="3cpWsn" id="73aHuggd5S4" role="3cpWs9">
+                        <node concept="37vLTG" id="4jcOV4hNvgs" role="3clF46">
+                          <property role="TrG5h" value="feedback" />
+                          <node concept="3uibUv" id="4jcOV4hNvgt" role="1tU5fm">
+                            <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                          </node>
+                        </node>
+                        <node concept="3clFbS" id="4jcOV4hNvgu" role="3clF47">
+                          <node concept="3clFbH" id="4jcOV4hNws0" role="3cqZAp" />
+                          <node concept="3clFbJ" id="4jcOV4hNvEG" role="3cqZAp">
+                            <node concept="3clFbS" id="4jcOV4hNvEH" role="3clFbx">
+                              <node concept="3cpWs8" id="4jcOV4hNvEI" role="3cqZAp">
+                                <node concept="3cpWsn" id="4jcOV4hNvEJ" role="3cpWs9">
                                   <property role="TrG5h" value="principal" />
-                                  <node concept="10P_77" id="73aHuggd5RY" role="1tU5fm" />
-                                  <node concept="2OqwBi" id="73aHuggd5S5" role="33vP2m">
-                                    <node concept="2OqwBi" id="73aHuggd5S6" role="2Oq$k0">
-                                      <node concept="37vLTw" id="73aHuggd5S7" role="2Oq$k0">
+                                  <node concept="10P_77" id="4jcOV4hNvEK" role="1tU5fm" />
+                                  <node concept="2OqwBi" id="4jcOV4hNvEL" role="33vP2m">
+                                    <node concept="2OqwBi" id="4jcOV4hNvEM" role="2Oq$k0">
+                                      <node concept="37vLTw" id="4jcOV4hNvEN" role="2Oq$k0">
                                         <ref role="3cqZAo" node="70Wv0dJjilw" resolve="originIdxRef" />
                                       </node>
-                                      <node concept="liA8E" id="73aHuggd5S8" role="2OqNvi">
+                                      <node concept="liA8E" id="4jcOV4hNvEO" role="2OqNvi">
                                         <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
                                       </node>
                                     </node>
-                                    <node concept="liA8E" id="73aHuggd5S9" role="2OqNvi">
+                                    <node concept="liA8E" id="4jcOV4hNvEP" role="2OqNvi">
                                       <ref role="37wK5l" to="ksgm:70Wv0dJhQbd" resolve="isPrincipal" />
-                                      <node concept="2OqwBi" id="73aHuggd5Sa" role="37wK5m">
-                                        <node concept="1eOMI4" id="73aHuggd5Sb" role="2Oq$k0">
-                                          <node concept="10QFUN" id="73aHuggd5Sc" role="1eOMHV">
-                                            <node concept="3uibUv" id="73aHuggd5Sd" role="10QFUM">
+                                      <node concept="2OqwBi" id="4jcOV4hNvEQ" role="37wK5m">
+                                        <node concept="1eOMI4" id="4jcOV4hNvER" role="2Oq$k0">
+                                          <node concept="10QFUN" id="4jcOV4hNvES" role="1eOMHV">
+                                            <node concept="3uibUv" id="4jcOV4hNvET" role="10QFUM">
                                               <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
                                             </node>
-                                            <node concept="37vLTw" id="73aHuggd5Se" role="10QFUP">
-                                              <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                            <node concept="37vLTw" id="4jcOV4hNvEU" role="10QFUP">
+                                              <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="rule" />
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="liA8E" id="73aHuggd5Sf" role="2OqNvi">
+                                        <node concept="liA8E" id="4jcOV4hNvEV" role="2OqNvi">
                                           <ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="originRef" />
                                         </node>
                                       </node>
@@ -910,213 +914,221 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3cpWs8" id="73aHuggfnQs" role="3cqZAp">
-                                <node concept="3cpWsn" id="73aHuggfnQt" role="3cpWs9">
+                              <node concept="3cpWs8" id="4jcOV4hNvEW" role="3cqZAp">
+                                <node concept="3cpWsn" id="4jcOV4hNvEX" role="3cpWs9">
                                   <property role="TrG5h" value="head" />
-                                  <node concept="_YKpA" id="73aHuggfnQe" role="1tU5fm">
-                                    <node concept="3uibUv" id="73aHuggfnQh" role="_ZDj9">
+                                  <node concept="_YKpA" id="4jcOV4hNvEY" role="1tU5fm">
+                                    <node concept="3uibUv" id="4jcOV4hNvEZ" role="_ZDj9">
                                       <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                                     </node>
                                   </node>
-                                  <node concept="2OqwBi" id="73aHuggfnQu" role="33vP2m">
-                                    <node concept="2OqwBi" id="73aHuggfnQv" role="2Oq$k0">
-                                      <node concept="1eOMI4" id="73aHuggfnQw" role="2Oq$k0">
-                                        <node concept="10QFUN" id="73aHuggfnQx" role="1eOMHV">
-                                          <node concept="A3Dl8" id="73aHuggfnQy" role="10QFUM">
-                                            <node concept="3uibUv" id="73aHuggfnQz" role="A3Ik2">
+                                  <node concept="2OqwBi" id="4jcOV4hNvF0" role="33vP2m">
+                                    <node concept="2OqwBi" id="4jcOV4hNvF1" role="2Oq$k0">
+                                      <node concept="1eOMI4" id="4jcOV4hNvF2" role="2Oq$k0">
+                                        <node concept="10QFUN" id="4jcOV4hNvF3" role="1eOMHV">
+                                          <node concept="A3Dl8" id="4jcOV4hNvF4" role="10QFUM">
+                                            <node concept="3uibUv" id="4jcOV4hNvF5" role="A3Ik2">
                                               <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                                             </node>
                                           </node>
-                                          <node concept="2OqwBi" id="73aHuggfnQ$" role="10QFUP">
-                                            <node concept="37vLTw" id="73aHuggfnQ_" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                          <node concept="2OqwBi" id="4jcOV4hNvF6" role="10QFUP">
+                                            <node concept="37vLTw" id="4jcOV4hNvF7" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="rule" />
                                             </node>
-                                            <node concept="liA8E" id="73aHuggfnQA" role="2OqNvi">
+                                            <node concept="liA8E" id="4jcOV4hNvF8" role="2OqNvi">
                                               <ref role="37wK5l" to="av0y:~Rule.headKept():java.lang.Iterable" resolve="headKept" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="3QWeyG" id="73aHuggfnQB" role="2OqNvi">
-                                        <node concept="10QFUN" id="73aHuggfnQC" role="576Qk">
-                                          <node concept="A3Dl8" id="73aHuggfnQD" role="10QFUM">
-                                            <node concept="3uibUv" id="73aHuggfnQE" role="A3Ik2">
+                                      <node concept="3QWeyG" id="4jcOV4hNvF9" role="2OqNvi">
+                                        <node concept="10QFUN" id="4jcOV4hNvFa" role="576Qk">
+                                          <node concept="A3Dl8" id="4jcOV4hNvFb" role="10QFUM">
+                                            <node concept="3uibUv" id="4jcOV4hNvFc" role="A3Ik2">
                                               <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                                             </node>
                                           </node>
-                                          <node concept="2OqwBi" id="73aHuggfnQF" role="10QFUP">
-                                            <node concept="37vLTw" id="73aHuggfnQG" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                          <node concept="2OqwBi" id="4jcOV4hNvFd" role="10QFUP">
+                                            <node concept="37vLTw" id="4jcOV4hNvFe" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="rule" />
                                             </node>
-                                            <node concept="liA8E" id="73aHuggfnQH" role="2OqNvi">
+                                            <node concept="liA8E" id="4jcOV4hNvFf" role="2OqNvi">
                                               <ref role="37wK5l" to="av0y:~Rule.headReplaced():java.lang.Iterable" resolve="headReplaced" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="ANE8D" id="73aHuggfnQI" role="2OqNvi" />
+                                    <node concept="ANE8D" id="4jcOV4hNvFg" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3cpWs8" id="73aHuggffxB" role="3cqZAp">
-                                <node concept="3cpWsn" id="73aHuggffxC" role="3cpWs9">
+                              <node concept="3cpWs8" id="4jcOV4hNvFh" role="3cqZAp">
+                                <node concept="3cpWsn" id="4jcOV4hNvFi" role="3cpWs9">
                                   <property role="TrG5h" value="onStart" />
-                                  <node concept="10P_77" id="73aHuggffxD" role="1tU5fm" />
-                                  <node concept="1Wc70l" id="73aHuggfGGU" role="33vP2m">
-                                    <node concept="2OqwBi" id="73aHuggfSgP" role="3uHU7w">
-                                      <node concept="2OqwBi" id="73aHuggfKlh" role="2Oq$k0">
-                                        <node concept="1y4W85" id="73aHuggfJFf" role="2Oq$k0">
-                                          <node concept="3cmrfG" id="73aHuggfK6G" role="1y58nS">
+                                  <node concept="10P_77" id="4jcOV4hNvFj" role="1tU5fm" />
+                                  <node concept="1Wc70l" id="4jcOV4hNvFk" role="33vP2m">
+                                    <node concept="2OqwBi" id="4jcOV4hNvFl" role="3uHU7w">
+                                      <node concept="2OqwBi" id="4jcOV4hNvFm" role="2Oq$k0">
+                                        <node concept="1y4W85" id="4jcOV4hNvFn" role="2Oq$k0">
+                                          <node concept="3cmrfG" id="4jcOV4hNvFo" role="1y58nS">
                                             <property role="3cmrfH" value="0" />
                                           </node>
-                                          <node concept="37vLTw" id="73aHuggfHnv" role="1y566C">
-                                            <ref role="3cqZAo" node="73aHuggfnQt" resolve="head" />
+                                          <node concept="37vLTw" id="4jcOV4hNvFp" role="1y566C">
+                                            <ref role="3cqZAo" node="4jcOV4hNvEX" resolve="head" />
                                           </node>
                                         </node>
-                                        <node concept="liA8E" id="73aHuggfRGW" role="2OqNvi">
+                                        <node concept="liA8E" id="4jcOV4hNvFq" role="2OqNvi">
                                           <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                                         </node>
                                       </node>
-                                      <node concept="liA8E" id="73aHuggg04e" role="2OqNvi">
+                                      <node concept="liA8E" id="4jcOV4hNvFr" role="2OqNvi">
                                         <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
-                                        <node concept="37vLTw" id="73aHuggg0w7" role="37wK5m">
+                                        <node concept="37vLTw" id="4jcOV4hNvFs" role="37wK5m">
                                           <ref role="3cqZAo" node="73aHuggfcRr" resolve="mainSymbol" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="3clFbC" id="73aHuggfFmL" role="3uHU7B">
-                                      <node concept="2OqwBi" id="73aHuggfpo6" role="3uHU7B">
-                                        <node concept="37vLTw" id="73aHuggfnQJ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="73aHuggfnQt" resolve="head" />
+                                    <node concept="3clFbC" id="4jcOV4hNvFt" role="3uHU7B">
+                                      <node concept="2OqwBi" id="4jcOV4hNvFu" role="3uHU7B">
+                                        <node concept="37vLTw" id="4jcOV4hNvFv" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="4jcOV4hNvEX" resolve="head" />
                                         </node>
-                                        <node concept="34oBXx" id="73aHuggfyis" role="2OqNvi" />
+                                        <node concept="34oBXx" id="4jcOV4hNvFw" role="2OqNvi" />
                                       </node>
-                                      <node concept="3cmrfG" id="73aHuggfFnH" role="3uHU7w">
+                                      <node concept="3cmrfG" id="4jcOV4hNvFx" role="3uHU7w">
                                         <property role="3cmrfH" value="1" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="73aHuggdrpW" role="3cqZAp" />
-                              <node concept="3clFbJ" id="70Wv0dJhS7z" role="3cqZAp">
-                                <node concept="3clFbS" id="70Wv0dJhS7_" role="3clFbx">
-                                  <node concept="3SKdUt" id="73aHuggdRWW" role="3cqZAp">
-                                    <node concept="3SKdUq" id="73aHuggdRWY" role="3SKWNk">
+                              <node concept="3clFbH" id="4jcOV4hNvFy" role="3cqZAp" />
+                              <node concept="3clFbJ" id="4jcOV4hNvFz" role="3cqZAp">
+                                <node concept="3clFbS" id="4jcOV4hNvF$" role="3clFbx">
+                                  <node concept="3SKdUt" id="4jcOV4hNvF_" role="3cqZAp">
+                                    <node concept="3SKdUq" id="4jcOV4hNvFA" role="3SKWNk">
                                       <property role="3SKdUp" value="stop the error from being propagated, enable recover" />
                                     </node>
                                   </node>
-                                  <node concept="3clFbF" id="8odmgCoHuJ" role="3cqZAp">
-                                    <node concept="2OqwBi" id="8odmgCoHQh" role="3clFbG">
-                                      <node concept="2YIFZM" id="8odmgCoHx_" role="2Oq$k0">
+                                  <node concept="3clFbF" id="4jcOV4hNvFB" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4jcOV4hNvFC" role="3clFbG">
+                                      <node concept="2YIFZM" id="4jcOV4hNvFD" role="2Oq$k0">
                                         <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
                                         <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                                        <node concept="2OqwBi" id="8odmgCoHDZ" role="37wK5m">
-                                          <node concept="2YIFZM" id="8odmgCoH$4" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="4jcOV4hNvFE" role="37wK5m">
+                                          <node concept="2YIFZM" id="4jcOV4hNvFF" role="2Oq$k0">
                                             <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                                             <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
                                           </node>
-                                          <node concept="liA8E" id="8odmgCoHKm" role="2OqNvi">
+                                          <node concept="liA8E" id="4jcOV4hNvFG" role="2OqNvi">
                                             <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="liA8E" id="8odmgCoHXm" role="2OqNvi">
+                                      <node concept="liA8E" id="4jcOV4hNvFH" role="2OqNvi">
                                         <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
-                                        <node concept="Rm8GO" id="8odmgCoL3K" role="37wK5m">
-                                          <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-                                          <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                                        <node concept="1rXfSq" id="4jcOV4hNTUb" role="37wK5m">
+                                          <ref role="37wK5l" node="4jcOV4hNHoE" resolve="severityToStatus" />
+                                          <node concept="2OqwBi" id="4jcOV4hNV3t" role="37wK5m">
+                                            <node concept="37vLTw" id="4jcOV4hNUv5" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
+                                            </node>
+                                            <node concept="liA8E" id="4jcOV4hNVBn" role="2OqNvi">
+                                              <ref role="37wK5l" to="w7la:~EvaluationFeedback.getSeverity():jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback$Severity" resolve="getSeverity" />
+                                            </node>
+                                          </node>
                                         </node>
-                                        <node concept="2OqwBi" id="8odmgCp7$l" role="37wK5m">
-                                          <node concept="1eOMI4" id="8odmgCp7$m" role="2Oq$k0">
-                                            <node concept="10QFUN" id="8odmgCp7$n" role="1eOMHV">
-                                              <node concept="3uibUv" id="8odmgCp7$o" role="10QFUM">
+                                        <node concept="2OqwBi" id="4jcOV4hNvFJ" role="37wK5m">
+                                          <node concept="1eOMI4" id="4jcOV4hNvFK" role="2Oq$k0">
+                                            <node concept="10QFUN" id="4jcOV4hNvFL" role="1eOMHV">
+                                              <node concept="3uibUv" id="4jcOV4hNvFM" role="10QFUM">
                                                 <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
                                               </node>
-                                              <node concept="37vLTw" id="8odmgCp7$p" role="10QFUP">
-                                                <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                              <node concept="37vLTw" id="4jcOV4hNvFN" role="10QFUP">
+                                                <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="rule" />
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="liA8E" id="8odmgCp7$q" role="2OqNvi">
+                                          <node concept="liA8E" id="4jcOV4hNvFO" role="2OqNvi">
                                             <ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="originRef" />
                                           </node>
                                         </node>
-                                        <node concept="2OqwBi" id="8odmgCoMt9" role="37wK5m">
-                                          <node concept="37vLTw" id="8odmgCoMjU" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="8odmgCo4Ll" resolve="failure" />
+                                        <node concept="2OqwBi" id="4jcOV4hNvFP" role="37wK5m">
+                                          <node concept="37vLTw" id="4jcOV4hNGq$" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
                                           </node>
-                                          <node concept="liA8E" id="8odmgCoMDE" role="2OqNvi">
-                                            <ref role="37wK5l" to="w7la:~EvaluationFailure.getMessage():java.lang.String" resolve="getMessage" />
+                                          <node concept="liA8E" id="4jcOV4hNvFR" role="2OqNvi">
+                                            <ref role="37wK5l" to="w7la:~EvaluationFeedback.getMessage():java.lang.String" resolve="getMessage" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3cpWs6" id="8odmgCoMG0" role="3cqZAp">
-                                    <node concept="10Nm6u" id="8odmgCoMHh" role="3cqZAk" />
+                                  <node concept="3clFbH" id="4jcOV4hN_30" role="3cqZAp" />
+                                  <node concept="3cpWs6" id="4jcOV4hNvFS" role="3cqZAp">
+                                    <node concept="3clFbT" id="4jcOV4hND48" role="3cqZAk">
+                                      <property role="3clFbU" value="true" />
+                                    </node>
                                   </node>
-                                  <node concept="3clFbH" id="70Wv0dJhS7$" role="3cqZAp" />
                                 </node>
-                                <node concept="22lmx$" id="73aHuggd6Tn" role="3clFbw">
-                                  <node concept="37vLTw" id="73aHuggg2dm" role="3uHU7w">
-                                    <ref role="3cqZAo" node="73aHuggffxC" resolve="onStart" />
+                                <node concept="22lmx$" id="4jcOV4hNvFV" role="3clFbw">
+                                  <node concept="37vLTw" id="4jcOV4hNvFW" role="3uHU7w">
+                                    <ref role="3cqZAo" node="4jcOV4hNvFi" resolve="onStart" />
                                   </node>
-                                  <node concept="37vLTw" id="73aHuggd5Sg" role="3uHU7B">
-                                    <ref role="3cqZAo" node="73aHuggd5S4" resolve="principal" />
+                                  <node concept="37vLTw" id="4jcOV4hNvFX" role="3uHU7B">
+                                    <ref role="3cqZAo" node="4jcOV4hNvEJ" resolve="principal" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="1Wc70l" id="8odmgCp724" role="3clFbw">
-                              <node concept="1Wc70l" id="6EY0p2wrMor" role="3uHU7B">
-                                <node concept="2ZW3vV" id="8odmgCoLj4" role="3uHU7w">
-                                  <node concept="3uibUv" id="8odmgCoLjk" role="2ZW6by">
+                            <node concept="1Wc70l" id="4jcOV4hNvFY" role="3clFbw">
+                              <node concept="1Wc70l" id="4jcOV4hNvFZ" role="3uHU7B">
+                                <node concept="2ZW3vV" id="4jcOV4hNvG0" role="3uHU7w">
+                                  <node concept="3uibUv" id="4jcOV4hNvG1" role="2ZW6by">
                                     <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
                                   </node>
-                                  <node concept="37vLTw" id="8odmgCoL5g" role="2ZW6bz">
-                                    <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                  <node concept="37vLTw" id="4jcOV4hNvG2" role="2ZW6bz">
+                                    <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="rule" />
                                   </node>
                                 </node>
-                                <node concept="3y3z36" id="6EY0p2wrMwU" role="3uHU7B">
-                                  <node concept="10Nm6u" id="6EY0p2wrMxU" role="3uHU7w" />
-                                  <node concept="2OqwBi" id="6EY0p2wrMoA" role="3uHU7B">
-                                    <node concept="37vLTw" id="6EY0p2wrMoB" role="2Oq$k0">
+                                <node concept="3y3z36" id="4jcOV4hNvG3" role="3uHU7B">
+                                  <node concept="10Nm6u" id="4jcOV4hNvG4" role="3uHU7w" />
+                                  <node concept="2OqwBi" id="4jcOV4hNvG5" role="3uHU7B">
+                                    <node concept="37vLTw" id="4jcOV4hNvG6" role="2Oq$k0">
                                       <ref role="3cqZAo" node="70Wv0dJjilw" resolve="originIdxRef" />
                                     </node>
-                                    <node concept="liA8E" id="6EY0p2wrMoC" role="2OqNvi">
+                                    <node concept="liA8E" id="4jcOV4hNvG7" role="2OqNvi">
                                       <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3y3z36" id="8odmgCp7zc" role="3uHU7w">
-                                <node concept="10Nm6u" id="8odmgCp7$i" role="3uHU7w" />
-                                <node concept="2OqwBi" id="8odmgCp72f" role="3uHU7B">
-                                  <node concept="1eOMI4" id="8odmgCp72g" role="2Oq$k0">
-                                    <node concept="10QFUN" id="8odmgCp72h" role="1eOMHV">
-                                      <node concept="3uibUv" id="8odmgCp72i" role="10QFUM">
+                              <node concept="3y3z36" id="4jcOV4hNvG8" role="3uHU7w">
+                                <node concept="10Nm6u" id="4jcOV4hNvG9" role="3uHU7w" />
+                                <node concept="2OqwBi" id="4jcOV4hNvGa" role="3uHU7B">
+                                  <node concept="1eOMI4" id="4jcOV4hNvGb" role="2Oq$k0">
+                                    <node concept="10QFUN" id="4jcOV4hNvGc" role="1eOMHV">
+                                      <node concept="3uibUv" id="4jcOV4hNvGd" role="10QFUM">
                                         <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
                                       </node>
-                                      <node concept="37vLTw" id="8odmgCp72j" role="10QFUP">
-                                        <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                      <node concept="37vLTw" id="4jcOV4hNvGe" role="10QFUP">
+                                        <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="rule" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="liA8E" id="8odmgCp72k" role="2OqNvi">
+                                  <node concept="liA8E" id="4jcOV4hNvGf" role="2OqNvi">
                                     <ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="originRef" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFbH" id="8odmgCoMHM" role="3cqZAp" />
-                          <node concept="3cpWs6" id="8odmgCoMJg" role="3cqZAp">
-                            <node concept="37vLTw" id="8odmgCoMKE" role="3cqZAk">
-                              <ref role="3cqZAo" node="8odmgCo4Ll" resolve="failure" />
-                            </node>
+                          <node concept="3clFbH" id="4jcOV4hNDC1" role="3cqZAp" />
+                          <node concept="3cpWs6" id="4jcOV4hNzSP" role="3cqZAp">
+                            <node concept="3clFbT" id="4jcOV4hNzT_" role="3cqZAk" />
                           </node>
+                          <node concept="3clFbH" id="4jcOV4hNEN1" role="3cqZAp" />
                         </node>
                       </node>
                     </node>
@@ -1124,7 +1136,7 @@
                 </node>
               </node>
             </node>
-            <node concept="37vLTw" id="8odmgCo0jJ" role="37vLTJ">
+            <node concept="37vLTw" id="4jcOV4hNqRt" role="37vLTJ">
               <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
             </node>
           </node>
@@ -1715,6 +1727,104 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3GlpCDSEXkp" role="jymVt" />
+    <node concept="3clFb_" id="4jcOV4hNHoE" role="jymVt">
+      <property role="TrG5h" value="severityToStatus" />
+      <node concept="37vLTG" id="4jcOV4hNJED" role="3clF46">
+        <property role="TrG5h" value="severity" />
+        <node concept="3uibUv" id="4jcOV4hNK36" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="4jcOV4hNKRb" role="3clF45">
+        <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+      </node>
+      <node concept="3Tm1VV" id="4jcOV4hNHoH" role="1B3o_S" />
+      <node concept="3clFbS" id="4jcOV4hNHoI" role="3clF47">
+        <node concept="3KaCP$" id="4jcOV4hNLf_" role="3cqZAp">
+          <node concept="3KbdKl" id="4jcOV4hNLiB" role="3KbHQx">
+            <node concept="Rm8GO" id="4jcOV4hNLvI" role="3Kbmr1">
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.DEBUG" resolve="DEBUG" />
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+            </node>
+            <node concept="3clFbS" id="4jcOV4hNLiD" role="3Kbo56">
+              <node concept="3SKdUt" id="4jcOV4hNNXe" role="3cqZAp">
+                <node concept="3SKdUq" id="4jcOV4hNNXf" role="3SKWNk">
+                  <property role="3SKdUp" value="fall through" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3KbdKl" id="4jcOV4hNMM$" role="3KbHQx">
+            <node concept="Rm8GO" id="4jcOV4hNNcq" role="3Kbmr1">
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.INFO" resolve="INFO" />
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+            </node>
+            <node concept="3clFbS" id="4jcOV4hNMMA" role="3Kbo56">
+              <node concept="3cpWs6" id="4jcOV4hNMMB" role="3cqZAp">
+                <node concept="Rm8GO" id="4jcOV4hNMMC" role="3cqZAk">
+                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
+                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3KbdKl" id="4jcOV4hNLyA" role="3KbHQx">
+            <node concept="Rm8GO" id="4jcOV4hNOlF" role="3Kbmr1">
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.WARN" resolve="WARN" />
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+            </node>
+            <node concept="3clFbS" id="4jcOV4hNLyC" role="3Kbo56">
+              <node concept="3cpWs6" id="4jcOV4hNOoR" role="3cqZAp">
+                <node concept="Rm8GO" id="4jcOV4hNPaf" role="3cqZAk">
+                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.WARNING" resolve="WARNING" />
+                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3KbdKl" id="4jcOV4hNPyw" role="3KbHQx">
+            <node concept="Rm8GO" id="4jcOV4hNPWk" role="3Kbmr1">
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.ERROR" resolve="ERROR" />
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+            </node>
+            <node concept="3clFbS" id="4jcOV4hNPyy" role="3Kbo56">
+              <node concept="3SKdUt" id="4jcOV4hNS7j" role="3cqZAp">
+                <node concept="3SKdUq" id="4jcOV4hNS7k" role="3SKWNk">
+                  <property role="3SKdUp" value="fall through" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3KbdKl" id="4jcOV4hNQIk" role="3KbHQx">
+            <node concept="Rm8GO" id="4jcOV4hNRcL" role="3Kbmr1">
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.FATAL" resolve="FATAL" />
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+            </node>
+            <node concept="3clFbS" id="4jcOV4hNQIm" role="3Kbo56">
+              <node concept="3cpWs6" id="4jcOV4hNQIn" role="3cqZAp">
+                <node concept="Rm8GO" id="4jcOV4hNQIo" role="3cqZAk">
+                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="4jcOV4hNLgj" role="3KbGdf">
+            <ref role="3cqZAo" node="4jcOV4hNJED" resolve="severity" />
+          </node>
+          <node concept="3clFbS" id="4jcOV4hNSzT" role="3Kb1Dw">
+            <node concept="YS8fn" id="4jcOV4hNT1w" role="3cqZAp">
+              <node concept="2ShNRf" id="4jcOV4hNT2d" role="YScLw">
+                <node concept="1pGfFk" id="4jcOV4hNTnL" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4jcOV4hNGQi" role="jymVt" />
     <node concept="3Tm1VV" id="41ox5Vnk76b" role="1B3o_S" />
     <node concept="312cEg" id="2UGjFq4Lesf" role="jymVt">
       <property role="TrG5h" value="sessionSolver" />
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 3f41b4a6..217eef88 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
@@ -717,6 +717,12 @@
           <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
         </node>
       </node>
+      <node concept="37vLTG" id="4jcOV4hkQup" role="3clF46">
+        <property role="TrG5h" value="invocationContext" />
+        <node concept="3uibUv" id="4jcOV4hkSdQ" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
+        </node>
+      </node>
       <node concept="3clFbS" id="60zk4o6Suor" role="3clF47">
         <node concept="3cpWs8" id="60zk4o6SxJ0" role="3cqZAp">
           <node concept="3cpWsn" id="60zk4o6SxJ1" role="3cpWs9">
@@ -844,6 +850,9 @@
                         <node concept="37vLTw" id="5WBVN_M1GEB" role="37wK5m">
                           <ref role="3cqZAo" node="60zk4o6Suop" resolve="logicalContext" />
                         </node>
+                        <node concept="37vLTw" id="4jcOV4hkYUG" role="37wK5m">
+                          <ref role="3cqZAo" node="4jcOV4hkQup" resolve="invocationContext" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -868,6 +877,9 @@
                             <node concept="37vLTw" id="6yUEjXvTvSG" role="37wK5m">
                               <ref role="3cqZAo" node="60zk4o6Suop" resolve="logicalContext" />
                             </node>
+                            <node concept="37vLTw" id="4jcOV4hlseO" role="37wK5m">
+                              <ref role="3cqZAo" node="4jcOV4hkQup" resolve="invocationContext" />
+                            </node>
                             <node concept="2OqwBi" id="5WBVN_M1KyJ" role="37wK5m">
                               <node concept="37vLTw" id="5WBVN_M1K7z" role="2Oq$k0">
                                 <ref role="3cqZAo" node="5WBVN_M1GEu" resolve="expArgs" />
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
index c54d22fa..6bd9de18 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
@@ -8,6 +8,8 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
@@ -213,6 +215,15 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
+      <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
+        <child id="1163670592366" name="defaultBlock" index="3Kb1Dw" />
+        <child id="1163670766145" name="expression" index="3KbGdf" />
+        <child id="1163670772911" name="case" index="3KbHQx" />
+      </concept>
+      <concept id="1163670641947" name="jetbrains.mps.baseLanguage.structure.SwitchCase" flags="ng" index="3KbdKl">
+        <child id="1163670677455" name="expression" index="3Kbmr1" />
+        <child id="1163670683720" name="body" index="3Kbo56" />
+      </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
@@ -234,6 +245,9 @@
     <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
+    <language id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7">
+      <concept id="400642802549924137" name="jetbrains.mps.baseLanguage.jdk7.structure.StringSwitchStatement" flags="nn" index="2ignYC" />
+    </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
@@ -8218,5 +8232,711 @@
       <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
     </node>
   </node>
+  <node concept="312cEu" id="4jcOV4hx9Du">
+    <property role="TrG5h" value="ProvideFeedbackPredicate" />
+    <node concept="2tJIrI" id="4jcOV4hx9Dv" role="jymVt" />
+    <node concept="3clFbW" id="4jcOV4hx9Dw" role="jymVt">
+      <node concept="37vLTG" id="4jcOV4hx9Dx" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="3uibUv" id="4jcOV4hx9Dy" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4jcOV4hxwdM" role="3clF46">
+        <property role="TrG5h" value="severity" />
+        <node concept="3uibUv" id="4jcOV4hxwlu" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4jcOV4hx9Dz" role="3clF45" />
+      <node concept="3Tm1VV" id="4jcOV4hx9D$" role="1B3o_S" />
+      <node concept="3clFbS" id="4jcOV4hx9D_" role="3clF47">
+        <node concept="XkiVB" id="4jcOV4hx9DA" role="3cqZAp">
+          <ref role="37wK5l" node="6Kcfpq7B1f7" resolve="AbstractPredicate" />
+          <node concept="37vLTw" id="4jcOV4hx9DB" role="37wK5m">
+            <ref role="3cqZAo" node="4jcOV4hx9Dx" resolve="message" />
+          </node>
+          <node concept="37vLTw" id="4jcOV4hxwVj" role="37wK5m">
+            <ref role="3cqZAo" node="4jcOV4hxwdM" resolve="severity" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4jcOV4hx9DC" role="jymVt" />
+    <node concept="3clFb_" id="4jcOV4hx9DD" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="symbol" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="4jcOV4hx9DE" role="1B3o_S" />
+      <node concept="3uibUv" id="4jcOV4hx9DF" role="3clF45">
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
+      </node>
+      <node concept="3clFbS" id="4jcOV4hx9DG" role="3clF47">
+        <node concept="3clFbF" id="4jcOV4hx9DH" role="3cqZAp">
+          <node concept="37vLTw" id="4jcOV4hx9DI" role="3clFbG">
+            <ref role="3cqZAo" node="4jcOV4hx9DP" resolve="FEEDBACK_SYM" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4jcOV4hx9DJ" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4jcOV4hx9DK" role="jymVt" />
+    <node concept="Wx3nA" id="4jcOV4hx9DL" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="FEEDBACK" />
+      <node concept="3Tm1VV" id="4jcOV4hx9DM" role="1B3o_S" />
+      <node concept="17QB3L" id="4jcOV4hx9DN" role="1tU5fm" />
+      <node concept="Xl_RD" id="4jcOV4hx9DO" role="33vP2m">
+        <property role="Xl_RC" value="feedback" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="4jcOV4hx9DP" role="jymVt">
+      <property role="TrG5h" value="FEEDBACK_SYM" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3uibUv" id="4jcOV4hx9DQ" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
+      </node>
+      <node concept="3Tm1VV" id="4jcOV4hx9DR" role="1B3o_S" />
+      <node concept="2ShNRf" id="4jcOV4hx9DS" role="33vP2m">
+        <node concept="YeOm9" id="4jcOV4hx9DT" role="2ShVmc">
+          <node concept="1Y3b0j" id="4jcOV4hx9DU" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="1Y3XeK" node="7lt0LtQvaw_" resolve="PredicateSymbolExt" />
+            <ref role="37wK5l" node="7lt0LtQva_c" resolve="PredicateSymbolExt" />
+            <node concept="37vLTw" id="4jcOV4hx9DV" role="37wK5m">
+              <ref role="3cqZAo" node="4jcOV4hx9DL" resolve="FEEDBACK" />
+            </node>
+            <node concept="3cmrfG" id="4jcOV4hx9DW" role="37wK5m">
+              <property role="3cmrfH" value="2" />
+            </node>
+            <node concept="3Tm1VV" id="4jcOV4hx9DX" role="1B3o_S" />
+            <node concept="3clFb_" id="4jcOV4hx9DY" role="jymVt">
+              <property role="TrG5h" value="solver" />
+              <property role="1EzhhJ" value="false" />
+              <node concept="3uibUv" id="4jcOV4hx9DZ" role="3clF45">
+                <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
+              </node>
+              <node concept="3Tm1VV" id="4jcOV4hx9E0" role="1B3o_S" />
+              <node concept="3clFbS" id="4jcOV4hx9E1" role="3clF47">
+                <node concept="3clFbF" id="4jcOV4hx9E2" role="3cqZAp">
+                  <node concept="2ShNRf" id="4jcOV4hx9E3" role="3clFbG">
+                    <node concept="HV5vD" id="4jcOV4hx9E4" role="2ShVmc">
+                      <ref role="HV5vE" node="4jcOV4hx9Ej" resolve="ProvideFeedbackPredicate.EvalExpressionSolver" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFb_" id="4jcOV4hx9E5" role="jymVt">
+              <property role="TrG5h" value="predicate" />
+              <property role="1EzhhJ" value="false" />
+              <node concept="37vLTG" id="4jcOV4hx9E6" role="3clF46">
+                <property role="TrG5h" value="args" />
+                <node concept="8X2XB" id="4jcOV4hx9E7" role="1tU5fm">
+                  <node concept="3uibUv" id="4jcOV4hx9E8" role="8Xvag">
+                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3uibUv" id="4jcOV4hx9E9" role="3clF45">
+                <ref role="3uigEE" node="6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+              </node>
+              <node concept="3Tm1VV" id="4jcOV4hx9Ea" role="1B3o_S" />
+              <node concept="3clFbS" id="4jcOV4hx9Eb" role="3clF47">
+                <node concept="3clFbF" id="4jcOV4hx9Ec" role="3cqZAp">
+                  <node concept="2ShNRf" id="4jcOV4hx9Ed" role="3clFbG">
+                    <node concept="1pGfFk" id="4jcOV4hx9Ee" role="2ShVmc">
+                      <ref role="37wK5l" node="4jcOV4hx9Dw" resolve="ProvideFeedbackPredicate" />
+                      <node concept="AH0OO" id="4jcOV4hxxao" role="37wK5m">
+                        <node concept="3cmrfG" id="4jcOV4hxxfg" role="AHEQo">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="37vLTw" id="4jcOV4hxx4W" role="AHHXb">
+                          <ref role="3cqZAo" node="4jcOV4hx9E6" resolve="args" />
+                        </node>
+                      </node>
+                      <node concept="AH0OO" id="4jcOV4hx9Ef" role="37wK5m">
+                        <node concept="3cmrfG" id="4jcOV4hx9Eg" role="AHEQo">
+                          <property role="3cmrfH" value="1" />
+                        </node>
+                        <node concept="37vLTw" id="4jcOV4hx9Eh" role="AHHXb">
+                          <ref role="3cqZAo" node="4jcOV4hx9E6" resolve="args" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4jcOV4hx9Ei" role="jymVt" />
+    <node concept="312cEu" id="4jcOV4hx9Ej" role="jymVt">
+      <property role="TrG5h" value="EvalExpressionSolver" />
+      <node concept="2tJIrI" id="4jcOV4hx9Ek" role="jymVt" />
+      <node concept="3clFb_" id="4jcOV4hx9El" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="ask" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tm1VV" id="4jcOV4hx9Em" role="1B3o_S" />
+        <node concept="10P_77" id="4jcOV4hx9En" role="3clF45" />
+        <node concept="37vLTG" id="4jcOV4hx9Eo" role="3clF46">
+          <property role="TrG5h" value="invocation" />
+          <node concept="3uibUv" id="4jcOV4hx9Ep" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4jcOV4hx9Eq" role="3clF47">
+          <node concept="YS8fn" id="4jcOV4hxlhz" role="3cqZAp">
+            <node concept="2ShNRf" id="4jcOV4hxlh$" role="YScLw">
+              <node concept="1pGfFk" id="4jcOV4hxlh_" role="2ShVmc">
+                <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
+                <node concept="3cpWs3" id="4jcOV4hxmQP" role="37wK5m">
+                  <node concept="Xl_RD" id="4jcOV4hxmoD" role="3uHU7B">
+                    <property role="Xl_RC" value="ask not applicable to " />
+                  </node>
+                  <node concept="2OqwBi" id="4jcOV4hxp3V" role="3uHU7w">
+                    <node concept="2OqwBi" id="4jcOV4hxnNA" role="2Oq$k0">
+                      <node concept="37vLTw" id="4jcOV4hxnrS" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4jcOV4hx9Eo" resolve="invocation" />
+                      </node>
+                      <node concept="liA8E" id="4jcOV4hxo3E" role="2OqNvi">
+                        <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="4jcOV4hxpET" role="2OqNvi">
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4jcOV4hx9F7" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4jcOV4hx9F8" role="jymVt" />
+      <node concept="3clFb_" id="4jcOV4hx9F9" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="tell" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tm1VV" id="4jcOV4hx9Fa" role="1B3o_S" />
+        <node concept="3cqZAl" id="4jcOV4hx9Fb" role="3clF45" />
+        <node concept="37vLTG" id="4jcOV4hx9Fc" role="3clF46">
+          <property role="TrG5h" value="invocation" />
+          <node concept="3uibUv" id="4jcOV4hx9Fd" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4jcOV4hx9Fe" role="3clF47">
+          <node concept="3clFbJ" id="4jcOV4hx9Er" role="3cqZAp">
+            <node concept="3clFbS" id="4jcOV4hx9Es" role="3clFbx">
+              <node concept="YS8fn" id="4jcOV4hx9Et" role="3cqZAp">
+                <node concept="2ShNRf" id="4jcOV4hx9Eu" role="YScLw">
+                  <node concept="1pGfFk" id="4jcOV4hx9Ev" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3fqX7Q" id="4jcOV4hx9Ew" role="3clFbw">
+              <node concept="1eOMI4" id="4jcOV4hx9Ex" role="3fr31v">
+                <node concept="2ZW3vV" id="4jcOV4hx9Ey" role="1eOMHV">
+                  <node concept="3uibUv" id="4jcOV4hx9Ez" role="2ZW6by">
+                    <ref role="3uigEE" node="4jcOV4hx9Du" resolve="ProvideFeedbackPredicate" />
+                  </node>
+                  <node concept="2OqwBi" id="4jcOV4hx9E$" role="2ZW6bz">
+                    <node concept="37vLTw" id="4jcOV4hx9E_" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4jcOV4hx9Fc" resolve="invocation" />
+                    </node>
+                    <node concept="liA8E" id="4jcOV4hx9EA" role="2OqNvi">
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="4jcOV4hx_1$" role="3cqZAp">
+            <node concept="3cpWsn" id="4jcOV4hx_1_" role="3cpWs9">
+              <property role="TrG5h" value="msg" />
+              <node concept="3uibUv" id="4jcOV4hx_OJ" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+              </node>
+              <node concept="2YIFZM" id="4jcOV4hxADP" role="33vP2m">
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(char[]):java.lang.String" resolve="valueOf" />
+                <node concept="2OqwBi" id="4jcOV4hx_1A" role="37wK5m">
+                  <node concept="2OqwBi" id="4jcOV4hx_1B" role="2Oq$k0">
+                    <node concept="37vLTw" id="4jcOV4hx_1C" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4jcOV4hx9Fc" resolve="invocation" />
+                    </node>
+                    <node concept="liA8E" id="4jcOV4hx_1D" role="2OqNvi">
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="4jcOV4hx_1E" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                    <node concept="3cmrfG" id="4jcOV4hx_1F" role="37wK5m">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="4jcOV4hxMne" role="3cqZAp">
+            <node concept="3cpWsn" id="4jcOV4hxMnf" role="3cpWs9">
+              <property role="TrG5h" value="severity" />
+              <node concept="3uibUv" id="4jcOV4hxMn1" role="1tU5fm">
+                <ref role="3uigEE" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+              </node>
+              <node concept="1rXfSq" id="4jcOV4hxMng" role="33vP2m">
+                <ref role="37wK5l" node="4jcOV4hxCVB" resolve="severityFromString" />
+                <node concept="2YIFZM" id="4jcOV4hxMnh" role="37wK5m">
+                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(char[]):java.lang.String" resolve="valueOf" />
+                  <node concept="2OqwBi" id="4jcOV4hxMni" role="37wK5m">
+                    <node concept="2OqwBi" id="4jcOV4hxMnj" role="2Oq$k0">
+                      <node concept="37vLTw" id="4jcOV4hxMnk" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4jcOV4hx9Fc" resolve="invocation" />
+                      </node>
+                      <node concept="liA8E" id="4jcOV4hxMnl" role="2OqNvi">
+                        <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="4jcOV4hxMnm" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                      <node concept="3cmrfG" id="4jcOV4hxMnn" role="37wK5m">
+                        <property role="3cmrfH" value="1" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4jcOV4hxxyi" role="3cqZAp">
+            <node concept="2OqwBi" id="4jcOV4hxxRr" role="3clFbG">
+              <node concept="2OqwBi" id="4jcOV4hxxGB" role="2Oq$k0">
+                <node concept="37vLTw" id="4jcOV4hxxyg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4jcOV4hx9Fc" resolve="invocation" />
+                </node>
+                <node concept="liA8E" id="4jcOV4hxxNP" role="2OqNvi">
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.invocationContext():jetbrains.mps.logic.reactor.evaluation.InvocationContext" resolve="invocationContext" />
+                </node>
+              </node>
+              <node concept="liA8E" id="4jcOV4hxy0C" role="2OqNvi">
+                <ref role="37wK5l" to="w7la:~InvocationContext.report(jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback):void" resolve="report" />
+                <node concept="2ShNRf" id="4jcOV4hxy6V" role="37wK5m">
+                  <node concept="1pGfFk" id="4jcOV4hxypF" role="2ShVmc">
+                    <ref role="37wK5l" to="w7la:~DetailedFeedback.&lt;init&gt;(java.lang.String,jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback$Severity)" resolve="DetailedFeedback" />
+                    <node concept="37vLTw" id="4jcOV4hxNNG" role="37wK5m">
+                      <ref role="3cqZAo" node="4jcOV4hx_1_" resolve="msg" />
+                    </node>
+                    <node concept="37vLTw" id="4jcOV4hxO4P" role="37wK5m">
+                      <ref role="3cqZAo" node="4jcOV4hxMnf" resolve="severity" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3SKdUt" id="4jcOV4hx9EB" role="3cqZAp">
+            <node concept="3SKdUq" id="4jcOV4hx9EC" role="3SKWNk">
+              <property role="3SKdUp" value="the expression has been evaluated while instantiating arguments" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4jcOV4hx9Fu" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4jcOV4hxC_q" role="jymVt" />
+      <node concept="3clFb_" id="4jcOV4hxCVB" role="jymVt">
+        <property role="TrG5h" value="severityFromString" />
+        <node concept="37vLTG" id="4jcOV4hxEtx" role="3clF46">
+          <property role="TrG5h" value="severity" />
+          <node concept="17QB3L" id="4jcOV4hxEH9" role="1tU5fm" />
+        </node>
+        <node concept="3uibUv" id="4jcOV4hxDwE" role="3clF45">
+          <ref role="3uigEE" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+        </node>
+        <node concept="3Tm6S6" id="4jcOV4hxDi9" role="1B3o_S" />
+        <node concept="3clFbS" id="4jcOV4hxCVF" role="3clF47">
+          <node concept="2ignYC" id="4jcOV4hxEMI" role="3cqZAp">
+            <node concept="3KbdKl" id="4jcOV4hxEO0" role="3KbHQx">
+              <node concept="3clFbS" id="4jcOV4hxEO2" role="3Kbo56">
+                <node concept="3cpWs6" id="4jcOV4hxEUA" role="3cqZAp">
+                  <node concept="Rm8GO" id="4jcOV4hxFic" role="3cqZAk">
+                    <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.DEBUG" resolve="DEBUG" />
+                    <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+                  </node>
+                </node>
+              </node>
+              <node concept="Xl_RD" id="4jcOV4hxETq" role="3Kbmr1">
+                <property role="Xl_RC" value="DEBUG" />
+              </node>
+            </node>
+            <node concept="3KbdKl" id="4jcOV4hxFMA" role="3KbHQx">
+              <node concept="3clFbS" id="4jcOV4hxFMB" role="3Kbo56">
+                <node concept="3cpWs6" id="4jcOV4hxFMC" role="3cqZAp">
+                  <node concept="Rm8GO" id="4jcOV4hxFYF" role="3cqZAk">
+                    <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.INFO" resolve="INFO" />
+                    <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+                  </node>
+                </node>
+              </node>
+              <node concept="Xl_RD" id="4jcOV4hxFME" role="3Kbmr1">
+                <property role="Xl_RC" value="INFO" />
+              </node>
+            </node>
+            <node concept="3KbdKl" id="4jcOV4hxG9A" role="3KbHQx">
+              <node concept="3clFbS" id="4jcOV4hxG9B" role="3Kbo56">
+                <node concept="3cpWs6" id="4jcOV4hxG9C" role="3cqZAp">
+                  <node concept="Rm8GO" id="4jcOV4hxGm4" role="3cqZAk">
+                    <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.WARN" resolve="WARN" />
+                    <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+                  </node>
+                </node>
+              </node>
+              <node concept="Xl_RD" id="4jcOV4hxG9E" role="3Kbmr1">
+                <property role="Xl_RC" value="WARN" />
+              </node>
+            </node>
+            <node concept="3KbdKl" id="4jcOV4hxGx8" role="3KbHQx">
+              <node concept="3clFbS" id="4jcOV4hxGx9" role="3Kbo56">
+                <node concept="3cpWs6" id="4jcOV4hxGxa" role="3cqZAp">
+                  <node concept="Rm8GO" id="4jcOV4hxGHZ" role="3cqZAk">
+                    <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.ERROR" resolve="ERROR" />
+                    <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+                  </node>
+                </node>
+              </node>
+              <node concept="Xl_RD" id="4jcOV4hxGxc" role="3Kbmr1">
+                <property role="Xl_RC" value="ERROR" />
+              </node>
+            </node>
+            <node concept="3KbdKl" id="4jcOV4hxGTc" role="3KbHQx">
+              <node concept="3clFbS" id="4jcOV4hxGTd" role="3Kbo56">
+                <node concept="3cpWs6" id="4jcOV4hxGTe" role="3cqZAp">
+                  <node concept="Rm8GO" id="4jcOV4hxH6s" role="3cqZAk">
+                    <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.FATAL" resolve="FATAL" />
+                    <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+                  </node>
+                </node>
+              </node>
+              <node concept="Xl_RD" id="4jcOV4hxGTg" role="3Kbmr1">
+                <property role="Xl_RC" value="FATAL" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4jcOV4hxENt" role="3KbGdf">
+              <ref role="3cqZAo" node="4jcOV4hxEtx" resolve="severity" />
+            </node>
+            <node concept="3clFbS" id="4jcOV4hxHhM" role="3Kb1Dw">
+              <node concept="YS8fn" id="4jcOV4hxHu3" role="3cqZAp">
+                <node concept="2ShNRf" id="4jcOV4hxHuY" role="YScLw">
+                  <node concept="1pGfFk" id="4jcOV4hxHIA" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4jcOV4hx9Fv" role="jymVt" />
+      <node concept="3Tm1VV" id="4jcOV4hx9Fw" role="1B3o_S" />
+      <node concept="3uibUv" id="4jcOV4hx9Fx" role="EKbjA">
+        <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4jcOV4hx9Fy" role="jymVt" />
+    <node concept="3Tm1VV" id="4jcOV4hx9Fz" role="1B3o_S" />
+    <node concept="3uibUv" id="4jcOV4hx9F$" role="1zkMxy">
+      <ref role="3uigEE" node="6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+    </node>
+  </node>
+  <node concept="312cEu" id="4jcOV4hENDg">
+    <property role="TrG5h" value="FailPredicate" />
+    <node concept="2tJIrI" id="4jcOV4hENDh" role="jymVt" />
+    <node concept="3clFbW" id="4jcOV4hENDi" role="jymVt">
+      <node concept="37vLTG" id="4jcOV4hENDj" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="3uibUv" id="4jcOV4hENDk" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4jcOV4hENDn" role="3clF45" />
+      <node concept="3Tm1VV" id="4jcOV4hENDo" role="1B3o_S" />
+      <node concept="3clFbS" id="4jcOV4hENDp" role="3clF47">
+        <node concept="XkiVB" id="4jcOV4hENDq" role="3cqZAp">
+          <ref role="37wK5l" node="6Kcfpq7B1f7" resolve="AbstractPredicate" />
+          <node concept="37vLTw" id="4jcOV4hENDr" role="37wK5m">
+            <ref role="3cqZAo" node="4jcOV4hENDj" resolve="message" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4jcOV4hENDt" role="jymVt" />
+    <node concept="3clFb_" id="4jcOV4hENDu" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="symbol" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="4jcOV4hENDv" role="1B3o_S" />
+      <node concept="3uibUv" id="4jcOV4hENDw" role="3clF45">
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
+      </node>
+      <node concept="3clFbS" id="4jcOV4hENDx" role="3clF47">
+        <node concept="3clFbF" id="4jcOV4hENDy" role="3cqZAp">
+          <node concept="37vLTw" id="4jcOV4hENDz" role="3clFbG">
+            <ref role="3cqZAo" node="4jcOV4hENDE" resolve="FAIL_SYM" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4jcOV4hEND$" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4jcOV4hEND_" role="jymVt" />
+    <node concept="Wx3nA" id="4jcOV4hENDA" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="FAIL" />
+      <node concept="3Tm1VV" id="4jcOV4hENDB" role="1B3o_S" />
+      <node concept="17QB3L" id="4jcOV4hENDC" role="1tU5fm" />
+      <node concept="Xl_RD" id="4jcOV4hENDD" role="33vP2m">
+        <property role="Xl_RC" value="fail" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="4jcOV4hENDE" role="jymVt">
+      <property role="TrG5h" value="FAIL_SYM" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3uibUv" id="4jcOV4hENDF" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
+      </node>
+      <node concept="3Tm1VV" id="4jcOV4hENDG" role="1B3o_S" />
+      <node concept="2ShNRf" id="4jcOV4hENDH" role="33vP2m">
+        <node concept="YeOm9" id="4jcOV4hENDI" role="2ShVmc">
+          <node concept="1Y3b0j" id="4jcOV4hENDJ" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="1Y3XeK" node="7lt0LtQvaw_" resolve="PredicateSymbolExt" />
+            <ref role="37wK5l" node="7lt0LtQva_c" resolve="PredicateSymbolExt" />
+            <node concept="37vLTw" id="4jcOV4hENDK" role="37wK5m">
+              <ref role="3cqZAo" node="4jcOV4hENDA" resolve="FAIL" />
+            </node>
+            <node concept="3cmrfG" id="4jcOV4hENDL" role="37wK5m">
+              <property role="3cmrfH" value="1" />
+            </node>
+            <node concept="3Tm1VV" id="4jcOV4hENDM" role="1B3o_S" />
+            <node concept="3clFb_" id="4jcOV4hENDN" role="jymVt">
+              <property role="TrG5h" value="solver" />
+              <property role="1EzhhJ" value="false" />
+              <node concept="3uibUv" id="4jcOV4hENDO" role="3clF45">
+                <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
+              </node>
+              <node concept="3Tm1VV" id="4jcOV4hENDP" role="1B3o_S" />
+              <node concept="3clFbS" id="4jcOV4hENDQ" role="3clF47">
+                <node concept="3clFbF" id="4jcOV4hENDR" role="3cqZAp">
+                  <node concept="2ShNRf" id="4jcOV4hENDS" role="3clFbG">
+                    <node concept="HV5vD" id="4jcOV4hENDT" role="2ShVmc">
+                      <ref role="HV5vE" node="4jcOV4hENEb" resolve="FailPredicate.EvalExpressionSolver" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFb_" id="4jcOV4hENDU" role="jymVt">
+              <property role="TrG5h" value="predicate" />
+              <property role="1EzhhJ" value="false" />
+              <node concept="37vLTG" id="4jcOV4hENDV" role="3clF46">
+                <property role="TrG5h" value="args" />
+                <node concept="8X2XB" id="4jcOV4hENDW" role="1tU5fm">
+                  <node concept="3uibUv" id="4jcOV4hENDX" role="8Xvag">
+                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3uibUv" id="4jcOV4hENDY" role="3clF45">
+                <ref role="3uigEE" node="6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+              </node>
+              <node concept="3Tm1VV" id="4jcOV4hENDZ" role="1B3o_S" />
+              <node concept="3clFbS" id="4jcOV4hENE0" role="3clF47">
+                <node concept="3clFbF" id="4jcOV4hENE1" role="3cqZAp">
+                  <node concept="2ShNRf" id="4jcOV4hENE2" role="3clFbG">
+                    <node concept="1pGfFk" id="4jcOV4hENE3" role="2ShVmc">
+                      <ref role="37wK5l" node="4jcOV4hENDi" resolve="FailPredicate" />
+                      <node concept="AH0OO" id="4jcOV4hENE4" role="37wK5m">
+                        <node concept="3cmrfG" id="4jcOV4hENE5" role="AHEQo">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="37vLTw" id="4jcOV4hENE6" role="AHHXb">
+                          <ref role="3cqZAo" node="4jcOV4hENDV" resolve="args" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4jcOV4hENEa" role="jymVt" />
+    <node concept="312cEu" id="4jcOV4hENEb" role="jymVt">
+      <property role="TrG5h" value="EvalExpressionSolver" />
+      <node concept="2tJIrI" id="4jcOV4hENEc" role="jymVt" />
+      <node concept="3clFb_" id="4jcOV4hENEd" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="ask" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tm1VV" id="4jcOV4hENEe" role="1B3o_S" />
+        <node concept="10P_77" id="4jcOV4hENEf" role="3clF45" />
+        <node concept="37vLTG" id="4jcOV4hENEg" role="3clF46">
+          <property role="TrG5h" value="invocation" />
+          <node concept="3uibUv" id="4jcOV4hENEh" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4jcOV4hENEi" role="3clF47">
+          <node concept="YS8fn" id="4jcOV4hENEj" role="3cqZAp">
+            <node concept="2ShNRf" id="4jcOV4hENEk" role="YScLw">
+              <node concept="1pGfFk" id="4jcOV4hENEl" role="2ShVmc">
+                <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
+                <node concept="3cpWs3" id="4jcOV4hENEm" role="37wK5m">
+                  <node concept="Xl_RD" id="4jcOV4hENEn" role="3uHU7B">
+                    <property role="Xl_RC" value="ask not applicable to " />
+                  </node>
+                  <node concept="2OqwBi" id="4jcOV4hENEo" role="3uHU7w">
+                    <node concept="2OqwBi" id="4jcOV4hENEp" role="2Oq$k0">
+                      <node concept="37vLTw" id="4jcOV4hENEq" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4jcOV4hENEg" resolve="invocation" />
+                      </node>
+                      <node concept="liA8E" id="4jcOV4hENEr" role="2OqNvi">
+                        <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="4jcOV4hENEs" role="2OqNvi">
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4jcOV4hENEt" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4jcOV4hENEu" role="jymVt" />
+      <node concept="3clFb_" id="4jcOV4hENEv" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="tell" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tm1VV" id="4jcOV4hENEw" role="1B3o_S" />
+        <node concept="3cqZAl" id="4jcOV4hENEx" role="3clF45" />
+        <node concept="37vLTG" id="4jcOV4hENEy" role="3clF46">
+          <property role="TrG5h" value="invocation" />
+          <node concept="3uibUv" id="4jcOV4hENEz" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4jcOV4hENE$" role="3clF47">
+          <node concept="3clFbJ" id="4jcOV4hENE_" role="3cqZAp">
+            <node concept="3clFbS" id="4jcOV4hENEA" role="3clFbx">
+              <node concept="YS8fn" id="4jcOV4hENEB" role="3cqZAp">
+                <node concept="2ShNRf" id="4jcOV4hENEC" role="YScLw">
+                  <node concept="1pGfFk" id="4jcOV4hENED" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3fqX7Q" id="4jcOV4hENEE" role="3clFbw">
+              <node concept="1eOMI4" id="4jcOV4hENEF" role="3fr31v">
+                <node concept="2ZW3vV" id="4jcOV4hENEG" role="1eOMHV">
+                  <node concept="3uibUv" id="4jcOV4hENEH" role="2ZW6by">
+                    <ref role="3uigEE" node="4jcOV4hENDg" resolve="FailPredicate" />
+                  </node>
+                  <node concept="2OqwBi" id="4jcOV4hENEI" role="2ZW6bz">
+                    <node concept="37vLTw" id="4jcOV4hENEJ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4jcOV4hENEy" resolve="invocation" />
+                    </node>
+                    <node concept="liA8E" id="4jcOV4hENEK" role="2OqNvi">
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="4jcOV4hENEL" role="3cqZAp">
+            <node concept="3cpWsn" id="4jcOV4hENEM" role="3cpWs9">
+              <property role="TrG5h" value="msg" />
+              <node concept="3uibUv" id="4jcOV4hENEN" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+              </node>
+              <node concept="2YIFZM" id="4jcOV4hENEO" role="33vP2m">
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(char[]):java.lang.String" resolve="valueOf" />
+                <node concept="2OqwBi" id="4jcOV4hENEP" role="37wK5m">
+                  <node concept="2OqwBi" id="4jcOV4hENEQ" role="2Oq$k0">
+                    <node concept="37vLTw" id="4jcOV4hENER" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4jcOV4hENEy" resolve="invocation" />
+                    </node>
+                    <node concept="liA8E" id="4jcOV4hENES" role="2OqNvi">
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="4jcOV4hENET" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                    <node concept="3cmrfG" id="4jcOV4hENEU" role="37wK5m">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="YS8fn" id="4jcOV4hEQ0$" role="3cqZAp">
+            <node concept="2ShNRf" id="4jcOV4hEQ1M" role="YScLw">
+              <node concept="1pGfFk" id="4jcOV4hEQh6" role="2ShVmc">
+                <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
+                <node concept="37vLTw" id="4jcOV4hEQh$" role="37wK5m">
+                  <ref role="3cqZAo" node="4jcOV4hENEM" resolve="msg" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4jcOV4hENFi" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4jcOV4hENFT" role="jymVt" />
+      <node concept="3Tm1VV" id="4jcOV4hENFU" role="1B3o_S" />
+      <node concept="3uibUv" id="4jcOV4hENFV" role="EKbjA">
+        <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4jcOV4hENFW" role="jymVt" />
+    <node concept="3Tm1VV" id="4jcOV4hENFX" role="1B3o_S" />
+    <node concept="3uibUv" id="4jcOV4hENFY" role="1zkMxy">
+      <ref role="3uigEE" node="6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 96fb5779..beb3b225 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -1393,55 +1393,36 @@
                                           <node concept="10Nm6u" id="5lxnBcTZ0U4" role="3uHU7w" />
                                         </node>
                                         <node concept="3clFbS" id="5lxnBcTZ0U5" role="3clFbx">
-                                          <node concept="3clFbJ" id="1FOQehx2gvv" role="3cqZAp">
-                                            <node concept="3clFbS" id="1FOQehx2gvx" role="3clFbx">
-                                              <node concept="3clFbF" id="5lxnBcTZ0U6" role="3cqZAp">
-                                                <node concept="2OqwBi" id="5lxnBcTZ0U7" role="3clFbG">
-                                                  <node concept="37vLTw" id="5lxnBcTZ0U8" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="5lxnBcTZ0T4" resolve="messageList" />
+                                          <node concept="3SKdUt" id="4jcOV4hTkxu" role="3cqZAp">
+                                            <node concept="3SKdUq" id="4jcOV4hTkxw" role="3SKWNk">
+                                              <property role="3SKdUp" value="FIXME superfluous conversion to/from HighlighterMessage" />
+                                            </node>
+                                          </node>
+                                          <node concept="3clFbF" id="5lxnBcTZ0U6" role="3cqZAp">
+                                            <node concept="2OqwBi" id="5lxnBcTZ0U7" role="3clFbG">
+                                              <node concept="37vLTw" id="5lxnBcTZ0U8" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="5lxnBcTZ0T4" resolve="messageList" />
+                                              </node>
+                                              <node concept="TSZUe" id="5lxnBcTZ0U9" role="2OqNvi">
+                                                <node concept="2OqwBi" id="5lxnBcTZ0Ua" role="25WWJ7">
+                                                  <node concept="37vLTw" id="5lxnBcTZ0Ub" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="52a_GfIDucr" resolve="messageDisplay" />
                                                   </node>
-                                                  <node concept="TSZUe" id="5lxnBcTZ0U9" role="2OqNvi">
-                                                    <node concept="2OqwBi" id="5lxnBcTZ0Ua" role="25WWJ7">
-                                                      <node concept="37vLTw" id="5lxnBcTZ0Ub" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="52a_GfIDucr" resolve="messageDisplay" />
-                                                      </node>
-                                                      <node concept="liA8E" id="5lxnBcTZ0Uc" role="2OqNvi">
-                                                        <ref role="37wK5l" node="4vBwiiVsgIX" resolve="errorMessage" />
-                                                        <node concept="37vLTw" id="5lxnBcTZ0Ud" role="37wK5m">
-                                                          <ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
-                                                        </node>
-                                                        <node concept="2OqwBi" id="1FOQehx2B9O" role="37wK5m">
-                                                          <node concept="37vLTw" id="1FOQehx2_bF" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
-                                                          </node>
-                                                          <node concept="liA8E" id="1FOQehx2Dl8" role="2OqNvi">
-                                                            <ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
-                                                          </node>
-                                                        </node>
-                                                      </node>
+                                                  <node concept="liA8E" id="5lxnBcTZ0Uc" role="2OqNvi">
+                                                    <ref role="37wK5l" node="4vBwiiVsgIX" resolve="reportMessage" />
+                                                    <node concept="37vLTw" id="5lxnBcTZ0Ud" role="37wK5m">
+                                                      <ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
+                                                    </node>
+                                                    <node concept="37vLTw" id="4jcOV4hT2sL" role="37wK5m">
+                                                      <ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="3clFbC" id="1FOQehx2mse" role="3clFbw">
-                                              <node concept="2OqwBi" id="1FOQehx2qlw" role="3uHU7w">
-                                                <node concept="37vLTw" id="1FOQehx2onP" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
-                                                </node>
-                                                <node concept="liA8E" id="1FOQehx2spE" role="2OqNvi">
-                                                  <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
-                                                </node>
-                                              </node>
-                                              <node concept="Rm8GO" id="1FOQehx2kl_" role="3uHU7B">
-                                                <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-                                                <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                                              </node>
-                                            </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="3clFbH" id="1FOQehx27FW" role="3cqZAp" />
                                     </node>
                                     <node concept="2ZW3vV" id="1FOQehx1$n8" role="3clFbw">
                                       <node concept="3uibUv" id="1FOQehx1Air" role="2ZW6by">
@@ -1452,7 +1433,6 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3clFbH" id="1FOQehx1s9E" role="3cqZAp" />
                                 </node>
                                 <node concept="3cpWsn" id="1FOQehx1cWL" role="1Duv9x">
                                   <property role="TrG5h" value="it" />
@@ -2351,14 +2331,16 @@
     </node>
     <node concept="2tJIrI" id="4vBwiiVsgIW" role="jymVt" />
     <node concept="3clFb_" id="4vBwiiVsgIX" role="jymVt">
-      <property role="TrG5h" value="errorMessage" />
+      <property role="TrG5h" value="reportMessage" />
       <node concept="37vLTG" id="4vBwiiVsgIY" role="3clF46">
         <property role="TrG5h" value="target" />
         <node concept="3Tqbb2" id="4vBwiiVsgIZ" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="4vBwiiVsgJ0" role="3clF46">
-        <property role="TrG5h" value="error" />
-        <node concept="17QB3L" id="4vBwiiVsgJ1" role="1tU5fm" />
+      <node concept="37vLTG" id="4jcOV4hSPAw" role="3clF46">
+        <property role="TrG5h" value="nri" />
+        <node concept="3uibUv" id="4jcOV4hSSJi" role="1tU5fm">
+          <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+        </node>
       </node>
       <node concept="3uibUv" id="4vBwiiVsgJ2" role="3clF45">
         <ref role="3uigEE" to="exr9:~EditorMessage" resolve="EditorMessage" />
@@ -2368,7 +2350,7 @@
         <node concept="3clFbF" id="4vBwiiVsgJ5" role="3cqZAp">
           <node concept="2ShNRf" id="4vBwiiVsgJ6" role="3clFbG">
             <node concept="1pGfFk" id="4vBwiiVsgJ7" role="2ShVmc">
-              <ref role="37wK5l" node="4vBwiiVsgKf" resolve="MessageDisplay.ErrorMessage" />
+              <ref role="37wK5l" node="4vBwiiVsgKf" resolve="MessageDisplay.ReportMessage" />
               <node concept="37vLTw" id="4vBwiiVsgJ8" role="37wK5m">
                 <ref role="3cqZAo" node="4vBwiiVsgIY" resolve="target" />
               </node>
@@ -2383,12 +2365,25 @@
                   <node concept="2YIFZM" id="6Yb9hAqy3Re" role="3uHU7w">
                     <ref role="37wK5l" node="4vBwiiVrVPy" resolve="escapeHtml" />
                     <ref role="1Pybhc" node="4vBwiiVrUlG" resolve="HtmlUtil" />
-                    <node concept="37vLTw" id="4vBwiiVsgJe" role="37wK5m">
-                      <ref role="3cqZAo" node="4vBwiiVsgJ0" resolve="error" />
+                    <node concept="2OqwBi" id="4jcOV4hSXxE" role="37wK5m">
+                      <node concept="37vLTw" id="4jcOV4hSWW3" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4jcOV4hSPAw" resolve="nri" />
+                      </node>
+                      <node concept="liA8E" id="4jcOV4hSY3I" role="2OqNvi">
+                        <ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="2OqwBi" id="4jcOV4hSZ1e" role="37wK5m">
+                <node concept="37vLTw" id="4jcOV4hSYvu" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4jcOV4hSPAw" resolve="nri" />
+                </node>
+                <node concept="liA8E" id="4jcOV4hT01Z" role="2OqNvi">
+                  <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -2522,10 +2517,14 @@
           <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
         </node>
         <node concept="3clFbS" id="4vBwiiVsgJR" role="3clF47">
-          <node concept="3clFbF" id="4vBwiiVsgJS" role="3cqZAp">
-            <node concept="10M0yZ" id="4vBwiiVsgJT" role="3clFbG">
-              <ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
-              <ref role="3cqZAo" to="z60i:~Color.GREEN" resolve="GREEN" />
+          <node concept="3clFbF" id="4jcOV4hRGik" role="3cqZAp">
+            <node concept="2YIFZM" id="4jcOV4hRGu8" role="3clFbG">
+              <ref role="37wK5l" to="exr9:~HighlighterMessage.getMessageColor(jetbrains.mps.errors.MessageStatus):java.awt.Color" resolve="getMessageColor" />
+              <ref role="1Pybhc" to="exr9:~HighlighterMessage" resolve="HighlighterMessage" />
+              <node concept="Rm8GO" id="4jcOV4hRHcD" role="37wK5m">
+                <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
+                <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+              </node>
             </node>
           </node>
         </node>
@@ -2541,7 +2540,7 @@
     <node concept="2tJIrI" id="4vBwiiVsgJX" role="jymVt" />
     <node concept="312cEu" id="4vBwiiVsgJY" role="jymVt">
       <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="ErrorReportItem" />
+      <property role="TrG5h" value="MessageReportItem" />
       <node concept="3clFbW" id="4vBwiiVsgJZ" role="jymVt">
         <node concept="37vLTG" id="4vBwiiVsgK0" role="3clF46">
           <property role="TrG5h" value="nodeRef" />
@@ -2553,14 +2552,19 @@
           <property role="TrG5h" value="msg" />
           <node concept="17QB3L" id="4vBwiiVsgK3" role="1tU5fm" />
         </node>
+        <node concept="37vLTG" id="4jcOV4hRHDN" role="3clF46">
+          <property role="TrG5h" value="status" />
+          <node concept="3uibUv" id="4jcOV4hRI9D" role="1tU5fm">
+            <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+          </node>
+        </node>
         <node concept="3cqZAl" id="4vBwiiVsgK4" role="3clF45" />
         <node concept="3Tm6S6" id="4vBwiiVsgK5" role="1B3o_S" />
         <node concept="3clFbS" id="4vBwiiVsgK6" role="3clF47">
           <node concept="XkiVB" id="4vBwiiVsgK7" role="3cqZAp">
             <ref role="37wK5l" to="d6hs:~NodeReportItemBase.&lt;init&gt;(jetbrains.mps.errors.MessageStatus,org.jetbrains.mps.openapi.model.SNodeReference,java.lang.String)" resolve="NodeReportItemBase" />
-            <node concept="Rm8GO" id="4vBwiiVsgK8" role="37wK5m">
-              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-              <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+            <node concept="37vLTw" id="4jcOV4hRK8x" role="37wK5m">
+              <ref role="3cqZAo" node="4jcOV4hRHDN" resolve="status" />
             </node>
             <node concept="37vLTw" id="4vBwiiVsgK9" role="37wK5m">
               <ref role="3cqZAo" node="4vBwiiVsgK0" resolve="nodeRef" />
@@ -2569,6 +2573,19 @@
               <ref role="3cqZAo" node="4vBwiiVsgK2" resolve="msg" />
             </node>
           </node>
+          <node concept="3clFbF" id="4jcOV4hRIn_" role="3cqZAp">
+            <node concept="37vLTI" id="4jcOV4hRInB" role="3clFbG">
+              <node concept="2OqwBi" id="4jcOV4hRJ6k" role="37vLTJ">
+                <node concept="Xjq3P" id="4jcOV4hRJlu" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4jcOV4hRPtJ" role="2OqNvi">
+                  <ref role="2Oxat5" node="4jcOV4hRInx" resolve="status" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="4jcOV4hRInF" role="37vLTx">
+                <ref role="3cqZAo" node="4jcOV4hRHDN" resolve="status" />
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3clFb_" id="2zPM3MPzmYk" role="jymVt">
@@ -2589,9 +2606,8 @@
               <node concept="liA8E" id="3nc912KraMH" role="2OqNvi">
                 <ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind(java.lang.String):jetbrains.mps.errors.item.IssueKindReportItem$ItemKind" resolve="deriveItemKind" />
                 <node concept="2OqwBi" id="3nc912KraMK" role="37wK5m">
-                  <node concept="Rm8GO" id="3nc912KraML" role="2Oq$k0">
-                    <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-                    <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                  <node concept="37vLTw" id="4jcOV4hRKSE" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4jcOV4hRInx" resolve="status" />
                   </node>
                   <node concept="liA8E" id="3nc912KraMM" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~Enum.toString():java.lang.String" resolve="toString" />
@@ -2609,11 +2625,18 @@
       <node concept="3uibUv" id="4vBwiiVsgKc" role="1zkMxy">
         <ref role="3uigEE" to="d6hs:~NodeReportItemBase" resolve="NodeReportItemBase" />
       </node>
+      <node concept="312cEg" id="4jcOV4hRInx" role="jymVt">
+        <property role="TrG5h" value="status" />
+        <node concept="3Tm6S6" id="4jcOV4hRIny" role="1B3o_S" />
+        <node concept="3uibUv" id="4jcOV4hRIn$" role="1tU5fm">
+          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="4vBwiiVsgKd" role="jymVt" />
     <node concept="312cEu" id="4vBwiiVsgKe" role="jymVt">
       <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="ErrorMessage" />
+      <property role="TrG5h" value="ReportMessage" />
       <node concept="3clFbW" id="4vBwiiVsgKf" role="jymVt">
         <node concept="37vLTG" id="4vBwiiVsgKg" role="3clF46">
           <property role="TrG5h" value="target" />
@@ -2623,6 +2646,12 @@
           <property role="TrG5h" value="msg" />
           <node concept="17QB3L" id="4vBwiiVsgKj" role="1tU5fm" />
         </node>
+        <node concept="37vLTG" id="4jcOV4hRQap" role="3clF46">
+          <property role="TrG5h" value="status" />
+          <node concept="3uibUv" id="4jcOV4hRQJR" role="1tU5fm">
+            <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+          </node>
+        </node>
         <node concept="3cqZAl" id="4vBwiiVsgKk" role="3clF45" />
         <node concept="3Tm1VV" id="4vBwiiVsgKl" role="1B3o_S" />
         <node concept="3clFbS" id="4vBwiiVsgKm" role="3clF47">
@@ -2633,7 +2662,7 @@
             </node>
             <node concept="2ShNRf" id="4vBwiiVsgKp" role="37wK5m">
               <node concept="1pGfFk" id="4vBwiiVsgKq" role="2ShVmc">
-                <ref role="37wK5l" node="4vBwiiVsgJZ" resolve="MessageDisplay.ErrorReportItem" />
+                <ref role="37wK5l" node="4vBwiiVsgJZ" resolve="MessageDisplay.MessageReportItem" />
                 <node concept="2OqwBi" id="4vBwiiVsgKr" role="37wK5m">
                   <node concept="2JrnkZ" id="4vBwiiVsgKs" role="2Oq$k0">
                     <node concept="37vLTw" id="4vBwiiVsgKt" role="2JrQYb">
@@ -2647,12 +2676,28 @@
                 <node concept="37vLTw" id="4vBwiiVsgKv" role="37wK5m">
                   <ref role="3cqZAo" node="4vBwiiVsgKi" resolve="msg" />
                 </node>
+                <node concept="37vLTw" id="4jcOV4hRRhi" role="37wK5m">
+                  <ref role="3cqZAo" node="4jcOV4hRQap" resolve="status" />
+                </node>
               </node>
             </node>
             <node concept="37vLTw" id="4vBwiiVsgKw" role="37wK5m">
               <ref role="3cqZAo" node="4vBwiiVsgKg" resolve="target" />
             </node>
           </node>
+          <node concept="3clFbF" id="4jcOV4hRWYv" role="3cqZAp">
+            <node concept="37vLTI" id="4jcOV4hS0j5" role="3clFbG">
+              <node concept="37vLTw" id="4jcOV4hS0CG" role="37vLTx">
+                <ref role="3cqZAo" node="4jcOV4hRQap" resolve="status" />
+              </node>
+              <node concept="2OqwBi" id="4jcOV4hRXkT" role="37vLTJ">
+                <node concept="Xjq3P" id="4jcOV4hRWYt" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4jcOV4hRXMN" role="2OqNvi">
+                  <ref role="2Oxat5" node="4jcOV4hRRlZ" resolve="status" />
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="4vBwiiVsgKx" role="jymVt" />
@@ -2670,10 +2715,13 @@
           <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
         </node>
         <node concept="3clFbS" id="4vBwiiVsgKB" role="3clF47">
-          <node concept="3clFbF" id="4vBwiiVsgKC" role="3cqZAp">
-            <node concept="10M0yZ" id="4vBwiiVsgKD" role="3clFbG">
-              <ref role="3cqZAo" to="z60i:~Color.RED" resolve="RED" />
-              <ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
+          <node concept="3clFbF" id="4jcOV4hS2cW" role="3cqZAp">
+            <node concept="2YIFZM" id="4jcOV4hS2oL" role="3clFbG">
+              <ref role="37wK5l" to="exr9:~HighlighterMessage.getMessageColor(jetbrains.mps.errors.MessageStatus):java.awt.Color" resolve="getMessageColor" />
+              <ref role="1Pybhc" to="exr9:~HighlighterMessage" resolve="HighlighterMessage" />
+              <node concept="37vLTw" id="4jcOV4hS36I" role="37wK5m">
+                <ref role="3cqZAo" node="4jcOV4hRRlZ" resolve="status" />
+              </node>
             </node>
           </node>
         </node>
@@ -2681,6 +2729,14 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
+      <node concept="2tJIrI" id="4jcOV4hS3em" role="jymVt" />
+      <node concept="312cEg" id="4jcOV4hRRlZ" role="jymVt">
+        <property role="TrG5h" value="status" />
+        <node concept="3Tm6S6" id="4jcOV4hRRm0" role="1B3o_S" />
+        <node concept="3uibUv" id="4jcOV4hRRm1" role="1tU5fm">
+          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="4vBwiiVsgKF" role="jymVt" />
     <node concept="312cEg" id="4vBwiiVsgKG" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index c68a5333..f05be64b 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -1804,6 +1804,12 @@
           <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
         </node>
       </node>
+      <node concept="37vLTG" id="4jcOV4hliBa" role="3clF46">
+        <property role="TrG5h" value="invocationContext" />
+        <node concept="3uibUv" id="4jcOV4hliCP" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
+        </node>
+      </node>
       <node concept="37vLTG" id="5WBVN_M1BNS" role="3clF46">
         <property role="TrG5h" value="args" />
         <node concept="8X2XB" id="5WBVN_M1BOF" role="1tU5fm">