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 cd12292c..82786ca3 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
@@ -559,6 +559,7 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
+      <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
@@ -1558,6 +1559,111 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="61G6TdBo60u" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="30G5F_" id="61G6TdBo7f8" role="30HLyM">
+        <node concept="3clFbS" id="61G6TdBo7f9" role="2VODD2">
+          <node concept="3clFbF" id="61G6TdBo7fw" role="3cqZAp">
+            <node concept="2OqwBi" id="61G6TdBo7QW" role="3clFbG">
+              <node concept="2OqwBi" id="61G6TdBo7tG" role="2Oq$k0">
+                <node concept="30H73N" id="61G6TdBo7fv" role="2Oq$k0" />
+                <node concept="3TrEf2" id="61G6TdBo7Fc" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="61G6TdBo7ZM" role="2OqNvi">
+                <node concept="chp4Y" id="61G6TdBo82k" role="cj9EA">
+                  <ref role="cht4Q" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Koe21" id="61G6TdBo87$" role="1lVwrX">
+        <node concept="3clFb_" id="61G6TdBo87_" role="1Koe22">
+          <property role="TrG5h" value="context" />
+          <node concept="37vLTG" id="61G6TdBo87A" role="3clF46">
+            <property role="TrG5h" value="session" />
+            <node concept="3uibUv" id="61G6TdBo87B" role="1tU5fm">
+              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            </node>
+          </node>
+          <node concept="3Tm6S6" id="61G6TdBo87C" role="1B3o_S" />
+          <node concept="3cqZAl" id="61G6TdBo87D" role="3clF45" />
+          <node concept="3clFbS" id="61G6TdBo87E" role="3clF47">
+            <node concept="3clFbH" id="61G6TdBo87F" role="3cqZAp" />
+            <node concept="3clFbF" id="61G6TdBo87G" role="3cqZAp">
+              <node concept="2OqwBi" id="61G6TdBo87H" role="3clFbG">
+                <node concept="liA8E" id="61G6TdBo87I" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:61G6TdBpSf1" resolve="provideFeedback" />
+                  <node concept="10Nm6u" id="61G6TdBusYk" role="37wK5m">
+                    <node concept="5jKBG" id="61G6TdBut2U" role="lGtFl">
+                      <ref role="v9R2y" node="61G6TdBuqi8" resolve="frag_ProvideFeedbackOperation" />
+                      <node concept="2OqwBi" id="61G6TdBuuQ5" role="v9R3O">
+                        <node concept="30H73N" id="61G6TdBuuDq" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="61G6TdBuv2v" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                        </node>
+                      </node>
+                      <node concept="3NFfHV" id="61G6TdBut7f" role="5jGum">
+                        <node concept="3clFbS" id="61G6TdBut7g" role="2VODD2">
+                          <node concept="3clFbF" id="61G6TdButdS" role="3cqZAp">
+                            <node concept="1PxgMI" id="61G6TdBuu7B" role="3clFbG">
+                              <property role="1BlNFB" value="true" />
+                              <node concept="chp4Y" id="61G6TdBuuct" role="3oSUPX">
+                                <ref role="cht4Q" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
+                              </node>
+                              <node concept="2OqwBi" id="61G6TdButox" role="1m5AlR">
+                                <node concept="30H73N" id="61G6TdButdR" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="61G6TdBut_p" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="61G6TdBo87R" role="2Oq$k0">
+                  <ref role="3cqZAo" node="61G6TdBo87A" resolve="session" />
+                  <node concept="1ZhdrF" id="61G6TdBo87S" role="lGtFl">
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                    <property role="2qtEX8" value="variableDeclaration" />
+                    <node concept="3$xsQk" id="61G6TdBo87T" role="3$ytzL">
+                      <node concept="3clFbS" id="61G6TdBo87U" role="2VODD2">
+                        <node concept="3clFbF" id="61G6TdBo87V" role="3cqZAp">
+                          <node concept="2OqwBi" id="61G6TdBo87W" role="3clFbG">
+                            <node concept="1iwH7S" id="61G6TdBo87X" role="2Oq$k0" />
+                            <node concept="1iwH70" id="61G6TdBo87Y" role="2OqNvi">
+                              <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
+                              <node concept="2OqwBi" id="61G6TdBo87Z" role="1iwH7V">
+                                <node concept="30H73N" id="61G6TdBo880" role="2Oq$k0" />
+                                <node concept="2Xjw5R" id="61G6TdBo881" role="2OqNvi">
+                                  <node concept="1xMEDy" id="61G6TdBo882" role="1xVPHs">
+                                    <node concept="chp4Y" id="61G6TdBo883" role="ri$Ld">
+                                      <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="61G6TdBo884" role="lGtFl" />
+            </node>
+            <node concept="3clFbH" id="61G6TdBo885" role="3cqZAp" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1puMqW" id="4vbeH84AAvf" role="1puA0r">
       <ref role="1puQsG" node="4vbeH84AvBw" resolve="init_tracking" />
     </node>
@@ -17892,5 +17998,125 @@
       <node concept="3Tm6S6" id="tbauFy5ak9" role="1B3o_S" />
     </node>
   </node>
+  <node concept="13MO4I" id="61G6TdBuqi8">
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="frag_ProvideFeedbackOperation" />
+    <ref role="3gUMe" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
+    <node concept="1N15co" id="61G6TdBuudP" role="1s_3oS">
+      <property role="TrG5h" value="target" />
+      <node concept="3Tqbb2" id="61G6TdBuuvl" role="1N15GL">
+        <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+      </node>
+    </node>
+    <node concept="9aQIb" id="61G6TdBu_qT" role="13RCb5">
+      <node concept="3clFbS" id="61G6TdBu_qU" role="9aQI4">
+        <node concept="3cpWs8" id="61G6TdBu_PJ" role="3cqZAp">
+          <node concept="3cpWsn" id="61G6TdBu_PM" role="3cpWs9">
+            <property role="TrG5h" value="target" />
+            <node concept="3Tqbb2" id="61G6TdBu_PH" role="1tU5fm" />
+            <node concept="10Nm6u" id="61G6TdBu_X_" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="61G6TdBu_r2" role="3cqZAp">
+          <node concept="2YIFZM" id="61G6TdBuqvc" role="3clFbG">
+            <ref role="1Pybhc" to="cxk7:61G6TdBsGY8" resolve="FeedbackUtil" />
+            <ref role="37wK5l" to="cxk7:61G6TdBsHeb" resolve="feedback" />
+            <node concept="raruj" id="61G6TdBuqvd" role="lGtFl" />
+            <node concept="Xl_RD" id="61G6TdBuwoZ" role="37wK5m">
+              <property role="Xl_RC" value="" />
+              <node concept="29HgVG" id="61G6TdBuwwJ" role="lGtFl">
+                <node concept="3NFfHV" id="61G6TdBuwyk" role="3NFExx">
+                  <node concept="3clFbS" id="61G6TdBuwyl" role="2VODD2">
+                    <node concept="3clFbF" id="61G6TdBuwyq" role="3cqZAp">
+                      <node concept="2OqwBi" id="61G6TdBuwSb" role="3clFbG">
+                        <node concept="30H73N" id="61G6TdBuwyp" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="61G6TdBuxfp" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:6mHZizzmtL_" resolve="message" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="Xl_RD" id="61G6TdBuqwx" role="37wK5m">
+              <property role="Xl_RC" value="" />
+              <node concept="17Uvod" id="61G6TdBurhq" role="lGtFl">
+                <property role="2qtEX9" value="value" />
+                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                <node concept="3zFVjK" id="61G6TdBurhr" role="3zH0cK">
+                  <node concept="3clFbS" id="61G6TdBurhs" role="2VODD2">
+                    <node concept="3clFbF" id="61G6TdBuriF" role="3cqZAp">
+                      <node concept="2OqwBi" id="61G6TdBurNE" role="3clFbG">
+                        <node concept="2OqwBi" id="61G6TdBurvH" role="2Oq$k0">
+                          <node concept="30H73N" id="61G6TdBuriE" role="2Oq$k0" />
+                          <node concept="3TrcHB" id="61G6TdBurEe" role="2OqNvi">
+                            <ref role="3TsBF5" to="wq2x:6mHZizzmtLB" resolve="severity" />
+                          </node>
+                        </node>
+                        <node concept="24Tkf9" id="61G6TdBus0Y" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2YIFZM" id="61G6TdBGLSr" role="37wK5m">
+              <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+              <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+              <node concept="Xl_RD" id="61G6TdBGLSs" role="37wK5m">
+                <property role="Xl_RC" value="" />
+                <node concept="17Uvod" id="61G6TdBGLSt" role="lGtFl">
+                  <property role="2qtEX9" value="value" />
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <node concept="3zFVjK" id="61G6TdBGLSu" role="3zH0cK">
+                    <node concept="3clFbS" id="61G6TdBGLSv" role="2VODD2">
+                      <node concept="3clFbF" id="61G6TdBGLSw" role="3cqZAp">
+                        <node concept="2OqwBi" id="61G6TdBGLSx" role="3clFbG">
+                          <node concept="2OqwBi" id="61G6TdBGLSy" role="2Oq$k0">
+                            <node concept="liA8E" id="61G6TdBGLSz" role="2OqNvi">
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                            </node>
+                            <node concept="2JrnkZ" id="61G6TdBGLS$" role="2Oq$k0">
+                              <node concept="2OqwBi" id="61G6TdBGLS_" role="2JrQYb">
+                                <node concept="1iwH7S" id="61G6TdBGLSA" role="2Oq$k0" />
+                                <node concept="12$id9" id="61G6TdBGLSB" role="2OqNvi">
+                                  <node concept="30H73N" id="61G6TdBGLSC" role="12$y8L" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="61G6TdBGLSD" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="61G6TdBuARQ" role="37wK5m">
+              <node concept="37vLTw" id="61G6TdBu_XR" role="2Oq$k0">
+                <ref role="3cqZAo" node="61G6TdBu_PM" resolve="target" />
+                <node concept="29HgVG" id="61G6TdBuBjA" role="lGtFl">
+                  <node concept="3NFfHV" id="61G6TdBuBmu" role="3NFExx">
+                    <node concept="3clFbS" id="61G6TdBuBmv" role="2VODD2">
+                      <node concept="3clFbF" id="61G6TdBuB_A" role="3cqZAp">
+                        <node concept="v3LJS" id="61G6TdBuB__" role="3clFbG">
+                          <ref role="v3LJV" node="61G6TdBuudP" resolve="target" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="iZEcu" id="61G6TdBuBcp" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 62ec0a0e..905b1bda 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -39,6 +39,7 @@
       </concept>
       <concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
       <concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
+        <property id="5864038008284099149" name="isStatic" index="2Ki8OM" />
         <property id="1225194472832" name="isVirtual" index="13i0it" />
         <property id="1225194472834" name="isAbstract" index="13i0iv" />
         <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
@@ -2472,5 +2473,25 @@
       <node concept="3clFbS" id="4boCUQu3iz2" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="2SN3Mm4RK47">
+    <ref role="13h7C2" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
+    <node concept="13hLZK" id="2SN3Mm4RK48" role="13h7CW">
+      <node concept="3clFbS" id="2SN3Mm4RK49" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="2SN3Mm4RK4y" role="13h7CS">
+      <property role="2Ki8OM" value="true" />
+      <property role="TrG5h" value="applicableToNode" />
+      <ref role="13i0hy" to="tpeu:1653mnvAgrs" resolve="applicableToNode" />
+      <node concept="3Tm1VV" id="2SN3Mm4RK4z" role="1B3o_S" />
+      <node concept="3clFbS" id="2SN3Mm4RK4C" role="3clF47">
+        <node concept="3clFbF" id="2SN3Mm4RKpZ" role="3cqZAp">
+          <node concept="3clFbT" id="2SN3Mm4RKpY" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="10P_77" id="2SN3Mm4RK4D" role="3clF45" />
+    </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 da89f638..c6d0a354 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -1212,6 +1212,26 @@
         </node>
       </node>
     </node>
+    <node concept="14StLt" id="2SN3Mm4UaX7" role="V601i">
+      <property role="TrG5h" value="AuxiliaryKeyword" />
+      <node concept="3Xmtl4" id="2SN3Mm4UaX8" role="3F10Kt">
+        <node concept="1wgc9g" id="2SN3Mm4UaX9" role="3XvnJa">
+          <ref role="1wgcnl" to="tpen:aeM1BF$Ozh" />
+        </node>
+      </node>
+      <node concept="VechU" id="2SN3Mm4UaXa" role="3F10Kt">
+        <node concept="mot77" id="2SN3Mm4UaXb" role="VblUZ">
+          <node concept="3clFbS" id="2SN3Mm4UaXc" role="2VODD2">
+            <node concept="3clFbF" id="2SN3Mm4UaXd" role="3cqZAp">
+              <node concept="10M0yZ" id="2SN3Mm4VRLz" role="3clFbG">
+                <ref role="3cqZAo" to="qgy9:7LZcKzBFlL2" resolve="FG_TEMPLATE_VARIABLE" />
+                <ref role="1PxDUh" to="qgy9:7ksQUDZtHks" resolve="CustomColors" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="14StLt" id="7LZcKzBE07j" role="V601i">
       <property role="TrG5h" value="EmitConstraint" />
       <node concept="30gYXW" id="7LZcKzBE08H" role="3F10Kt">
@@ -2877,8 +2897,8 @@
       <node concept="3EZMnI" id="4jcOV4hvop4" role="3EZMnx">
         <ref role="1k5W1q" to="qgy9:7ksQUDZuyMD" resolve="Backquote" />
         <node concept="3F0A7n" id="4jcOV4hu0nN" role="3EZMnx">
-          <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
           <ref role="1NtTu8" to="wq2x:3czCaDvmnOz" resolve="severity" />
+          <ref role="1k5W1q" node="2SN3Mm4UaX7" resolve="AuxiliaryKeyword" />
           <node concept="A1WHu" id="3pRhUEY_Wu1" role="3vIgyS">
             <ref role="A1WHt" node="3pRhUEY_We4" resolve="AddTarget" />
           </node>
@@ -2887,7 +2907,7 @@
           <node concept="VPM3Z" id="3pRhUEYzSbT" role="3F10Kt" />
           <node concept="3F0ifn" id="3pRhUEYzZ2T" role="3EZMnx">
             <property role="3F0ifm" value="on" />
-            <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
+            <ref role="1k5W1q" node="2SN3Mm4UaX7" resolve="AuxiliaryKeyword" />
           </node>
           <node concept="3F1sOY" id="1laj_RTdQ_7" role="3EZMnx">
             <property role="1$x2rV" value="&lt;no target&gt;" />
@@ -8188,5 +8208,117 @@
       <node concept="l2Vlx" id="4boCUQu22Px" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="6mHZizzmtWl">
+    <ref role="1XX52x" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
+    <node concept="3EZMnI" id="6mHZizzmtWn" role="2wV5jI">
+      <node concept="3EZMnI" id="6mHZizzmtWo" role="3EZMnx">
+        <ref role="1k5W1q" to="qgy9:7ksQUDZuyMD" resolve="Backquote" />
+        <node concept="3F0A7n" id="6mHZizzmtWp" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:6mHZizzmtLB" resolve="severity" />
+          <ref role="1k5W1q" node="2SN3Mm4UaX7" resolve="AuxiliaryKeyword" />
+        </node>
+        <node concept="3F1sOY" id="6mHZizzmtWE" role="3EZMnx">
+          <property role="1cu_pB" value="gtguBGO/firstEditableCell" />
+          <ref role="1NtTu8" to="wq2x:6mHZizzmtL_" resolve="message" />
+        </node>
+        <node concept="VPM3Z" id="6mHZizzmtWF" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3vyZuw" id="6mHZizzmtWG" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="l2Vlx" id="6mHZizzmtWI" role="2iSdaV" />
+      </node>
+      <node concept="l2Vlx" id="6mHZizzmtWJ" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="22mcaB" id="6mHZizzmu_I">
+    <ref role="aqKnT" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
+    <node concept="2F$Pav" id="6mHZizzmu_N" role="3ft7WO">
+      <node concept="3eGOop" id="6mHZizzmv7n" role="2$S_pN">
+        <node concept="ucgPf" id="6mHZizzmv7p" role="3aKz83">
+          <node concept="3clFbS" id="6mHZizzmv7r" role="2VODD2">
+            <node concept="3cpWs8" id="2SN3Mm4Sd9X" role="3cqZAp">
+              <node concept="3cpWsn" id="2SN3Mm4Sd9Y" role="3cpWs9">
+                <property role="TrG5h" value="pfe" />
+                <node concept="3Tqbb2" id="2SN3Mm4Sd9G" role="1tU5fm">
+                  <ref role="ehGHo" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
+                </node>
+                <node concept="2ShNRf" id="2SN3Mm4Sd9Z" role="33vP2m">
+                  <node concept="3zrR0B" id="2SN3Mm4Sda0" role="2ShVmc">
+                    <node concept="3Tqbb2" id="2SN3Mm4Sda1" role="3zrR0E">
+                      <ref role="ehGHo" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2SN3Mm4Sahg" role="3cqZAp">
+              <node concept="2OqwBi" id="2SN3Mm4SdKm" role="3clFbG">
+                <node concept="2OqwBi" id="2SN3Mm4SdjR" role="2Oq$k0">
+                  <node concept="37vLTw" id="2SN3Mm4Sda2" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2SN3Mm4Sd9Y" resolve="pfe" />
+                  </node>
+                  <node concept="3TrcHB" id="2SN3Mm4SdAV" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:6mHZizzmtLB" resolve="severity" />
+                  </node>
+                </node>
+                <node concept="tyxLq" id="2SN3Mm4SdSJ" role="2OqNvi">
+                  <node concept="2OqwBi" id="2SN3Mm4SeCM" role="tz02z">
+                    <node concept="1XH99k" id="2SN3Mm4Sedz" role="2Oq$k0">
+                      <ref role="1XH99l" to="wq2x:3czCaDvmnMw" resolve="FeedbackSeverity" />
+                    </node>
+                    <node concept="1X_LrI" id="2SN3Mm4SeVA" role="2OqNvi">
+                      <node concept="2ZBlsa" id="2SN3Mm4SeXW" role="3gWYIm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2SN3Mm4Se6b" role="3cqZAp">
+              <node concept="37vLTw" id="2SN3Mm4Se69" role="3clFbG">
+                <ref role="3cqZAo" node="2SN3Mm4Sd9Y" resolve="pfe" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="6mHZizzmuYp" role="2ZBHrp" />
+      <node concept="2$S_p_" id="6mHZizzmuYx" role="2$S_pT">
+        <node concept="3clFbS" id="6mHZizzmuYy" role="2VODD2">
+          <node concept="3clFbF" id="6mHZizzmv1v" role="3cqZAp">
+            <node concept="2OqwBi" id="6mHZizzmv1w" role="3clFbG">
+              <node concept="2OqwBi" id="6mHZizzmv1x" role="2Oq$k0">
+                <node concept="1XH99k" id="6mHZizzmv1y" role="2Oq$k0">
+                  <ref role="1XH99l" to="wq2x:3czCaDvmnMw" resolve="FeedbackSeverity" />
+                </node>
+                <node concept="2ViDtN" id="6mHZizzmv1z" role="2OqNvi" />
+              </node>
+              <node concept="3$u5V9" id="6mHZizzmv1$" role="2OqNvi">
+                <node concept="1bVj0M" id="6mHZizzmv1_" role="23t8la">
+                  <node concept="3clFbS" id="6mHZizzmv1A" role="1bW5cS">
+                    <node concept="3clFbF" id="6mHZizzmv1B" role="3cqZAp">
+                      <node concept="2OqwBi" id="6mHZizzmv1C" role="3clFbG">
+                        <node concept="1XCIdh" id="6mHZizzmv1D" role="2OqNvi" />
+                        <node concept="37vLTw" id="6mHZizzmv1E" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6mHZizzmv1F" resolve="it" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="6mHZizzmv1F" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="6mHZizzmv1G" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3VyMlK" id="6mHZizzmuYs" role="3ft7WO" />
+    <node concept="22hDWj" id="6mHZizzmu_J" role="22hAXT" />
+  </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 78083569..b268634e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1624,5 +1624,25 @@
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
   </node>
+  <node concept="1TIwiD" id="6mHZizzmqvc">
+    <property role="EcuMT" value="7326790520856487884" />
+    <property role="TrG5h" value="ProvideFeedbackOperation" />
+    <ref role="1TJDcQ" to="tp25:g$eCIIG" resolve="SNodeOperation" />
+    <node concept="1TJgyj" id="6mHZizzmtL_" role="1TKVEi">
+      <property role="IQ2ns" value="7326790520856501349" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="message" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="PrWs8" id="6mHZizzmtLz" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hqOqG0K" resolve="IOperation" />
+    </node>
+    <node concept="1TJgyi" id="6mHZizzmtLB" role="1TKVEl">
+      <property role="IQ2nx" value="7326790520856501351" />
+      <property role="TrG5h" value="severity" />
+      <ref role="AX2Wp" node="3czCaDvmnMw" resolve="FeedbackSeverity" />
+    </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 c34a01b2..d491df2c 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
@@ -87,10 +87,6 @@
       <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
         <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
       </concept>
-      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
-        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
-        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
-      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
@@ -270,15 +266,6 @@
         <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="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
@@ -3906,6 +3893,64 @@
           <node concept="37vLTw" id="7i3KM7g75eT" role="37wK5m">
             <ref role="3cqZAo" node="6OXbTDxtJVO" resolve="name" />
           </node>
+          <node concept="2ShNRf" id="61G6TdBoJWH" role="37wK5m">
+            <node concept="YeOm9" id="61G6TdBqILW" role="2ShVmc">
+              <node concept="1Y3b0j" id="61G6TdBqILZ" role="YeSDq">
+                <property role="2bfB8j" value="true" />
+                <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+                <node concept="3Tm1VV" id="61G6TdBqIM0" role="1B3o_S" />
+                <node concept="2OqwBi" id="61G6TdBoJWJ" role="37wK5m">
+                  <node concept="37vLTw" id="61G6TdBoJWK" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
+                  </node>
+                  <node concept="liA8E" id="61G6TdBoJWL" role="2OqNvi">
+                    <ref role="37wK5l" node="72RDgIN45VE" resolve="repository" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="61G6TdBoJWM" role="37wK5m">
+                  <node concept="37vLTw" id="61G6TdBoJWN" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
+                  </node>
+                  <node concept="liA8E" id="61G6TdBoJWO" role="2OqNvi">
+                    <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
+                  </node>
+                </node>
+                <node concept="3clFb_" id="61G6TdBqITu" role="jymVt">
+                  <property role="TrG5h" value="provideFeedback" />
+                  <node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
+                    <property role="TrG5h" value="feedback" />
+                    <node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
+                      <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                    </node>
+                  </node>
+                  <node concept="3cqZAl" id="61G6TdBqITD" role="3clF45" />
+                  <node concept="3Tm1VV" id="61G6TdBqITE" role="1B3o_S" />
+                  <node concept="3clFbS" id="61G6TdBqITI" role="3clF47">
+                    <node concept="3SKdUt" id="61G6TdBqJcK" role="3cqZAp">
+                      <node concept="1PaTwC" id="61G6TdBqJcL" role="1aUNEU">
+                        <node concept="3oM_SD" id="61G6TdBqJcM" role="1PaTwD">
+                          <property role="3oM_SC" value="FIXME" />
+                        </node>
+                        <node concept="3oM_SD" id="61G6TdBqJd7" role="1PaTwD">
+                          <property role="3oM_SC" value="process" />
+                        </node>
+                        <node concept="3oM_SD" id="61G6TdBqJdq" role="1PaTwD">
+                          <property role="3oM_SC" value="report" />
+                        </node>
+                        <node concept="3oM_SD" id="61G6TdBqJdu" role="1PaTwD">
+                          <property role="3oM_SC" value="items" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="61G6TdBqITJ" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="37vLTw" id="7i3KM7g75jt" role="37wK5m">
             <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
           </node>
@@ -3936,6 +3981,12 @@
         <property role="TrG5h" value="name" />
         <node concept="17QB3L" id="6OXbTDxtYhn" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="61G6TdBoGJ0" role="3clF46">
+        <property role="TrG5h" value="applicationSession" />
+        <node concept="3uibUv" id="61G6TdBpADG" role="1tU5fm">
+          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+      </node>
       <node concept="37vLTG" id="7WKNeR9biVB" role="3clF46">
         <property role="TrG5h" value="ruleProcessingSession" />
         <node concept="3uibUv" id="7WKNeR9biVC" role="1tU5fm">
@@ -3990,6 +4041,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="61G6TdBoK1b" role="3cqZAp">
+          <node concept="37vLTI" id="61G6TdBoK1d" role="3clFbG">
+            <node concept="2OqwBi" id="61G6TdBoLon" role="37vLTJ">
+              <node concept="Xjq3P" id="61G6TdBoLp2" role="2Oq$k0" />
+              <node concept="2OwXpG" id="61G6TdBoLoq" role="2OqNvi">
+                <ref role="2Oxat5" node="61G6TdBoK17" resolve="applicationSession" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="61G6TdBoK1h" role="37vLTx">
+              <ref role="3cqZAo" node="61G6TdBoGJ0" resolve="applicationSession" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3GlpCDSxTK6" role="jymVt" />
@@ -4282,36 +4346,6 @@
       </node>
       <node concept="3Tm6S6" id="7kTeLbPnEee" role="1B3o_S" />
       <node concept="3clFbS" id="7kTeLbPnDc4" role="3clF47">
-        <node concept="3cpWs8" id="cmlg9OJBWV" role="3cqZAp">
-          <node concept="3cpWsn" id="cmlg9OJBWW" role="3cpWs9">
-            <property role="TrG5h" value="macroProcessing" />
-            <node concept="3uibUv" id="cmlg9OJBSv" role="1tU5fm">
-              <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
-            </node>
-            <node concept="2ShNRf" id="cmlg9OJBWX" role="33vP2m">
-              <node concept="1pGfFk" id="cmlg9OJBWY" role="2ShVmc">
-                <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
-                <node concept="2OqwBi" id="cmlg9OJBWZ" role="37wK5m">
-                  <node concept="37vLTw" id="cmlg9OJBX0" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
-                  </node>
-                  <node concept="liA8E" id="cmlg9OJBX1" role="2OqNvi">
-                    <ref role="37wK5l" node="72RDgIN45VE" resolve="repository" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="cmlg9OJBX2" role="37wK5m">
-                  <node concept="37vLTw" id="cmlg9OJBX3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
-                  </node>
-                  <node concept="liA8E" id="cmlg9OJBX4" role="2OqNvi">
-                    <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="cmlg9OK5y3" role="3cqZAp" />
         <node concept="3SKdUt" id="cmlg9OD01S" role="3cqZAp">
           <node concept="1PaTwC" id="cmlg9OD01T" role="1aUNEU">
             <node concept="3oM_SD" id="cmlg9OD01V" role="1PaTwD">
@@ -4414,8 +4448,8 @@
                 <node concept="37vLTw" id="7i3KM7gkt4C" role="37wK5m">
                   <ref role="3cqZAo" node="7i3KM7gknF0" resolve="rulesListTable" />
                 </node>
-                <node concept="37vLTw" id="cmlg9OJCrD" role="37wK5m">
-                  <ref role="3cqZAo" node="cmlg9OJBWW" resolve="macroProcessing" />
+                <node concept="37vLTw" id="61G6TdBoPaE" role="37wK5m">
+                  <ref role="3cqZAo" node="61G6TdBoK17" resolve="applicationSession" />
                 </node>
                 <node concept="1rXfSq" id="cmlg9OJizZ" role="37wK5m">
                   <ref role="37wK5l" node="7WKNeR9c0Kn" resolve="ruleTemplates" />
@@ -4677,6 +4711,13 @@
       <node concept="3Tm6S6" id="3GlpCDSyB5g" role="1B3o_S" />
     </node>
     <node concept="3Tm1VV" id="3GlpCDSxTG8" role="1B3o_S" />
+    <node concept="312cEg" id="61G6TdBoK17" role="jymVt">
+      <property role="TrG5h" value="applicationSession" />
+      <node concept="3Tm6S6" id="61G6TdBoK18" role="1B3o_S" />
+      <node concept="3uibUv" id="61G6TdBpBFP" role="1tU5fm">
+        <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+      </node>
+    </node>
     <node concept="312cEg" id="7WKNeR9bpBf" role="jymVt">
       <property role="TrG5h" value="ruleProcessingSession" />
       <node concept="3Tm6S6" id="7WKNeR9bpBg" role="1B3o_S" />
@@ -5967,129 +6008,6 @@
   <node concept="312cEu" id="3o9wrC3s0ii">
     <property role="TrG5h" value="DefaultSupervisor" />
     <node concept="2tJIrI" id="RZQG984Rfh" role="jymVt" />
-    <node concept="2YIFZL" id="3o9wrC3WoA4" role="jymVt">
-      <property role="TrG5h" value="severityToStatus" />
-      <node concept="3clFbS" id="3o9wrC3WoA6" role="3clF47">
-        <node concept="3KaCP$" id="3o9wrC3WoA7" role="3cqZAp">
-          <node concept="3KbdKl" id="3o9wrC3WoA8" role="3KbHQx">
-            <node concept="Rm8GO" id="3o9wrC3WoA9" role="3Kbmr1">
-              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
-              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.DEBUG" resolve="DEBUG" />
-            </node>
-            <node concept="3clFbS" id="3o9wrC3WoAa" role="3Kbo56">
-              <node concept="3SKdUt" id="3o9wrC3WoAb" role="3cqZAp">
-                <node concept="1PaTwC" id="3o9wrC3WoAc" role="1aUNEU">
-                  <node concept="3oM_SD" id="3o9wrC3WoAd" role="1PaTwD">
-                    <property role="3oM_SC" value="fall" />
-                  </node>
-                  <node concept="3oM_SD" id="3o9wrC3WoAe" role="1PaTwD">
-                    <property role="3oM_SC" value="through" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3KbdKl" id="3o9wrC3WoAf" role="3KbHQx">
-            <node concept="Rm8GO" id="3o9wrC3WoAg" role="3Kbmr1">
-              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
-              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.INFO" resolve="INFO" />
-            </node>
-            <node concept="3clFbS" id="3o9wrC3WoAh" role="3Kbo56">
-              <node concept="3cpWs6" id="3o9wrC3WoAi" role="3cqZAp">
-                <node concept="Rm8GO" id="3o9wrC3WoAj" 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="3o9wrC3WoAk" role="3KbHQx">
-            <node concept="Rm8GO" id="3o9wrC3WoAl" role="3Kbmr1">
-              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
-              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.WARN" resolve="WARN" />
-            </node>
-            <node concept="3clFbS" id="3o9wrC3WoAm" role="3Kbo56">
-              <node concept="3cpWs6" id="3o9wrC3WoAn" role="3cqZAp">
-                <node concept="Rm8GO" id="3o9wrC3WoAo" role="3cqZAk">
-                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.WARNING" resolve="WARNING" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3KbdKl" id="3o9wrC3WoAp" role="3KbHQx">
-            <node concept="Rm8GO" id="3o9wrC3WoAq" role="3Kbmr1">
-              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
-              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.ERROR" resolve="ERROR" />
-            </node>
-            <node concept="3clFbS" id="3o9wrC3WoAr" role="3Kbo56">
-              <node concept="3cpWs6" id="3o9wrC3WoAz" role="3cqZAp">
-                <node concept="Rm8GO" id="3o9wrC3WoA$" role="3cqZAk">
-                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3KbdKl" id="1laj_RSegw9" role="3KbHQx">
-            <node concept="3clFbS" id="1laj_RSegwb" role="3Kbo56">
-              <node concept="3cpWs6" id="1laj_RSegZm" role="3cqZAp">
-                <node concept="Rm8GO" id="1laj_RSegZn" role="3cqZAk">
-                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                </node>
-              </node>
-              <node concept="3clFbH" id="1laj_RSegYU" role="3cqZAp" />
-            </node>
-            <node concept="Rm8GO" id="1laj_RSegG_" role="3Kbmr1">
-              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.FAILURE" resolve="FAILURE" />
-              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
-            </node>
-          </node>
-          <node concept="3KbdKl" id="3o9wrC3WoAw" role="3KbHQx">
-            <node concept="Rm8GO" id="3o9wrC3WoAx" role="3Kbmr1">
-              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
-              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.FATAL" resolve="FATAL" />
-            </node>
-            <node concept="3clFbS" id="3o9wrC3WoAy" role="3Kbo56">
-              <node concept="3SKdUt" id="3o9wrC3WoAs" role="3cqZAp">
-                <node concept="1PaTwC" id="3o9wrC3WoAt" role="1aUNEU">
-                  <node concept="3oM_SD" id="3o9wrC3WoAu" role="1PaTwD">
-                    <property role="3oM_SC" value="fall" />
-                  </node>
-                  <node concept="3oM_SD" id="3o9wrC3WoAv" role="1PaTwD">
-                    <property role="3oM_SC" value="through" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="3o9wrC3WoA_" role="3KbGdf">
-            <ref role="3cqZAo" node="3o9wrC3WoAF" resolve="severity" />
-          </node>
-          <node concept="3clFbS" id="3o9wrC3WoAA" role="3Kb1Dw">
-            <node concept="YS8fn" id="3o9wrC3WoAB" role="3cqZAp">
-              <node concept="2ShNRf" id="3o9wrC3WoAC" role="YScLw">
-                <node concept="1pGfFk" id="3o9wrC3WoAD" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="3o9wrC3WoAE" role="3clF45">
-        <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-      </node>
-      <node concept="37vLTG" id="3o9wrC3WoAF" role="3clF46">
-        <property role="TrG5h" value="severity" />
-        <node concept="3uibUv" id="3o9wrC3WoAG" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3o9wrC3WoAH" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="7rkc8GyhjGp" role="jymVt" />
     <node concept="3clFb_" id="60zk4o6Suoh" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="instantiateArguments" />
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 ab48fc68..f77052fd 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
@@ -9429,6 +9429,7 @@
   <node concept="312cEu" id="7DvO2M9IiKB">
     <property role="TrG5h" value="MacroProcessing" />
     <property role="2bfB8j" value="false" />
+    <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="7DvO2M9IiKC" role="jymVt" />
     <node concept="3clFbW" id="7DvO2Ma0h_M" role="jymVt">
       <node concept="3cqZAl" id="7DvO2Ma0h_O" role="3clF45" />
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 487e073f..14d83200 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
@@ -23,6 +23,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -8833,24 +8834,20 @@
               </node>
               <node concept="liA8E" id="4jcOV4hxy0C" role="2OqNvi">
                 <ref role="37wK5l" to="w7la:~InvocationContext.report(jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback)" resolve="report" />
-                <node concept="1rXfSq" id="1laj_RS1x1L" role="37wK5m">
-                  <ref role="37wK5l" node="1laj_RS1mcG" resolve="feedback" />
-                  <node concept="37vLTw" id="1laj_RS1xa2" role="37wK5m">
+                <node concept="2YIFZM" id="61G6TdBsI1H" role="37wK5m">
+                  <ref role="1Pybhc" node="61G6TdBsGY8" resolve="FeedbackUtil" />
+                  <ref role="37wK5l" node="61G6TdBsHeb" resolve="feedback" />
+                  <node concept="37vLTw" id="61G6TdBsI5y" role="37wK5m">
                     <ref role="3cqZAo" node="4jcOV4hx_1_" resolve="msg" />
                   </node>
-                  <node concept="37vLTw" id="1laj_RS1ySD" role="37wK5m">
+                  <node concept="37vLTw" id="61G6TdBsI5z" role="37wK5m">
                     <ref role="3cqZAo" node="1laj_RS1ySx" resolve="severity" />
                   </node>
-                  <node concept="2ShNRf" id="4ekZiHduKer" role="37wK5m">
-                    <node concept="1pGfFk" id="4ekZiHduKDS" role="2ShVmc">
-                      <ref role="37wK5l" node="4ekZiHddiYF" resolve="FeedbackOrigin" />
-                      <node concept="37vLTw" id="4ekZiHduKL_" role="37wK5m">
-                        <ref role="3cqZAo" node="1laj_RTNLWd" resolve="templateRef" />
-                      </node>
-                      <node concept="37vLTw" id="4ekZiHduKSc" role="37wK5m">
-                        <ref role="3cqZAo" node="4ekZiHduI3i" resolve="targetRef" />
-                      </node>
-                    </node>
+                  <node concept="37vLTw" id="61G6TdBsI5A" role="37wK5m">
+                    <ref role="3cqZAo" node="1laj_RTNLWd" resolve="templateRef" />
+                  </node>
+                  <node concept="37vLTw" id="61G6TdBsI5B" role="37wK5m">
+                    <ref role="3cqZAo" node="4ekZiHduI3i" resolve="targetRef" />
                   </node>
                 </node>
               </node>
@@ -8889,133 +8886,6 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
-      <node concept="2tJIrI" id="4jcOV4hxC_q" role="jymVt" />
-      <node concept="3clFb_" id="1laj_RS1mcG" role="jymVt">
-        <property role="TrG5h" value="feedback" />
-        <node concept="37vLTG" id="1laj_RS1nNJ" role="3clF46">
-          <property role="TrG5h" value="msg" />
-          <node concept="17QB3L" id="1laj_RS1pzw" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1laj_RS1p_c" role="3clF46">
-          <property role="TrG5h" value="severity" />
-          <node concept="17QB3L" id="1laj_RS1pSM" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1laj_RTChCL" role="3clF46">
-          <property role="TrG5h" value="origin" />
-          <node concept="3uibUv" id="4ekZiHduKVL" role="1tU5fm">
-            <ref role="3uigEE" node="4ekZiHddiXo" resolve="FeedbackOrigin" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="1laj_RS1rxx" role="3clF45">
-          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-        </node>
-        <node concept="3Tm6S6" id="1laj_RS1mvM" role="1B3o_S" />
-        <node concept="3clFbS" id="1laj_RS1mcK" role="3clF47">
-          <node concept="3KaCP$" id="2TBKtozZDTT" role="3cqZAp">
-            <node concept="3KbdKl" id="2TBKtozZDTU" role="3KbHQx">
-              <node concept="3clFbS" id="2TBKtozZDTV" role="3Kbo56">
-                <node concept="3cpWs6" id="2TBKtozZDTW" role="3cqZAp">
-                  <node concept="2YIFZM" id="2TBKtozZDTX" role="3cqZAk">
-                    <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.debug(java.lang.String,java.lang.Object)" resolve="debug" />
-                    <node concept="37vLTw" id="2TBKtozZDTY" role="37wK5m">
-                      <ref role="3cqZAo" node="1laj_RS1nNJ" resolve="msg" />
-                    </node>
-                    <node concept="37vLTw" id="2TBKtozZDTZ" role="37wK5m">
-                      <ref role="3cqZAo" node="1laj_RTChCL" resolve="origin" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="Xl_RD" id="2TBKtozZDU0" role="3Kbmr1">
-                <property role="Xl_RC" value="DEBUG" />
-              </node>
-            </node>
-            <node concept="3KbdKl" id="2TBKtozZDU1" role="3KbHQx">
-              <node concept="3clFbS" id="2TBKtozZDU2" role="3Kbo56">
-                <node concept="3cpWs6" id="2TBKtozZDU3" role="3cqZAp">
-                  <node concept="2YIFZM" id="2TBKtozZDU4" role="3cqZAk">
-                    <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.info(java.lang.String,java.lang.Object)" resolve="info" />
-                    <node concept="37vLTw" id="2TBKtozZDU5" role="37wK5m">
-                      <ref role="3cqZAo" node="1laj_RS1nNJ" resolve="msg" />
-                    </node>
-                    <node concept="37vLTw" id="2TBKtozZDU6" role="37wK5m">
-                      <ref role="3cqZAo" node="1laj_RTChCL" resolve="origin" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="Xl_RD" id="2TBKtozZDU7" role="3Kbmr1">
-                <property role="Xl_RC" value="INFO" />
-              </node>
-            </node>
-            <node concept="3KbdKl" id="2TBKtozZDU8" role="3KbHQx">
-              <node concept="3clFbS" id="2TBKtozZDU9" role="3Kbo56">
-                <node concept="3cpWs6" id="2TBKtozZDUa" role="3cqZAp">
-                  <node concept="2YIFZM" id="2TBKtozZDUb" role="3cqZAk">
-                    <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.warn(java.lang.String,java.lang.Object)" resolve="warn" />
-                    <node concept="37vLTw" id="2TBKtozZDUc" role="37wK5m">
-                      <ref role="3cqZAo" node="1laj_RS1nNJ" resolve="msg" />
-                    </node>
-                    <node concept="37vLTw" id="2TBKtozZDUd" role="37wK5m">
-                      <ref role="3cqZAo" node="1laj_RTChCL" resolve="origin" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="Xl_RD" id="2TBKtozZDUe" role="3Kbmr1">
-                <property role="Xl_RC" value="WARN" />
-              </node>
-            </node>
-            <node concept="3KbdKl" id="2TBKtozZDUf" role="3KbHQx">
-              <node concept="3clFbS" id="2TBKtozZDUg" role="3Kbo56">
-                <node concept="3cpWs6" id="2TBKtozZDUh" role="3cqZAp">
-                  <node concept="2YIFZM" id="2TBKtozZDUi" role="3cqZAk">
-                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.error(java.lang.String,java.lang.Object)" resolve="error" />
-                    <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                    <node concept="37vLTw" id="2TBKtozZDUj" role="37wK5m">
-                      <ref role="3cqZAo" node="1laj_RS1nNJ" resolve="msg" />
-                    </node>
-                    <node concept="37vLTw" id="2TBKtozZDUk" role="37wK5m">
-                      <ref role="3cqZAo" node="1laj_RTChCL" resolve="origin" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="Xl_RD" id="2TBKtozZDUl" role="3Kbmr1">
-                <property role="Xl_RC" value="ERROR" />
-              </node>
-            </node>
-            <node concept="3clFbS" id="2TBKtozZDUm" role="3Kb1Dw">
-              <node concept="YS8fn" id="2TBKtozZDUn" role="3cqZAp">
-                <node concept="2ShNRf" id="2TBKtozZDUo" role="YScLw">
-                  <node concept="1pGfFk" id="2TBKtozZDUp" role="2ShVmc">
-                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
-                    <node concept="3cpWs3" id="2TBKtozZDUq" role="37wK5m">
-                      <node concept="Xl_RD" id="2TBKtozZDUr" role="3uHU7w">
-                        <property role="Xl_RC" value="'" />
-                      </node>
-                      <node concept="3cpWs3" id="2TBKtozZDUs" role="3uHU7B">
-                        <node concept="Xl_RD" id="2TBKtozZDUt" role="3uHU7B">
-                          <property role="Xl_RC" value="unknown severity '" />
-                        </node>
-                        <node concept="37vLTw" id="2TBKtozZDUu" role="3uHU7w">
-                          <ref role="3cqZAo" node="1laj_RS1p_c" resolve="severity" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTw" id="2TBKtozZDUv" role="3KbGdf">
-              <ref role="3cqZAo" node="1laj_RS1p_c" resolve="severity" />
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="2tJIrI" id="1laj_RS1lWk" role="jymVt" />
       <node concept="3Tm1VV" id="4jcOV4hx9Fw" role="1B3o_S" />
       <node concept="3uibUv" id="4jcOV4hx9Fx" role="EKbjA">
@@ -9402,5 +9272,313 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="61G6TdBsGY8">
+    <property role="TrG5h" value="FeedbackUtil" />
+    <node concept="2tJIrI" id="61G6TdBsGYT" role="jymVt" />
+    <node concept="2YIFZL" id="61G6TdBsHeb" role="jymVt">
+      <property role="TrG5h" value="feedback" />
+      <node concept="37vLTG" id="61G6TdBsHgW" role="3clF46">
+        <property role="TrG5h" value="msg" />
+        <node concept="17QB3L" id="61G6TdBsHgX" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="61G6TdBsHgY" role="3clF46">
+        <property role="TrG5h" value="severity" />
+        <node concept="17QB3L" id="61G6TdBsHgZ" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="61G6TdBsHnW" role="3clF46">
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3uibUv" id="61G6TdBsHnX" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="61G6TdBsHnY" role="3clF46">
+        <property role="TrG5h" value="targetRef" />
+        <node concept="3uibUv" id="61G6TdBsHnZ" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="61G6TdBsHeL" role="3clF45">
+        <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+      </node>
+      <node concept="3Tm1VV" id="61G6TdBsHee" role="1B3o_S" />
+      <node concept="3clFbS" id="61G6TdBsHef" role="3clF47">
+        <node concept="3clFbF" id="61G6TdBsHrb" role="3cqZAp">
+          <node concept="2YIFZM" id="61G6TdBsHs1" role="3clFbG">
+            <ref role="1Pybhc" node="61G6TdBsGY8" resolve="FeedbackUtil" />
+            <ref role="37wK5l" node="61G6TdBsHj0" resolve="feedback" />
+            <node concept="37vLTw" id="61G6TdBsHsM" role="37wK5m">
+              <ref role="3cqZAo" node="61G6TdBsHgW" resolve="msg" />
+            </node>
+            <node concept="37vLTw" id="61G6TdBsHsN" role="37wK5m">
+              <ref role="3cqZAo" node="61G6TdBsHgY" resolve="severity" />
+            </node>
+            <node concept="2ShNRf" id="61G6TdBsHsO" role="37wK5m">
+              <node concept="1pGfFk" id="61G6TdBsHsP" role="2ShVmc">
+                <ref role="37wK5l" node="4ekZiHddiYF" resolve="FeedbackOrigin" />
+                <node concept="37vLTw" id="61G6TdBsH_o" role="37wK5m">
+                  <ref role="3cqZAo" node="61G6TdBsHnW" resolve="templateRef" />
+                </node>
+                <node concept="37vLTw" id="61G6TdBsHCw" role="37wK5m">
+                  <ref role="3cqZAo" node="61G6TdBsHnY" resolve="targetRef" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="61G6TdBsGYY" role="jymVt" />
+    <node concept="2YIFZL" id="61G6TdBsHj0" role="jymVt">
+      <property role="TrG5h" value="feedback" />
+      <node concept="37vLTG" id="61G6TdBsHj1" role="3clF46">
+        <property role="TrG5h" value="msg" />
+        <node concept="17QB3L" id="61G6TdBsHj2" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="61G6TdBsHj3" role="3clF46">
+        <property role="TrG5h" value="severity" />
+        <node concept="17QB3L" id="61G6TdBsHj4" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="61G6TdBsHj5" role="3clF46">
+        <property role="TrG5h" value="origin" />
+        <node concept="3uibUv" id="61G6TdBsHj6" role="1tU5fm">
+          <ref role="3uigEE" node="4ekZiHddiXo" resolve="FeedbackOrigin" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="61G6TdBsHj7" role="3clF45">
+        <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+      </node>
+      <node concept="3Tm1VV" id="61G6TdBsHj8" role="1B3o_S" />
+      <node concept="3clFbS" id="61G6TdBsHj9" role="3clF47">
+        <node concept="3KaCP$" id="61G6TdBsHEW" role="3cqZAp">
+          <node concept="3KbdKl" id="61G6TdBsHEX" role="3KbHQx">
+            <node concept="3clFbS" id="61G6TdBsHEY" role="3Kbo56">
+              <node concept="3cpWs6" id="61G6TdBsHEZ" role="3cqZAp">
+                <node concept="2YIFZM" id="61G6TdBsHF0" role="3cqZAk">
+                  <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                  <ref role="37wK5l" to="w7la:~EvaluationFeedback.debug(java.lang.String,java.lang.Object)" resolve="debug" />
+                  <node concept="37vLTw" id="61G6TdBsHF1" role="37wK5m">
+                    <ref role="3cqZAo" node="61G6TdBsHj1" resolve="msg" />
+                  </node>
+                  <node concept="37vLTw" id="61G6TdBsHF2" role="37wK5m">
+                    <ref role="3cqZAo" node="61G6TdBsHj5" resolve="origin" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="Xl_RD" id="61G6TdBsHF3" role="3Kbmr1">
+              <property role="Xl_RC" value="DEBUG" />
+            </node>
+          </node>
+          <node concept="3KbdKl" id="61G6TdBsHF4" role="3KbHQx">
+            <node concept="3clFbS" id="61G6TdBsHF5" role="3Kbo56">
+              <node concept="3cpWs6" id="61G6TdBsHF6" role="3cqZAp">
+                <node concept="2YIFZM" id="61G6TdBsHF7" role="3cqZAk">
+                  <ref role="37wK5l" to="w7la:~EvaluationFeedback.info(java.lang.String,java.lang.Object)" resolve="info" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                  <node concept="37vLTw" id="61G6TdBsHF8" role="37wK5m">
+                    <ref role="3cqZAo" node="61G6TdBsHj1" resolve="msg" />
+                  </node>
+                  <node concept="37vLTw" id="61G6TdBsHF9" role="37wK5m">
+                    <ref role="3cqZAo" node="61G6TdBsHj5" resolve="origin" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="Xl_RD" id="61G6TdBsHFa" role="3Kbmr1">
+              <property role="Xl_RC" value="INFO" />
+            </node>
+          </node>
+          <node concept="3KbdKl" id="61G6TdBsHFb" role="3KbHQx">
+            <node concept="3clFbS" id="61G6TdBsHFc" role="3Kbo56">
+              <node concept="3cpWs6" id="61G6TdBsHFd" role="3cqZAp">
+                <node concept="2YIFZM" id="61G6TdBsHFe" role="3cqZAk">
+                  <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                  <ref role="37wK5l" to="w7la:~EvaluationFeedback.warn(java.lang.String,java.lang.Object)" resolve="warn" />
+                  <node concept="37vLTw" id="61G6TdBsHFf" role="37wK5m">
+                    <ref role="3cqZAo" node="61G6TdBsHj1" resolve="msg" />
+                  </node>
+                  <node concept="37vLTw" id="61G6TdBsHFg" role="37wK5m">
+                    <ref role="3cqZAo" node="61G6TdBsHj5" resolve="origin" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="Xl_RD" id="61G6TdBsHFh" role="3Kbmr1">
+              <property role="Xl_RC" value="WARN" />
+            </node>
+          </node>
+          <node concept="3KbdKl" id="61G6TdBsHFi" role="3KbHQx">
+            <node concept="3clFbS" id="61G6TdBsHFj" role="3Kbo56">
+              <node concept="3cpWs6" id="61G6TdBsHFk" role="3cqZAp">
+                <node concept="2YIFZM" id="61G6TdBsHFl" role="3cqZAk">
+                  <ref role="37wK5l" to="w7la:~EvaluationFeedback.error(java.lang.String,java.lang.Object)" resolve="error" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                  <node concept="37vLTw" id="61G6TdBsHFm" role="37wK5m">
+                    <ref role="3cqZAo" node="61G6TdBsHj1" resolve="msg" />
+                  </node>
+                  <node concept="37vLTw" id="61G6TdBsHFn" role="37wK5m">
+                    <ref role="3cqZAo" node="61G6TdBsHj5" resolve="origin" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="Xl_RD" id="61G6TdBsHFo" role="3Kbmr1">
+              <property role="Xl_RC" value="ERROR" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="61G6TdBsHFp" role="3Kb1Dw">
+            <node concept="YS8fn" id="61G6TdBsHFq" role="3cqZAp">
+              <node concept="2ShNRf" id="61G6TdBsHFr" role="YScLw">
+                <node concept="1pGfFk" id="61G6TdBsHFs" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+                  <node concept="3cpWs3" id="61G6TdBsHFt" role="37wK5m">
+                    <node concept="Xl_RD" id="61G6TdBsHFu" role="3uHU7w">
+                      <property role="Xl_RC" value="'" />
+                    </node>
+                    <node concept="3cpWs3" id="61G6TdBsHFv" role="3uHU7B">
+                      <node concept="Xl_RD" id="61G6TdBsHFw" role="3uHU7B">
+                        <property role="Xl_RC" value="unknown severity '" />
+                      </node>
+                      <node concept="37vLTw" id="61G6TdBsHFx" role="3uHU7w">
+                        <ref role="3cqZAo" node="61G6TdBsHj3" resolve="severity" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="61G6TdBsHFy" role="3KbGdf">
+            <ref role="3cqZAo" node="61G6TdBsHj3" resolve="severity" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="61G6TdBzLWY" role="jymVt" />
+    <node concept="2YIFZL" id="3o9wrC3WoA4" role="jymVt">
+      <property role="TrG5h" value="severityToStatus" />
+      <node concept="3clFbS" id="3o9wrC3WoA6" role="3clF47">
+        <node concept="3KaCP$" id="3o9wrC3WoA7" role="3cqZAp">
+          <node concept="3KbdKl" id="3o9wrC3WoA8" role="3KbHQx">
+            <node concept="Rm8GO" id="3o9wrC3WoA9" role="3Kbmr1">
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.DEBUG" resolve="DEBUG" />
+            </node>
+            <node concept="3clFbS" id="3o9wrC3WoAa" role="3Kbo56">
+              <node concept="3SKdUt" id="3o9wrC3WoAb" role="3cqZAp">
+                <node concept="1PaTwC" id="3o9wrC3WoAc" role="1aUNEU">
+                  <node concept="3oM_SD" id="3o9wrC3WoAd" role="1PaTwD">
+                    <property role="3oM_SC" value="fall" />
+                  </node>
+                  <node concept="3oM_SD" id="3o9wrC3WoAe" role="1PaTwD">
+                    <property role="3oM_SC" value="through" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3KbdKl" id="3o9wrC3WoAf" role="3KbHQx">
+            <node concept="Rm8GO" id="3o9wrC3WoAg" role="3Kbmr1">
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.INFO" resolve="INFO" />
+            </node>
+            <node concept="3clFbS" id="3o9wrC3WoAh" role="3Kbo56">
+              <node concept="3cpWs6" id="3o9wrC3WoAi" role="3cqZAp">
+                <node concept="Rm8GO" id="3o9wrC3WoAj" 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="3o9wrC3WoAk" role="3KbHQx">
+            <node concept="Rm8GO" id="3o9wrC3WoAl" role="3Kbmr1">
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.WARN" resolve="WARN" />
+            </node>
+            <node concept="3clFbS" id="3o9wrC3WoAm" role="3Kbo56">
+              <node concept="3cpWs6" id="3o9wrC3WoAn" role="3cqZAp">
+                <node concept="Rm8GO" id="3o9wrC3WoAo" role="3cqZAk">
+                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.WARNING" resolve="WARNING" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3KbdKl" id="3o9wrC3WoAp" role="3KbHQx">
+            <node concept="Rm8GO" id="3o9wrC3WoAq" role="3Kbmr1">
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.ERROR" resolve="ERROR" />
+            </node>
+            <node concept="3clFbS" id="3o9wrC3WoAr" role="3Kbo56">
+              <node concept="3cpWs6" id="3o9wrC3WoAz" role="3cqZAp">
+                <node concept="Rm8GO" id="3o9wrC3WoA$" role="3cqZAk">
+                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3KbdKl" id="1laj_RSegw9" role="3KbHQx">
+            <node concept="3clFbS" id="1laj_RSegwb" role="3Kbo56">
+              <node concept="3cpWs6" id="1laj_RSegZm" role="3cqZAp">
+                <node concept="Rm8GO" id="1laj_RSegZn" role="3cqZAk">
+                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="1laj_RSegYU" role="3cqZAp" />
+            </node>
+            <node concept="Rm8GO" id="1laj_RSegG_" role="3Kbmr1">
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.FAILURE" resolve="FAILURE" />
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+            </node>
+          </node>
+          <node concept="3KbdKl" id="3o9wrC3WoAw" role="3KbHQx">
+            <node concept="Rm8GO" id="3o9wrC3WoAx" role="3Kbmr1">
+              <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.FATAL" resolve="FATAL" />
+            </node>
+            <node concept="3clFbS" id="3o9wrC3WoAy" role="3Kbo56">
+              <node concept="3SKdUt" id="3o9wrC3WoAs" role="3cqZAp">
+                <node concept="1PaTwC" id="3o9wrC3WoAt" role="1aUNEU">
+                  <node concept="3oM_SD" id="3o9wrC3WoAu" role="1PaTwD">
+                    <property role="3oM_SC" value="fall" />
+                  </node>
+                  <node concept="3oM_SD" id="3o9wrC3WoAv" role="1PaTwD">
+                    <property role="3oM_SC" value="through" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="3o9wrC3WoA_" role="3KbGdf">
+            <ref role="3cqZAo" node="3o9wrC3WoAF" resolve="severity" />
+          </node>
+          <node concept="3clFbS" id="3o9wrC3WoAA" role="3Kb1Dw">
+            <node concept="YS8fn" id="3o9wrC3WoAB" role="3cqZAp">
+              <node concept="2ShNRf" id="3o9wrC3WoAC" role="YScLw">
+                <node concept="1pGfFk" id="3o9wrC3WoAD" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="61G6TdBteQI" role="3clF45">
+        <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+      </node>
+      <node concept="37vLTG" id="3o9wrC3WoAF" role="3clF46">
+        <property role="TrG5h" value="severity" />
+        <node concept="3uibUv" id="3o9wrC3WoAG" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3o9wrC3WoAH" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="61G6TdBsHiZ" role="jymVt" />
+    <node concept="3Tm1VV" id="61G6TdBsGY9" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
index 489de91f..a88a9ce5 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
@@ -794,6 +794,72 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="61G6TdBqAxs" role="3cqZAp">
+          <node concept="3cpWsn" id="61G6TdBqAxt" role="3cpWs9">
+            <property role="TrG5h" value="macroProcessing" />
+            <node concept="3uibUv" id="61G6TdBqAxr" role="1tU5fm">
+              <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+            </node>
+            <node concept="2ShNRf" id="61G6TdBqAxu" role="33vP2m">
+              <node concept="YeOm9" id="61G6TdBqAxv" role="2ShVmc">
+                <node concept="1Y3b0j" id="61G6TdBqAxw" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                  <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+                  <node concept="3Tm1VV" id="61G6TdBqAxx" role="1B3o_S" />
+                  <node concept="2OqwBi" id="61G6TdBqAxy" role="37wK5m">
+                    <node concept="37vLTw" id="61G6TdBqAxz" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                    </node>
+                    <node concept="liA8E" id="61G6TdBqAx$" role="2OqNvi">
+                      <ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="61G6TdBqAx_" role="37wK5m">
+                    <node concept="37vLTw" id="61G6TdBqAxA" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                    </node>
+                    <node concept="liA8E" id="61G6TdBqAxB" role="2OqNvi">
+                      <ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
+                    </node>
+                  </node>
+                  <node concept="3clFb_" id="61G6TdBqAxC" role="jymVt">
+                    <property role="TrG5h" value="provideFeedback" />
+                    <node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
+                      <property role="TrG5h" value="feedback" />
+                      <node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
+                        <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                      </node>
+                    </node>
+                    <node concept="3cqZAl" id="61G6TdBqAxN" role="3clF45" />
+                    <node concept="3Tm1VV" id="61G6TdBqAxO" role="1B3o_S" />
+                    <node concept="3clFbS" id="61G6TdBqAxP" role="3clF47">
+                      <node concept="3SKdUt" id="61G6TdBqAxQ" role="3cqZAp">
+                        <node concept="1PaTwC" id="61G6TdBqAxR" role="1aUNEU">
+                          <node concept="3oM_SD" id="61G6TdBqAxS" role="1PaTwD">
+                            <property role="3oM_SC" value="FIXME" />
+                          </node>
+                          <node concept="3oM_SD" id="61G6TdBqGQI" role="1PaTwD">
+                            <property role="3oM_SC" value="process" />
+                          </node>
+                          <node concept="3oM_SD" id="61G6TdBqGR1" role="1PaTwD">
+                            <property role="3oM_SC" value="report" />
+                          </node>
+                          <node concept="3oM_SD" id="61G6TdBqGR_" role="1PaTwD">
+                            <property role="3oM_SC" value="items" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="61G6TdBqAxV" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="tyIfzC1OO3" role="3cqZAp">
           <node concept="37vLTI" id="tyIfzC1PST" role="3clFbG">
             <node concept="2OqwBi" id="tyIfzC1P5D" role="37vLTJ">
@@ -808,6 +874,9 @@
                 <node concept="Xl_RD" id="6OXbTDxuaSu" role="37wK5m">
                   <property role="Xl_RC" value="test" />
                 </node>
+                <node concept="37vLTw" id="61G6TdBqAxW" role="37wK5m">
+                  <ref role="3cqZAo" node="61G6TdBqAxt" resolve="macroProcessing" />
+                </node>
                 <node concept="37vLTw" id="6OXbTD_oFoC" role="37wK5m">
                   <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
                 </node>
@@ -2243,9 +2312,9 @@
               <node concept="3uibUv" id="MSv3owiW5y" role="1tU5fm">
                 <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
               </node>
-              <node concept="2YIFZM" id="1laj_RSB$EM" role="33vP2m">
-                <ref role="37wK5l" to="hano:3o9wrC3WoA4" resolve="severityToStatus" />
-                <ref role="1Pybhc" to="hano:3o9wrC3s0ii" resolve="DefaultSupervisor" />
+              <node concept="2YIFZM" id="61G6TdBzHQH" role="33vP2m">
+                <ref role="37wK5l" to="cxk7:3o9wrC3WoA4" resolve="severityToStatus" />
+                <ref role="1Pybhc" to="cxk7:61G6TdBsGY8" resolve="FeedbackUtil" />
                 <node concept="2OqwBi" id="1laj_RSBA2L" role="37wK5m">
                   <node concept="37vLTw" id="1laj_RSB_E8" role="2Oq$k0">
                     <ref role="3cqZAo" node="WJTIIp82_Y" resolve="feedback" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index 62166b51..98d9e137 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -43,6 +43,7 @@
     <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -1197,6 +1198,72 @@
                 </node>
               </node>
               <node concept="3clFbH" id="7gOEBI$hqVJ" role="3cqZAp" />
+              <node concept="3cpWs8" id="61G6TdBqDRj" role="3cqZAp">
+                <node concept="3cpWsn" id="61G6TdBqDRk" role="3cpWs9">
+                  <property role="TrG5h" value="macroProcessing" />
+                  <node concept="3uibUv" id="61G6TdBqDRi" role="1tU5fm">
+                    <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+                  </node>
+                  <node concept="2ShNRf" id="61G6TdBqDRl" role="33vP2m">
+                    <node concept="YeOm9" id="61G6TdBqDRm" role="2ShVmc">
+                      <node concept="1Y3b0j" id="61G6TdBqDRn" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                        <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+                        <node concept="3Tm1VV" id="61G6TdBqDRo" role="1B3o_S" />
+                        <node concept="2OqwBi" id="61G6TdBqDRp" role="37wK5m">
+                          <node concept="37vLTw" id="61G6TdBqDRq" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                          </node>
+                          <node concept="liA8E" id="61G6TdBqDRr" role="2OqNvi">
+                            <ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="61G6TdBqDRs" role="37wK5m">
+                          <node concept="37vLTw" id="61G6TdBqDRt" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                          </node>
+                          <node concept="liA8E" id="61G6TdBqDRu" role="2OqNvi">
+                            <ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
+                          </node>
+                        </node>
+                        <node concept="3clFb_" id="61G6TdBqDRv" role="jymVt">
+                          <property role="TrG5h" value="provideFeedback" />
+                          <node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
+                            <property role="TrG5h" value="feedback" />
+                            <node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
+                              <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                            </node>
+                          </node>
+                          <node concept="3cqZAl" id="61G6TdBqDRE" role="3clF45" />
+                          <node concept="3Tm1VV" id="61G6TdBqDRF" role="1B3o_S" />
+                          <node concept="3clFbS" id="61G6TdBqDRG" role="3clF47">
+                            <node concept="3SKdUt" id="61G6TdBqG4h" role="3cqZAp">
+                              <node concept="1PaTwC" id="61G6TdBqG4i" role="1aUNEU">
+                                <node concept="3oM_SD" id="61G6TdBqG4j" role="1PaTwD">
+                                  <property role="3oM_SC" value="FIXME" />
+                                </node>
+                                <node concept="3oM_SD" id="61G6TdBqG93" role="1PaTwD">
+                                  <property role="3oM_SC" value="process" />
+                                </node>
+                                <node concept="3oM_SD" id="61G6TdBqGah" role="1PaTwD">
+                                  <property role="3oM_SC" value="report" />
+                                </node>
+                                <node concept="3oM_SD" id="61G6TdBqGaI" role="1PaTwD">
+                                  <property role="3oM_SC" value="items" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="61G6TdBqDRH" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
               <node concept="3cpWs8" id="6$7vuu2ugt2" role="3cqZAp">
                 <node concept="3cpWsn" id="6$7vuu2ugt3" role="3cpWs9">
                   <property role="TrG5h" value="tplApp" />
@@ -1209,6 +1276,9 @@
                       <node concept="Xl_RD" id="6OXbTDxuaSu" role="37wK5m">
                         <property role="Xl_RC" value="test" />
                       </node>
+                      <node concept="37vLTw" id="61G6TdBqDRI" role="37wK5m">
+                        <ref role="3cqZAo" node="61G6TdBqDRk" resolve="macroProcessing" />
+                      </node>
                       <node concept="37vLTw" id="6OXbTD_oFoC" role="37wK5m">
                         <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
                       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 5cb42b4b..ab6862c3 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -61,6 +61,7 @@
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -3153,7 +3154,76 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="6nFpYluod$P" role="3cqZAp" />
+          <node concept="3cpWs8" id="61G6TdBDyzK" role="3cqZAp">
+            <node concept="3cpWsn" id="61G6TdBDyzL" role="3cpWs9">
+              <property role="TrG5h" value="macroProcessing" />
+              <node concept="3uibUv" id="61G6TdBDyzJ" role="1tU5fm">
+                <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+              </node>
+              <node concept="2ShNRf" id="61G6TdBDyzM" role="33vP2m">
+                <node concept="YeOm9" id="61G6TdBDyzN" role="2ShVmc">
+                  <node concept="1Y3b0j" id="61G6TdBDyzO" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                    <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+                    <node concept="3Tm1VV" id="61G6TdBDyzP" role="1B3o_S" />
+                    <node concept="37vLTw" id="61G6TdBDyzQ" role="37wK5m">
+                      <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                    </node>
+                    <node concept="2OqwBi" id="61G6TdBDyzR" role="37wK5m">
+                      <node concept="37vLTw" id="61G6TdBDyzS" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
+                      </node>
+                      <node concept="liA8E" id="61G6TdBDyzT" role="2OqNvi">
+                        <ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
+                      </node>
+                    </node>
+                    <node concept="3clFb_" id="61G6TdBDyzU" role="jymVt">
+                      <property role="TrG5h" value="provideFeedback" />
+                      <node concept="37vLTG" id="61G6TdBDyzV" role="3clF46">
+                        <property role="TrG5h" value="feedback" />
+                        <node concept="3uibUv" id="61G6TdBDyzW" role="1tU5fm">
+                          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                        </node>
+                      </node>
+                      <node concept="3cqZAl" id="61G6TdBDyzX" role="3clF45" />
+                      <node concept="3Tm1VV" id="61G6TdBDyzY" role="1B3o_S" />
+                      <node concept="3clFbS" id="61G6TdBDyzZ" role="3clF47">
+                        <node concept="3SKdUt" id="61G6TdBDy$0" role="3cqZAp">
+                          <node concept="1PaTwC" id="61G6TdBDy$1" role="1aUNEU">
+                            <node concept="3oM_SD" id="61G6TdBDy$2" role="1PaTwD">
+                              <property role="3oM_SC" value="FIXME" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$3" role="1PaTwD">
+                              <property role="3oM_SC" value="provide" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$4" role="1PaTwD">
+                              <property role="3oM_SC" value="appropriate" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$5" role="1PaTwD">
+                              <property role="3oM_SC" value="reporting" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$6" role="1PaTwD">
+                              <property role="3oM_SC" value="for" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$7" role="1PaTwD">
+                              <property role="3oM_SC" value="typechecking" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$8" role="1PaTwD">
+                              <property role="3oM_SC" value="errors" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2AHcQZ" id="61G6TdBDy$9" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="7WKNeR8TcXy" role="3cqZAp">
             <node concept="2OqwBi" id="7WKNeR8TcXz" role="3clFbG">
               <node concept="37vLTw" id="7WKNeR8TcX$" role="2Oq$k0">
@@ -3166,6 +3236,9 @@
                     <node concept="37vLTw" id="6nFpYluoiGj" role="37wK5m">
                       <ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
                     </node>
+                    <node concept="37vLTw" id="61G6TdBDzLl" role="37wK5m">
+                      <ref role="3cqZAo" node="61G6TdBDyzL" resolve="macroProcessing" />
+                    </node>
                     <node concept="2OqwBi" id="7WKNeR8TcXG" role="37wK5m">
                       <node concept="Xjq3P" id="7WKNeR8TcXH" role="2Oq$k0" />
                       <node concept="2OwXpG" id="7WKNeR8TcXI" role="2OqNvi">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 517d679b..9593c008 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -59,6 +59,7 @@
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="mpcv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.ref(JDK/)" />
     <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -9117,7 +9118,6 @@
           <node concept="3qTvmN" id="7i3KM7gIUOu" role="11_B2D" />
         </node>
         <node concept="3clFbS" id="7i3KM7gIOdi" role="3clF47">
-          <node concept="3clFbH" id="6nFpYlunz1X" role="3cqZAp" />
           <node concept="3cpWs8" id="6nFpYlun4Ee" role="3cqZAp">
             <node concept="3cpWsn" id="6nFpYlun4Ef" role="3cpWs9">
               <property role="TrG5h" value="session" />
@@ -9162,6 +9162,12 @@
                 <node concept="37vLTw" id="6nFpYlushso" role="37wK5m">
                   <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
                 </node>
+                <node concept="1rXfSq" id="61G6TdBAxrX" role="37wK5m">
+                  <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
+                  <node concept="37vLTw" id="61G6TdBAxrY" role="37wK5m">
+                    <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
+                  </node>
+                </node>
                 <node concept="37vLTw" id="6nFpYlushsp" role="37wK5m">
                   <ref role="3cqZAo" node="7i3KM7gIXYC" resolve="nodes" />
                 </node>
@@ -9182,6 +9188,138 @@
         </node>
         <node concept="3Tmbuc" id="5Qx6_65qDQy" role="1B3o_S" />
       </node>
+      <node concept="2tJIrI" id="61G6TdB_CjU" role="jymVt" />
+      <node concept="3clFb_" id="61G6TdB_yxW" role="jymVt">
+        <property role="TrG5h" value="createMacroProcessing" />
+        <node concept="3Tmbuc" id="61G6TdB_OsK" role="1B3o_S" />
+        <node concept="3uibUv" id="61G6TdBA092" role="3clF45">
+          <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+        </node>
+        <node concept="37vLTG" id="61G6TdB_yxS" role="3clF46">
+          <property role="TrG5h" value="session" />
+          <node concept="3uibUv" id="61G6TdB_yxT" role="1tU5fm">
+            <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="61G6TdB_yx9" role="3clF47">
+          <node concept="3cpWs6" id="61G6TdB_yxa" role="3cqZAp">
+            <node concept="2ShNRf" id="61G6TdB_yxb" role="3cqZAk">
+              <node concept="YeOm9" id="61G6TdB_yxc" role="2ShVmc">
+                <node concept="1Y3b0j" id="61G6TdB_yxd" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                  <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+                  <node concept="3Tm1VV" id="61G6TdB_yxe" role="1B3o_S" />
+                  <node concept="37vLTw" id="61G6TdB_yxf" role="37wK5m">
+                    <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                  </node>
+                  <node concept="2OqwBi" id="61G6TdB_yxg" role="37wK5m">
+                    <node concept="37vLTw" id="61G6TdB_yxU" role="2Oq$k0">
+                      <ref role="3cqZAo" node="61G6TdB_yxS" resolve="session" />
+                    </node>
+                    <node concept="liA8E" id="61G6TdB_yxi" role="2OqNvi">
+                      <ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
+                    </node>
+                  </node>
+                  <node concept="3clFb_" id="61G6TdB_yxj" role="jymVt">
+                    <property role="TrG5h" value="provideFeedback" />
+                    <node concept="37vLTG" id="61G6TdB_yxk" role="3clF46">
+                      <property role="TrG5h" value="feedback" />
+                      <node concept="3uibUv" id="61G6TdB_yxl" role="1tU5fm">
+                        <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                      </node>
+                    </node>
+                    <node concept="3cqZAl" id="61G6TdB_yxm" role="3clF45" />
+                    <node concept="3Tm1VV" id="61G6TdB_yxn" role="1B3o_S" />
+                    <node concept="3clFbS" id="61G6TdB_yxo" role="3clF47">
+                      <node concept="3cpWs8" id="61G6TdB_yxp" role="3cqZAp">
+                        <node concept="3cpWsn" id="61G6TdB_yxq" role="3cpWs9">
+                          <property role="TrG5h" value="details" />
+                          <node concept="3uibUv" id="61G6TdB_yxr" role="1tU5fm">
+                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                          </node>
+                          <node concept="2OqwBi" id="61G6TdB_yxs" role="33vP2m">
+                            <node concept="37vLTw" id="61G6TdB_yxt" role="2Oq$k0">
+                              <ref role="3cqZAo" node="61G6TdB_yxk" resolve="feedback" />
+                            </node>
+                            <node concept="liA8E" id="61G6TdB_yxu" role="2OqNvi">
+                              <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="61G6TdB_yxv" role="3cqZAp">
+                        <node concept="2OqwBi" id="61G6TdB_yxw" role="3clFbG">
+                          <node concept="37vLTw" id="61G6TdB_yxx" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5Qx6_65qW78" resolve="collectedReportItems" />
+                          </node>
+                          <node concept="TSZUe" id="61G6TdB_yxy" role="2OqNvi">
+                            <node concept="2ShNRf" id="61G6TdB_yxz" role="25WWJ7">
+                              <node concept="1pGfFk" id="61G6TdB_yx$" role="2ShVmc">
+                                <ref role="37wK5l" node="1FOQehwow5Q" resolve="TypecheckingReportItem" />
+                                <node concept="2YIFZM" id="61G6TdB_yx_" role="37wK5m">
+                                  <ref role="37wK5l" to="cxk7:3o9wrC3WoA4" resolve="severityToStatus" />
+                                  <ref role="1Pybhc" to="cxk7:61G6TdBsGY8" resolve="FeedbackUtil" />
+                                  <node concept="2OqwBi" id="61G6TdB_yxA" role="37wK5m">
+                                    <node concept="37vLTw" id="61G6TdB_yxB" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="61G6TdB_yxk" resolve="feedback" />
+                                    </node>
+                                    <node concept="liA8E" id="61G6TdB_yxC" role="2OqNvi">
+                                      <ref role="37wK5l" to="w7la:~EvaluationFeedback.getSeverity()" resolve="getSeverity" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="2OqwBi" id="61G6TdB_yxD" role="37wK5m">
+                                  <node concept="0kSF2" id="61G6TdB_yxE" role="2Oq$k0">
+                                    <node concept="3uibUv" id="61G6TdB_yxF" role="0kSFW">
+                                      <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                                    </node>
+                                    <node concept="37vLTw" id="61G6TdB_yxG" role="0kSFX">
+                                      <ref role="3cqZAo" node="61G6TdB_yxq" resolve="details" />
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="61G6TdB_yxH" role="2OqNvi">
+                                    <ref role="37wK5l" to="cxk7:4ekZiHddjeb" resolve="getTarget" />
+                                  </node>
+                                </node>
+                                <node concept="2OqwBi" id="61G6TdB_yxI" role="37wK5m">
+                                  <node concept="37vLTw" id="61G6TdB_yxJ" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="61G6TdB_yxk" resolve="feedback" />
+                                  </node>
+                                  <node concept="liA8E" id="61G6TdB_yxK" role="2OqNvi">
+                                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.getMessage()" resolve="getMessage" />
+                                  </node>
+                                </node>
+                                <node concept="2OqwBi" id="61G6TdB_yxL" role="37wK5m">
+                                  <node concept="0kSF2" id="61G6TdB_yxM" role="2Oq$k0">
+                                    <node concept="3uibUv" id="61G6TdB_yxN" role="0kSFW">
+                                      <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                                    </node>
+                                    <node concept="37vLTw" id="61G6TdB_yxO" role="0kSFX">
+                                      <ref role="3cqZAo" node="61G6TdB_yxq" resolve="details" />
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="61G6TdBFRUv" role="2OqNvi">
+                                    <ref role="37wK5l" to="cxk7:4ekZiHddjyV" resolve="getTemplate" />
+                                  </node>
+                                </node>
+                                <node concept="10Nm6u" id="61G6TdB_yxQ" role="37wK5m" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="61G6TdB_yxR" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="7i3KM7gJbjs" role="jymVt" />
       <node concept="3clFb_" id="7i3KM7gIGXj" role="jymVt">
         <property role="TrG5h" value="typecheckingStep" />
@@ -9846,6 +9984,7 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="61G6TdBAyAj" role="3cqZAp" />
           <node concept="3cpWs8" id="6nFpYluFUzo" role="3cqZAp">
             <node concept="3cpWsn" id="6nFpYluFUzp" role="3cpWs9">
               <property role="TrG5h" value="table" />
@@ -9976,6 +10115,12 @@
                 <node concept="37vLTw" id="6$F3Z5ziVT9" role="37wK5m">
                   <ref role="3cqZAo" node="6$F3Z5ziOoT" resolve="session" />
                 </node>
+                <node concept="1rXfSq" id="61G6TdBAEvZ" role="37wK5m">
+                  <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
+                  <node concept="37vLTw" id="61G6TdBAFxT" role="37wK5m">
+                    <ref role="3cqZAo" node="6$F3Z5ziOoT" resolve="session" />
+                  </node>
+                </node>
                 <node concept="37vLTw" id="6nFpYlus1Zj" role="37wK5m">
                   <ref role="3cqZAo" node="6nFpYlusyqh" resolve="nodes" />
                 </node>
@@ -17125,6 +17270,12 @@
           <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
         </node>
       </node>
+      <node concept="37vLTG" id="61G6TdBA_$Z" role="3clF46">
+        <property role="TrG5h" value="macroProcessing" />
+        <node concept="3uibUv" id="61G6TdBADrg" role="1tU5fm">
+          <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+        </node>
+      </node>
       <node concept="37vLTG" id="7WKNeR9fh8z" role="3clF46">
         <property role="TrG5h" value="inputNodes" />
         <node concept="2I9FWS" id="7WKNeR9fh8$" role="1tU5fm" />
@@ -17177,6 +17328,9 @@
           <node concept="37vLTw" id="6nFpYlurv6W" role="37wK5m">
             <ref role="3cqZAo" node="6nFpYluo8Vd" resolve="session" />
           </node>
+          <node concept="37vLTw" id="61G6TdBAEfx" role="37wK5m">
+            <ref role="3cqZAo" node="61G6TdBA_$Z" resolve="macroProcessing" />
+          </node>
           <node concept="37vLTw" id="6nFpYlurvaW" role="37wK5m">
             <ref role="3cqZAo" node="7WKNeR9fh8z" resolve="inputNodes" />
           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index f9e0c261..164a249e 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -39,6 +39,7 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -505,7 +506,7 @@
             <node concept="2OqwBi" id="6nFpYluo7Rv" role="37vLTJ">
               <node concept="Xjq3P" id="6nFpYluo7VR" role="2Oq$k0" />
               <node concept="2OwXpG" id="6nFpYluo7Ry" role="2OqNvi">
-                <ref role="2Oxat5" node="6nFpYluo50r" resolve="session" />
+                <ref role="2Oxat5" node="6nFpYluo50r" resolve="processingSession" />
               </node>
             </node>
             <node concept="37vLTw" id="6nFpYluo50_" role="37vLTx">
@@ -552,6 +553,83 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="61G6TdBAp_V" role="3cqZAp">
+          <node concept="37vLTI" id="61G6TdBAr4$" role="3clFbG">
+            <node concept="2ShNRf" id="61G6TdBAtin" role="37vLTx">
+              <node concept="YeOm9" id="61G6TdBAtio" role="2ShVmc">
+                <node concept="1Y3b0j" id="61G6TdBAtip" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                  <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+                  <node concept="3Tm1VV" id="61G6TdBAtiq" role="1B3o_S" />
+                  <node concept="2OqwBi" id="61G6TdBAtir" role="37wK5m">
+                    <node concept="37vLTw" id="61G6TdBAtis" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6nFpYluo50r" resolve="processingSession" />
+                    </node>
+                    <node concept="liA8E" id="61G6TdBAtit" role="2OqNvi">
+                      <ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="61G6TdBAtiu" role="37wK5m">
+                    <node concept="37vLTw" id="61G6TdBAtiv" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6nFpYluo50r" resolve="processingSession" />
+                    </node>
+                    <node concept="liA8E" id="61G6TdBAtiw" role="2OqNvi">
+                      <ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
+                    </node>
+                  </node>
+                  <node concept="3clFb_" id="61G6TdBAtix" role="jymVt">
+                    <property role="TrG5h" value="provideFeedback" />
+                    <node concept="37vLTG" id="61G6TdBAtiy" role="3clF46">
+                      <property role="TrG5h" value="feedback" />
+                      <node concept="3uibUv" id="61G6TdBAtiz" role="1tU5fm">
+                        <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                      </node>
+                    </node>
+                    <node concept="3cqZAl" id="61G6TdBAti$" role="3clF45" />
+                    <node concept="3Tm1VV" id="61G6TdBAti_" role="1B3o_S" />
+                    <node concept="3clFbS" id="61G6TdBAtiA" role="3clF47">
+                      <node concept="3SKdUt" id="61G6TdBAtiB" role="3cqZAp">
+                        <node concept="1PaTwC" id="61G6TdBAtiC" role="1aUNEU">
+                          <node concept="3oM_SD" id="61G6TdBAtiD" role="1PaTwD">
+                            <property role="3oM_SC" value="FIXME" />
+                          </node>
+                          <node concept="3oM_SD" id="61G6TdBAtiE" role="1PaTwD">
+                            <property role="3oM_SC" value="provide" />
+                          </node>
+                          <node concept="3oM_SD" id="61G6TdBAtiF" role="1PaTwD">
+                            <property role="3oM_SC" value="appropriate" />
+                          </node>
+                          <node concept="3oM_SD" id="61G6TdBAtiG" role="1PaTwD">
+                            <property role="3oM_SC" value="reporting" />
+                          </node>
+                          <node concept="3oM_SD" id="61G6TdBAtiH" role="1PaTwD">
+                            <property role="3oM_SC" value="for" />
+                          </node>
+                          <node concept="3oM_SD" id="61G6TdBAtiI" role="1PaTwD">
+                            <property role="3oM_SC" value="typechecking" />
+                          </node>
+                          <node concept="3oM_SD" id="61G6TdBAtiJ" role="1PaTwD">
+                            <property role="3oM_SC" value="errors" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="61G6TdBAtiK" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="61G6TdBAq53" role="37vLTJ">
+              <node concept="Xjq3P" id="61G6TdBAp_T" role="2Oq$k0" />
+              <node concept="2OwXpG" id="61G6TdBAqzJ" role="2OqNvi">
+                <ref role="2Oxat5" node="61G6TdBAens" resolve="macroProcessing" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="6nFpYlumWDt" role="3clF46">
         <property role="TrG5h" value="session" />
@@ -603,7 +681,7 @@
             <node concept="2OqwBi" id="5EDW3XEoy5j" role="37vLTJ">
               <node concept="Xjq3P" id="5EDW3XEoy5k" role="2Oq$k0" />
               <node concept="2OwXpG" id="5EDW3XEoy5l" role="2OqNvi">
-                <ref role="2Oxat5" node="6nFpYluo50r" resolve="session" />
+                <ref role="2Oxat5" node="6nFpYluo50r" resolve="processingSession" />
               </node>
             </node>
             <node concept="37vLTw" id="5EDW3XEoy5m" role="37vLTx">
@@ -611,6 +689,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="61G6TdBAenw" role="3cqZAp">
+          <node concept="37vLTI" id="61G6TdBAeny" role="3clFbG">
+            <node concept="2OqwBi" id="61G6TdBAhZo" role="37vLTJ">
+              <node concept="Xjq3P" id="61G6TdBAihP" role="2Oq$k0" />
+              <node concept="2OwXpG" id="61G6TdBAhZr" role="2OqNvi">
+                <ref role="2Oxat5" node="61G6TdBAens" resolve="macroProcessing" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="61G6TdBAenA" role="37vLTx">
+              <ref role="3cqZAo" node="61G6TdBActe" resolve="macroProcessing" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="5EDW3XEoy5n" role="3cqZAp">
           <node concept="37vLTI" id="5EDW3XEoy5o" role="3clFbG">
             <node concept="2OqwBi" id="5EDW3XEoy5p" role="37vLTJ">
@@ -670,6 +761,12 @@
           <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
         </node>
       </node>
+      <node concept="37vLTG" id="61G6TdBActe" role="3clF46">
+        <property role="TrG5h" value="macroProcessing" />
+        <node concept="3uibUv" id="61G6TdBAdA8" role="1tU5fm">
+          <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+        </node>
+      </node>
       <node concept="37vLTG" id="5EDW3XEoy5R" role="3clF46">
         <property role="TrG5h" value="inputNodes" />
         <node concept="2I9FWS" id="5EDW3XEoy5S" role="1tU5fm" />
@@ -751,6 +848,24 @@
                   </node>
                 </node>
                 <node concept="3clFbH" id="3bpBM3Qd0IJ" role="3cqZAp" />
+                <node concept="3cpWs8" id="5iJsa3_e_Uv" role="3cqZAp">
+                  <node concept="3cpWsn" id="5iJsa3_e_Uy" role="3cpWs9">
+                    <property role="TrG5h" value="reportItems" />
+                    <property role="3TUv4t" value="true" />
+                    <node concept="_YKpA" id="5iJsa3_e_Ur" role="1tU5fm">
+                      <node concept="3uibUv" id="5iJsa3_eARn" role="_ZDj9">
+                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="5iJsa3_eCaE" role="33vP2m">
+                      <node concept="Tc6Ow" id="5iJsa3_eC6q" role="2ShVmc">
+                        <node concept="3uibUv" id="5iJsa3_eC6r" role="HW$YZ">
+                          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="1QHqEK" id="Hg6Enc4WaV" role="3cqZAp">
                   <node concept="1QHqEC" id="Hg6Enc4WaW" role="1QHqEI">
                     <node concept="3clFbS" id="Hg6Enc4WaX" role="1bW5cS">
@@ -856,7 +971,7 @@
                         <node concept="37vLTI" id="12QmIoyMG$S" role="3clFbG">
                           <node concept="2OqwBi" id="12QmIoyMIwn" role="37vLTx">
                             <node concept="37vLTw" id="6nFpYluoxOE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6nFpYluo50r" resolve="session" />
+                              <ref role="3cqZAo" node="6nFpYluo50r" resolve="processingSession" />
                             </node>
                             <node concept="liA8E" id="12QmIoyMJ_Z" role="2OqNvi">
                               <ref role="37wK5l" to="hano:20Ay2VeR9qk" resolve="ruleTemplates" />
@@ -879,8 +994,11 @@
                               <node concept="37vLTw" id="3bpBM3Qd2l4" role="37wK5m">
                                 <ref role="3cqZAo" node="Hg6Enc4Wb5" resolve="nameHint" />
                               </node>
+                              <node concept="37vLTw" id="61G6TdBAw3X" role="37wK5m">
+                                <ref role="3cqZAo" node="61G6TdBAens" resolve="macroProcessing" />
+                              </node>
                               <node concept="37vLTw" id="6nFpYluoAc4" role="37wK5m">
-                                <ref role="3cqZAo" node="6nFpYluo50r" resolve="session" />
+                                <ref role="3cqZAo" node="6nFpYluo50r" resolve="processingSession" />
                               </node>
                               <node concept="1rXfSq" id="6nFpYluVY5_" role="37wK5m">
                                 <ref role="37wK5l" node="6nFpYluVUvm" resolve="queryTemplate" />
@@ -969,23 +1087,6 @@
                   </node>
                 </node>
                 <node concept="3clFbH" id="6kREIVkvJ4j" role="3cqZAp" />
-                <node concept="3cpWs8" id="5iJsa3_e_Uv" role="3cqZAp">
-                  <node concept="3cpWsn" id="5iJsa3_e_Uy" role="3cpWs9">
-                    <property role="TrG5h" value="reportItems" />
-                    <node concept="_YKpA" id="5iJsa3_e_Ur" role="1tU5fm">
-                      <node concept="3uibUv" id="5iJsa3_eARn" role="_ZDj9">
-                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                      </node>
-                    </node>
-                    <node concept="2ShNRf" id="5iJsa3_eCaE" role="33vP2m">
-                      <node concept="Tc6Ow" id="5iJsa3_eC6q" role="2ShVmc">
-                        <node concept="3uibUv" id="5iJsa3_eC6r" role="HW$YZ">
-                          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
                 <node concept="3clFbJ" id="6kREIVkvKid" role="3cqZAp">
                   <node concept="3clFbS" id="6kREIVkvKif" role="3clFbx">
                     <node concept="3clFbF" id="5iJsa3_eDrI" role="3cqZAp">
@@ -1150,7 +1251,7 @@
               <node concept="2OqwBi" id="6nFpYluVUvf" role="1eOMHV">
                 <node concept="2OqwBi" id="6nFpYluVUvg" role="2Oq$k0">
                   <node concept="37vLTw" id="6nFpYluVUvh" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6nFpYluo50r" resolve="session" />
+                    <ref role="3cqZAo" node="6nFpYluo50r" resolve="processingSession" />
                   </node>
                   <node concept="liA8E" id="6nFpYluVUvi" role="2OqNvi">
                     <ref role="37wK5l" to="hano:7WKNeR9alW4" resolve="queryTemplates" />
@@ -1197,12 +1298,19 @@
       </node>
     </node>
     <node concept="312cEg" id="6nFpYluo50r" role="jymVt">
-      <property role="TrG5h" value="session" />
+      <property role="TrG5h" value="processingSession" />
       <node concept="3Tmbuc" id="6nFpYlur$MU" role="1B3o_S" />
       <node concept="3uibUv" id="6nFpYluo50u" role="1tU5fm">
         <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
       </node>
     </node>
+    <node concept="312cEg" id="61G6TdBAens" role="jymVt">
+      <property role="TrG5h" value="macroProcessing" />
+      <node concept="3Tm6S6" id="61G6TdBAent" role="1B3o_S" />
+      <node concept="3uibUv" id="61G6TdBAenv" role="1tU5fm">
+        <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+      </node>
+    </node>
     <node concept="312cEg" id="6nFpYluqFen" role="jymVt">
       <property role="TrG5h" value="rules" />
       <node concept="3Tmbuc" id="6nFpYlurNeP" role="1B3o_S" />
@@ -2123,9 +2231,9 @@
                               <node concept="3clFbF" id="1laj_RSBzxu" role="3cqZAp">
                                 <node concept="1rXfSq" id="1laj_RSBzxt" role="3clFbG">
                                   <ref role="37wK5l" node="1laj_RSAZoB" resolve="addReportItem" />
-                                  <node concept="2YIFZM" id="1laj_RSB$EM" role="37wK5m">
-                                    <ref role="37wK5l" to="hano:3o9wrC3WoA4" resolve="severityToStatus" />
-                                    <ref role="1Pybhc" to="hano:3o9wrC3s0ii" resolve="DefaultSupervisor" />
+                                  <node concept="2YIFZM" id="61G6TdBzHQF" role="37wK5m">
+                                    <ref role="37wK5l" to="cxk7:3o9wrC3WoA4" resolve="severityToStatus" />
+                                    <ref role="1Pybhc" to="cxk7:61G6TdBsGY8" resolve="FeedbackUtil" />
                                     <node concept="2OqwBi" id="1laj_RSBA2L" role="37wK5m">
                                       <node concept="37vLTw" id="1laj_RSB_E8" role="2Oq$k0">
                                         <ref role="3cqZAo" node="6RN9TdHnZx2" resolve="feedback" />
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index 72b96705..aaa79211 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -37,6 +37,7 @@
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -995,6 +996,77 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="61G6TdBEzDd" role="3cqZAp" />
+          <node concept="3cpWs8" id="61G6TdBDyzK" role="3cqZAp">
+            <node concept="3cpWsn" id="61G6TdBDyzL" role="3cpWs9">
+              <property role="TrG5h" value="macroProcessing" />
+              <node concept="3uibUv" id="61G6TdBDyzJ" role="1tU5fm">
+                <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+              </node>
+              <node concept="2ShNRf" id="61G6TdBDyzM" role="33vP2m">
+                <node concept="YeOm9" id="61G6TdBDyzN" role="2ShVmc">
+                  <node concept="1Y3b0j" id="61G6TdBDyzO" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+                    <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                    <node concept="3Tm1VV" id="61G6TdBDyzP" role="1B3o_S" />
+                    <node concept="37vLTw" id="61G6TdBDyzQ" role="37wK5m">
+                      <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                    </node>
+                    <node concept="2OqwBi" id="61G6TdBDyzR" role="37wK5m">
+                      <node concept="37vLTw" id="61G6TdBDyzS" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
+                      </node>
+                      <node concept="liA8E" id="61G6TdBDyzT" role="2OqNvi">
+                        <ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
+                      </node>
+                    </node>
+                    <node concept="3clFb_" id="61G6TdBDyzU" role="jymVt">
+                      <property role="TrG5h" value="provideFeedback" />
+                      <node concept="37vLTG" id="61G6TdBDyzV" role="3clF46">
+                        <property role="TrG5h" value="feedback" />
+                        <node concept="3uibUv" id="61G6TdBE_pW" role="1tU5fm">
+                          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                        </node>
+                      </node>
+                      <node concept="3cqZAl" id="61G6TdBDyzX" role="3clF45" />
+                      <node concept="3Tm1VV" id="61G6TdBDyzY" role="1B3o_S" />
+                      <node concept="3clFbS" id="61G6TdBDyzZ" role="3clF47">
+                        <node concept="3SKdUt" id="61G6TdBDy$0" role="3cqZAp">
+                          <node concept="1PaTwC" id="61G6TdBDy$1" role="1aUNEU">
+                            <node concept="3oM_SD" id="61G6TdBDy$2" role="1PaTwD">
+                              <property role="3oM_SC" value="FIXME" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$3" role="1PaTwD">
+                              <property role="3oM_SC" value="provide" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$4" role="1PaTwD">
+                              <property role="3oM_SC" value="appropriate" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$5" role="1PaTwD">
+                              <property role="3oM_SC" value="reporting" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$6" role="1PaTwD">
+                              <property role="3oM_SC" value="for" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$7" role="1PaTwD">
+                              <property role="3oM_SC" value="typechecking" />
+                            </node>
+                            <node concept="3oM_SD" id="61G6TdBDy$8" role="1PaTwD">
+                              <property role="3oM_SC" value="errors" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2AHcQZ" id="61G6TdBDy$9" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbH" id="6nFpYluojwy" role="3cqZAp" />
           <node concept="3clFbF" id="7WKNeR8TcXy" role="3cqZAp">
             <node concept="2OqwBi" id="7WKNeR8TcXz" role="3clFbG">
@@ -1008,6 +1080,9 @@
                     <node concept="37vLTw" id="6nFpYluoru8" role="37wK5m">
                       <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
                     </node>
+                    <node concept="37vLTw" id="61G6TdBE_4P" role="37wK5m">
+                      <ref role="3cqZAo" node="61G6TdBDyzL" resolve="macroProcessing" />
+                    </node>
                     <node concept="2OqwBi" id="7WKNeR8TcXG" role="37wK5m">
                       <node concept="Xjq3P" id="7WKNeR8TcXH" role="2Oq$k0" />
                       <node concept="2OwXpG" id="78H58oeuh1v" role="2OqNvi">
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 8319dce9..6a85526e 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
@@ -27,6 +27,8 @@
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -2100,6 +2102,20 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5itBwM7VoD8" role="jymVt" />
+    <node concept="3clFb_" id="61G6TdBpSf1" role="jymVt">
+      <property role="TrG5h" value="provideFeedback" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
+        <property role="TrG5h" value="feedback" />
+        <node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="61G6TdBpSf3" role="3clF45" />
+      <node concept="3Tm1VV" id="61G6TdBpSf4" role="1B3o_S" />
+      <node concept="3clFbS" id="61G6TdBpSf5" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="61G6TdBpQuz" role="jymVt" />
     <node concept="3clFb_" id="7DvO2M9IiMh" role="jymVt">
       <property role="TrG5h" value="putParameter" />
       <node concept="37vLTG" id="7DvO2M9IiMi" role="3clF46">
@@ -2435,7 +2451,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="6EY0p2w8wEJ" role="jymVt" />
     <node concept="312cEg" id="7DvO2M9IiOO" role="jymVt">
       <property role="TrG5h" value="requireHooks" />
       <node concept="3Tmbuc" id="7DvO2Ma1fZX" role="1B3o_S" />
@@ -2459,7 +2474,6 @@
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
     </node>
-    <node concept="2tJIrI" id="4vBwiiV6bol" role="jymVt" />
     <node concept="3Tm1VV" id="18kNIl1vDQ0" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="7nPD14OaO1O">