From 43297ce5c67754ae4b7d2e9883e14d563657ccc4 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Tue, 14 Apr 2020 16:32:27 +0300
Subject: [PATCH] Separate logic of being able to report feedback from handling
 it (i.e. recovering from failure), fixes MPSCR-57

Also rename ruleTag param in feedback methods to 'feedbackKey', what it really is.
feedbackKey is used in TypesCache internal ReportItem map as a key.
---
 .../jetbrains.mps.lang.coderules.eval.mps     | 945 ++++++++++--------
 ...s.mps.coderules.typechecking.test.util.mps | 364 +++----
 ...rains.mps.coderules.typechecking@tests.mps |  49 +-
 ...ins.mps.coderules.typechecking.service.mps |   4 +-
 .../models/service.mps                        |  91 +-
 .../models/service.mps                        |   2 +-
 6 files changed, 735 insertions(+), 720 deletions(-)

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 41f24a9f..51067494 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
@@ -8968,96 +8968,33 @@
   </node>
   <node concept="312cEu" id="3o9wrC3sa$h">
     <property role="TrG5h" value="FeedbackReportingSupervisor" />
-    <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="3o9wrC3sdlb" role="jymVt" />
     <node concept="3clFbW" id="3o9wrC3sC_c" role="jymVt">
       <node concept="37vLTG" id="3o9wrC3sDaO" role="3clF46">
-        <property role="TrG5h" value="program" />
-        <node concept="3uibUv" id="3o9wrC3sDdL" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+        <property role="TrG5h" value="feedbackConsumer" />
+        <node concept="3uibUv" id="6RN9TdHnmNZ" role="1tU5fm">
+          <ref role="3uigEE" node="6RN9TdHmQLy" resolve="FeedbackConsumer" />
         </node>
       </node>
       <node concept="3cqZAl" id="3o9wrC3sC_e" role="3clF45" />
       <node concept="3Tm1VV" id="3o9wrC3sC_f" role="1B3o_S" />
       <node concept="3clFbS" id="3o9wrC3sC_g" role="3clF47">
-        <node concept="3clFbJ" id="3o9wrC3sGiI" role="3cqZAp">
-          <node concept="3clFbS" id="3o9wrC3sGiJ" role="3clFbx">
-            <node concept="3clFbF" id="3o9wrC3sGiR" role="3cqZAp">
-              <node concept="37vLTI" id="3mytCjY$2Nx" role="3clFbG">
-                <node concept="2OqwBi" id="3mytCjY$3bB" role="37vLTJ">
-                  <node concept="Xjq3P" id="3mytCjY$3cQ" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="3mytCjY$3bE" role="2OqNvi">
-                    <ref role="2Oxat5" node="3o9wrC3sdyr" resolve="originIndex" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="3o9wrC3sGiV" role="37vLTx">
-                  <node concept="1eOMI4" id="3mytCjY$8AZ" role="2Oq$k0">
-                    <node concept="10QFUN" id="3mytCjY$8B0" role="1eOMHV">
-                      <node concept="3uibUv" id="3mytCjY$8B1" role="10QFUM">
-                        <ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="CodeRulesProgram" />
-                      </node>
-                      <node concept="37vLTw" id="3mytCjY$8B2" role="10QFUP">
-                        <ref role="3cqZAo" node="3o9wrC3sDaO" resolve="program" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3o9wrC3sGiX" role="2OqNvi">
-                    <ref role="37wK5l" to="ksgm:70Wv0dJiKW2" resolve="originIndex" />
-                  </node>
-                </node>
-              </node>
+        <node concept="3clFbF" id="6RN9TdHno3P" role="3cqZAp">
+          <node concept="37vLTI" id="6RN9TdHnoD7" role="3clFbG">
+            <node concept="37vLTw" id="6RN9TdHnoIu" role="37vLTx">
+              <ref role="3cqZAo" node="3o9wrC3sDaO" resolve="feedbackConsumer" />
             </node>
-            <node concept="3clFbH" id="3mytCjY$38z" role="3cqZAp" />
-          </node>
-          <node concept="2ZW3vV" id="3o9wrC3sGiY" role="3clFbw">
-            <node concept="3uibUv" id="3o9wrC3sGiZ" role="2ZW6by">
-              <ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="CodeRulesProgram" />
-            </node>
-            <node concept="37vLTw" id="3o9wrC3sGj0" role="2ZW6bz">
-              <ref role="3cqZAo" node="3o9wrC3sDaO" resolve="program" />
-            </node>
-          </node>
-          <node concept="9aQIb" id="3mytCjY$34v" role="9aQIa">
-            <node concept="3clFbS" id="3mytCjY$34w" role="9aQI4">
-              <node concept="3clFbF" id="3mytCjY$3qW" role="3cqZAp">
-                <node concept="37vLTI" id="3mytCjY$44O" role="3clFbG">
-                  <node concept="10Nm6u" id="3mytCjY$485" role="37vLTx" />
-                  <node concept="2OqwBi" id="3mytCjY$3DC" role="37vLTJ">
-                    <node concept="Xjq3P" id="3mytCjY$3qV" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="3mytCjY$3S$" role="2OqNvi">
-                      <ref role="2Oxat5" node="3o9wrC3sdyr" resolve="originIndex" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3o9wrC3sJMD" role="3cqZAp" />
-        <node concept="3clFbF" id="3o9wrC3tKav" role="3cqZAp">
-          <node concept="37vLTI" id="3o9wrC3tKS$" role="3clFbG">
-            <node concept="2OqwBi" id="3o9wrC3tKo1" role="37vLTJ">
-              <node concept="Xjq3P" id="3o9wrC3tKat" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3o9wrC3tK$H" role="2OqNvi">
-                <ref role="2Oxat5" node="3o9wrC3sf7p" resolve="mainSymbol" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="3o9wrC3sJQp" role="37vLTx">
-              <node concept="1pGfFk" id="3o9wrC3sJQq" role="2ShVmc">
-                <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
-                <node concept="Xl_RD" id="3o9wrC3sJQr" role="37wK5m">
-                  <property role="Xl_RC" value="main" />
-                </node>
-                <node concept="3cmrfG" id="3o9wrC3sJQs" role="37wK5m">
-                  <property role="3cmrfH" value="0" />
-                </node>
+            <node concept="2OqwBi" id="6RN9TdHnohz" role="37vLTJ">
+              <node concept="Xjq3P" id="6RN9TdHno3N" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6RN9TdHnotW" role="2OqNvi">
+                <ref role="2Oxat5" node="6RN9TdHnni_" resolve="feedbackConsumer" />
               </node>
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="3o9wrC3scoX" role="jymVt" />
+    <node concept="2tJIrI" id="6RN9TdHnpyt" role="jymVt" />
     <node concept="3clFb_" id="4jcOV4hNvgm" role="jymVt">
       <property role="TrG5h" value="handleFeedback" />
       <node concept="3Tm1VV" id="4jcOV4hNvgn" role="1B3o_S" />
@@ -9081,288 +9018,263 @@
         </node>
       </node>
       <node concept="3clFbS" id="4jcOV4hNvgu" role="3clF47">
-        <node concept="3clFbJ" id="3mytCjY$5bz" role="3cqZAp">
-          <node concept="3clFbS" id="3mytCjY$5bP" role="3clFbx">
-            <node concept="3clFbJ" id="1laj_RSiIHM" role="3cqZAp">
-              <node concept="3clFbS" id="1laj_RSiIHO" role="3clFbx">
-                <node concept="3cpWs8" id="1laj_RSiJwR" role="3cqZAp">
-                  <node concept="3cpWsn" id="1laj_RSiJwS" role="3cpWs9">
-                    <property role="TrG5h" value="rule" />
-                    <node concept="3uibUv" id="1laj_RSiJwx" role="1tU5fm">
-                      <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
-                    </node>
-                    <node concept="1eOMI4" id="1laj_RSiJwT" role="33vP2m">
-                      <node concept="10QFUN" id="1laj_RSiJwU" role="1eOMHV">
-                        <node concept="3uibUv" id="1laj_RSiJwV" role="10QFUM">
-                          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
-                        </node>
-                        <node concept="2OqwBi" id="1laj_RSiJy7" role="10QFUP">
-                          <node concept="37vLTw" id="1laj_RSiJy8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="ruleMatch" />
-                          </node>
-                          <node concept="liA8E" id="1laj_RSiJy9" role="2OqNvi">
-                            <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="5jKpGcQ_efd" role="3cqZAp">
-                  <node concept="3cpWsn" id="5jKpGcQ_efe" role="3cpWs9">
-                    <property role="TrG5h" value="pRuleTag" />
-                    <node concept="3uibUv" id="5jKpGcQ_eff" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                    </node>
-                    <node concept="2OqwBi" id="5jKpGcQ_mfH" role="33vP2m">
-                      <node concept="2OqwBi" id="5jKpGcQ_kRJ" role="2Oq$k0">
-                        <node concept="37vLTw" id="5jKpGcQ_nEC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5jKpGcQ$Zh8" resolve="parentPrincipalMatch" />
-                        </node>
-                        <node concept="liA8E" id="5jKpGcQ_kRL" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5jKpGcQ_mPX" role="2OqNvi">
-                        <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="1laj_RSiRVQ" role="3cqZAp" />
-                <node concept="3cpWs8" id="1laj_RTMHGM" role="3cqZAp">
-                  <node concept="3cpWsn" id="1laj_RTMHGN" role="3cpWs9">
-                    <property role="TrG5h" value="targetRef" />
-                    <node concept="2sp9CU" id="1laj_RTZcRS" role="1tU5fm" />
-                    <node concept="10Nm6u" id="1laj_RTMLck" role="33vP2m" />
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="4ekZiHde4OA" role="3cqZAp">
-                  <node concept="3cpWsn" id="4ekZiHde4OB" role="3cpWs9">
-                    <property role="TrG5h" value="templateRef" />
-                    <node concept="2sp9CU" id="4ekZiHde56S" role="1tU5fm" />
-                    <node concept="10Nm6u" id="4ekZiHde6kq" role="33vP2m" />
-                  </node>
-                </node>
-                <node concept="3clFbH" id="4ekZiHdPXZz" role="3cqZAp" />
-                <node concept="3clFbJ" id="1laj_RTMLXY" role="3cqZAp">
-                  <node concept="3clFbS" id="1laj_RTMLY0" role="3clFbx">
-                    <node concept="3clFbF" id="1laj_RTMMMf" role="3cqZAp">
-                      <node concept="37vLTI" id="1laj_RTMMTg" role="3clFbG">
-                        <node concept="2OqwBi" id="4ekZiHddLIc" role="37vLTx">
-                          <node concept="1eOMI4" id="1laj_RTMMUV" role="2Oq$k0">
-                            <node concept="10QFUN" id="1laj_RTMMUS" role="1eOMHV">
-                              <node concept="3uibUv" id="4ekZiHddLrv" role="10QFUM">
-                                <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
-                              </node>
-                              <node concept="2OqwBi" id="1laj_RTMMUY" role="10QFUP">
-                                <node concept="37vLTw" id="1laj_RTMMUZ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
-                                </node>
-                                <node concept="liA8E" id="1laj_RTMMV0" role="2OqNvi">
-                                  <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="4ekZiHddLRK" role="2OqNvi">
-                            <ref role="37wK5l" to="cxk7:4ekZiHddjeb" resolve="getTarget" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="1laj_RTMMMd" role="37vLTJ">
-                          <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="4ekZiHde5kQ" role="3cqZAp">
-                      <node concept="37vLTI" id="4ekZiHde5kS" role="3clFbG">
-                        <node concept="2OqwBi" id="4ekZiHde4OC" role="37vLTx">
-                          <node concept="1eOMI4" id="4ekZiHde4OD" role="2Oq$k0">
-                            <node concept="10QFUN" id="4ekZiHde4OE" role="1eOMHV">
-                              <node concept="3uibUv" id="4ekZiHde4OF" role="10QFUM">
-                                <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
-                              </node>
-                              <node concept="2OqwBi" id="4ekZiHde4OG" role="10QFUP">
-                                <node concept="37vLTw" id="4ekZiHde4OH" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
-                                </node>
-                                <node concept="liA8E" id="4ekZiHde4OI" role="2OqNvi">
-                                  <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="4ekZiHde4OJ" role="2OqNvi">
-                            <ref role="37wK5l" to="cxk7:4ekZiHddjyV" resolve="getTemplate" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="4ekZiHde5kW" role="37vLTJ">
-                          <ref role="3cqZAo" node="4ekZiHde4OB" resolve="templateRef" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2ZW3vV" id="1laj_RTMMF0" role="3clFbw">
-                    <node concept="3uibUv" id="4ekZiHddLpG" role="2ZW6by">
-                      <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
-                    </node>
-                    <node concept="2OqwBi" id="1laj_RTMMt7" role="2ZW6bz">
-                      <node concept="37vLTw" id="1laj_RTMMiJ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
-                      </node>
-                      <node concept="liA8E" id="1laj_RTMM_M" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="4ekZiHdPUqd" role="3cqZAp" />
-                <node concept="3clFbJ" id="4ekZiHdPVwZ" role="3cqZAp">
-                  <node concept="3clFbS" id="4ekZiHdPVxb" role="3clFbx">
-                    <node concept="3clFbF" id="1laj_RTMJzh" role="3cqZAp">
-                      <node concept="37vLTI" id="1laj_RTMJ$u" role="3clFbG">
-                        <node concept="37vLTw" id="1laj_RTMJzf" role="37vLTJ">
-                          <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
-                        </node>
-                        <node concept="2OqwBi" id="1laj_RTMJJg" role="37vLTx">
-                          <node concept="37vLTw" id="1laj_RTMJ__" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
-                          </node>
-                          <node concept="liA8E" id="1laj_RTMJXt" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="targetRef" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="4ekZiHdRx4A" role="3cqZAp">
-                      <node concept="37vLTI" id="4ekZiHdRxeg" role="3clFbG">
-                        <node concept="2OqwBi" id="4ekZiHdRxpE" role="37vLTx">
-                          <node concept="37vLTw" id="4ekZiHdRxfb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
-                          </node>
-                          <node concept="liA8E" id="4ekZiHdRxy4" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:7nPD14Ob4lt" resolve="templateRef" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="4ekZiHdRx4$" role="37vLTJ">
-                          <ref role="3cqZAo" node="4ekZiHde4OB" resolve="templateRef" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbC" id="4ekZiHdPVXM" role="3clFbw">
-                    <node concept="10Nm6u" id="4ekZiHdPVYw" role="3uHU7w" />
-                    <node concept="37vLTw" id="4ekZiHdPVcE" role="3uHU7B">
-                      <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="1laj_RTMOO6" role="3cqZAp" />
-                <node concept="3clFbJ" id="4jcOV4hNvEG" role="3cqZAp">
-                  <node concept="3clFbS" id="4jcOV4hNvEH" role="3clFbx">
-                    <node concept="3clFbH" id="1laj_RSiQpq" role="3cqZAp" />
-                    <node concept="3SKdUt" id="4jcOV4hNvF_" role="3cqZAp">
-                      <node concept="1PaTwC" id="589APehYxNF" role="3ndbpf">
-                        <node concept="3oM_SD" id="589APehYxNG" role="1PaTwD">
-                          <property role="3oM_SC" value="stop" />
-                        </node>
-                        <node concept="3oM_SD" id="589APehYxNH" role="1PaTwD">
-                          <property role="3oM_SC" value="the" />
-                        </node>
-                        <node concept="3oM_SD" id="589APehYxNI" role="1PaTwD">
-                          <property role="3oM_SC" value="error" />
-                        </node>
-                        <node concept="3oM_SD" id="589APehYxNJ" role="1PaTwD">
-                          <property role="3oM_SC" value="from" />
-                        </node>
-                        <node concept="3oM_SD" id="589APehYxNK" role="1PaTwD">
-                          <property role="3oM_SC" value="being" />
-                        </node>
-                        <node concept="3oM_SD" id="589APehYxNL" role="1PaTwD">
-                          <property role="3oM_SC" value="propagated," />
-                        </node>
-                        <node concept="3oM_SD" id="589APehYxNM" role="1PaTwD">
-                          <property role="3oM_SC" value="enable" />
-                        </node>
-                        <node concept="3oM_SD" id="589APehYxNN" role="1PaTwD">
-                          <property role="3oM_SC" value="recover" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="1laj_RSAJ6H" role="3cqZAp">
-                      <node concept="1rXfSq" id="1laj_RSAJ6F" role="3clFbG">
-                        <ref role="37wK5l" node="1laj_RSAF6R" resolve="consumeFeedback" />
-                        <node concept="37vLTw" id="4ekZiHde6su" role="37wK5m">
-                          <ref role="3cqZAo" node="4ekZiHde4OB" resolve="templateRef" />
-                        </node>
-                        <node concept="37vLTw" id="5jKpGcQ_rKR" role="37wK5m">
-                          <ref role="3cqZAo" node="5jKpGcQ_efe" resolve="pRuleTag" />
-                        </node>
-                        <node concept="37vLTw" id="1laj_RTMHGS" role="37wK5m">
-                          <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
-                        </node>
-                        <node concept="37vLTw" id="1laj_RSAJZc" role="37wK5m">
-                          <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="4jcOV4hN_30" role="3cqZAp" />
-                    <node concept="3cpWs6" id="4jcOV4hNvFS" role="3cqZAp">
-                      <node concept="3clFbT" id="4jcOV4hND48" role="3cqZAk">
-                        <property role="3clFbU" value="true" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1Wc70l" id="1laj_RSiUGw" role="3clFbw">
-                    <node concept="3y3z36" id="4jcOV4hNvG8" role="3uHU7B">
-                      <node concept="37vLTw" id="1laj_RTMHGR" role="3uHU7B">
-                        <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
-                      </node>
-                      <node concept="10Nm6u" id="4jcOV4hNvG9" role="3uHU7w" />
-                    </node>
-                    <node concept="1eOMI4" id="1laj_RSiVqN" role="3uHU7w">
-                      <node concept="22lmx$" id="1laj_RSiVqO" role="1eOMHV">
-                        <node concept="1rXfSq" id="1laj_RSiVqP" role="3uHU7w">
-                          <ref role="37wK5l" node="1laj_RSiGQN" resolve="isOnStart" />
-                          <node concept="37vLTw" id="1laj_RSiVqQ" role="37wK5m">
-                            <ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="1laj_RSiVqR" role="3uHU7B">
-                          <node concept="37vLTw" id="3mytCjY$75c" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3o9wrC3sdyr" resolve="originIndex" />
-                          </node>
-                          <node concept="liA8E" id="1laj_RSiVqT" role="2OqNvi">
-                            <ref role="37wK5l" to="ksgm:70Wv0dJhQbd" resolve="isValidTarget" />
-                            <node concept="37vLTw" id="1laj_RTMHGT" role="37wK5m">
-                              <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2ZW3vV" id="1laj_RSiJjE" role="3clFbw">
-                <node concept="3uibUv" id="1laj_RSiJvv" role="2ZW6by">
+        <node concept="3clFbJ" id="1laj_RSiIHM" role="3cqZAp">
+          <node concept="3clFbS" id="1laj_RSiIHO" role="3clFbx">
+            <node concept="3cpWs8" id="1laj_RSiJwR" role="3cqZAp">
+              <node concept="3cpWsn" id="1laj_RSiJwS" role="3cpWs9">
+                <property role="TrG5h" value="rule" />
+                <node concept="3uibUv" id="1laj_RSiJwx" role="1tU5fm">
                   <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
                 </node>
-                <node concept="2OqwBi" id="1laj_RSiJ2d" role="2ZW6bz">
-                  <node concept="37vLTw" id="1laj_RSiJ2e" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="ruleMatch" />
-                  </node>
-                  <node concept="liA8E" id="1laj_RSiJ2f" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
+                <node concept="1eOMI4" id="1laj_RSiJwT" role="33vP2m">
+                  <node concept="10QFUN" id="1laj_RSiJwU" role="1eOMHV">
+                    <node concept="3uibUv" id="1laj_RSiJwV" role="10QFUM">
+                      <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                    </node>
+                    <node concept="2OqwBi" id="1laj_RSiJy7" role="10QFUP">
+                      <node concept="37vLTw" id="1laj_RSiJy8" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="ruleMatch" />
+                      </node>
+                      <node concept="liA8E" id="1laj_RSiJy9" role="2OqNvi">
+                        <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3cpWs8" id="5jKpGcQ_efd" role="3cqZAp">
+              <node concept="3cpWsn" id="5jKpGcQ_efe" role="3cpWs9">
+                <property role="TrG5h" value="pRuleTag" />
+                <node concept="3uibUv" id="5jKpGcQ_eff" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="2OqwBi" id="5jKpGcQ_mfH" role="33vP2m">
+                  <node concept="2OqwBi" id="5jKpGcQ_kRJ" role="2Oq$k0">
+                    <node concept="37vLTw" id="5jKpGcQ_nEC" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5jKpGcQ$Zh8" resolve="parentPrincipalMatch" />
+                    </node>
+                    <node concept="liA8E" id="5jKpGcQ_kRL" role="2OqNvi">
+                      <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="5jKpGcQ_mPX" role="2OqNvi">
+                    <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="1laj_RSiRVQ" role="3cqZAp" />
+            <node concept="3cpWs8" id="1laj_RTMHGM" role="3cqZAp">
+              <node concept="3cpWsn" id="1laj_RTMHGN" role="3cpWs9">
+                <property role="TrG5h" value="targetRef" />
+                <node concept="2sp9CU" id="1laj_RTZcRS" role="1tU5fm" />
+                <node concept="10Nm6u" id="1laj_RTMLck" role="33vP2m" />
+              </node>
+            </node>
+            <node concept="3cpWs8" id="4ekZiHde4OA" role="3cqZAp">
+              <node concept="3cpWsn" id="4ekZiHde4OB" role="3cpWs9">
+                <property role="TrG5h" value="templateRef" />
+                <node concept="2sp9CU" id="4ekZiHde56S" role="1tU5fm" />
+                <node concept="10Nm6u" id="4ekZiHde6kq" role="33vP2m" />
+              </node>
+            </node>
+            <node concept="3clFbH" id="4ekZiHdPXZz" role="3cqZAp" />
+            <node concept="3clFbJ" id="1laj_RTMLXY" role="3cqZAp">
+              <node concept="3clFbS" id="1laj_RTMLY0" role="3clFbx">
+                <node concept="3clFbF" id="1laj_RTMMMf" role="3cqZAp">
+                  <node concept="37vLTI" id="1laj_RTMMTg" role="3clFbG">
+                    <node concept="2OqwBi" id="4ekZiHddLIc" role="37vLTx">
+                      <node concept="1eOMI4" id="1laj_RTMMUV" role="2Oq$k0">
+                        <node concept="10QFUN" id="1laj_RTMMUS" role="1eOMHV">
+                          <node concept="3uibUv" id="4ekZiHddLrv" role="10QFUM">
+                            <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                          </node>
+                          <node concept="2OqwBi" id="1laj_RTMMUY" role="10QFUP">
+                            <node concept="37vLTw" id="1laj_RTMMUZ" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
+                            </node>
+                            <node concept="liA8E" id="1laj_RTMMV0" role="2OqNvi">
+                              <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="4ekZiHddLRK" role="2OqNvi">
+                        <ref role="37wK5l" to="cxk7:4ekZiHddjeb" resolve="getTarget" />
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="1laj_RTMMMd" role="37vLTJ">
+                      <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="4ekZiHde5kQ" role="3cqZAp">
+                  <node concept="37vLTI" id="4ekZiHde5kS" role="3clFbG">
+                    <node concept="2OqwBi" id="4ekZiHde4OC" role="37vLTx">
+                      <node concept="1eOMI4" id="4ekZiHde4OD" role="2Oq$k0">
+                        <node concept="10QFUN" id="4ekZiHde4OE" role="1eOMHV">
+                          <node concept="3uibUv" id="4ekZiHde4OF" role="10QFUM">
+                            <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                          </node>
+                          <node concept="2OqwBi" id="4ekZiHde4OG" role="10QFUP">
+                            <node concept="37vLTw" id="4ekZiHde4OH" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
+                            </node>
+                            <node concept="liA8E" id="4ekZiHde4OI" role="2OqNvi">
+                              <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="4ekZiHde4OJ" role="2OqNvi">
+                        <ref role="37wK5l" to="cxk7:4ekZiHddjyV" resolve="getTemplate" />
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="4ekZiHde5kW" role="37vLTJ">
+                      <ref role="3cqZAo" node="4ekZiHde4OB" resolve="templateRef" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2ZW3vV" id="1laj_RTMMF0" role="3clFbw">
+                <node concept="3uibUv" id="4ekZiHddLpG" role="2ZW6by">
+                  <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                </node>
+                <node concept="2OqwBi" id="1laj_RTMMt7" role="2ZW6bz">
+                  <node concept="37vLTw" id="1laj_RTMMiJ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
+                  </node>
+                  <node concept="liA8E" id="1laj_RTMM_M" role="2OqNvi">
+                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="4ekZiHdPUqd" role="3cqZAp" />
+            <node concept="3clFbJ" id="4ekZiHdPVwZ" role="3cqZAp">
+              <node concept="3clFbS" id="4ekZiHdPVxb" role="3clFbx">
+                <node concept="3clFbF" id="1laj_RTMJzh" role="3cqZAp">
+                  <node concept="37vLTI" id="1laj_RTMJ$u" role="3clFbG">
+                    <node concept="37vLTw" id="1laj_RTMJzf" role="37vLTJ">
+                      <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
+                    </node>
+                    <node concept="2OqwBi" id="1laj_RTMJJg" role="37vLTx">
+                      <node concept="37vLTw" id="1laj_RTMJ__" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
+                      </node>
+                      <node concept="liA8E" id="1laj_RTMJXt" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="targetRef" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="4ekZiHdRx4A" role="3cqZAp">
+                  <node concept="37vLTI" id="4ekZiHdRxeg" role="3clFbG">
+                    <node concept="2OqwBi" id="4ekZiHdRxpE" role="37vLTx">
+                      <node concept="37vLTw" id="4ekZiHdRxfb" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
+                      </node>
+                      <node concept="liA8E" id="4ekZiHdRxy4" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:7nPD14Ob4lt" resolve="templateRef" />
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="4ekZiHdRx4$" role="37vLTJ">
+                      <ref role="3cqZAo" node="4ekZiHde4OB" resolve="templateRef" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbC" id="4ekZiHdPVXM" role="3clFbw">
+                <node concept="10Nm6u" id="4ekZiHdPVYw" role="3uHU7w" />
+                <node concept="37vLTw" id="4ekZiHdPVcE" role="3uHU7B">
+                  <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="1laj_RTMOO6" role="3cqZAp" />
+            <node concept="3clFbJ" id="4jcOV4hNvEG" role="3cqZAp">
+              <node concept="3clFbS" id="4jcOV4hNvEH" role="3clFbx">
+                <node concept="3clFbH" id="5rVYEA66yoJ" role="3cqZAp" />
+                <node concept="3clFbF" id="6RN9TdHnrzY" role="3cqZAp">
+                  <node concept="2OqwBi" id="6RN9TdHnrTu" role="3clFbG">
+                    <node concept="37vLTw" id="6RN9TdHnrzW" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6RN9TdHnni_" resolve="feedbackConsumer" />
+                    </node>
+                    <node concept="liA8E" id="6RN9TdHns3m" role="2OqNvi">
+                      <ref role="37wK5l" node="1laj_RSC3bs" resolve="consumeFeedback" />
+                      <node concept="37vLTw" id="6RN9TdHns9Z" role="37wK5m">
+                        <ref role="3cqZAo" node="4ekZiHde4OB" resolve="templateRef" />
+                      </node>
+                      <node concept="37vLTw" id="5rVYEA6lTv5" role="37wK5m">
+                        <ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
+                      </node>
+                      <node concept="37vLTw" id="6RN9TdHnshf" role="37wK5m">
+                        <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
+                      </node>
+                      <node concept="37vLTw" id="6RN9TdHnsmM" role="37wK5m">
+                        <ref role="3cqZAo" node="4jcOV4hNvgs" resolve="feedback" />
+                      </node>
+                      <node concept="37vLTw" id="5rVYEA6lTE$" role="37wK5m">
+                        <ref role="3cqZAo" node="5jKpGcQ_efe" resolve="pRuleTag" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="5rVYEA66xGb" role="3cqZAp" />
+                <node concept="3SKdUt" id="4jcOV4hNvF_" role="3cqZAp">
+                  <node concept="1PaTwC" id="589APehYxNF" role="3ndbpf">
+                    <node concept="3oM_SD" id="589APehYxNG" role="1PaTwD">
+                      <property role="3oM_SC" value="stop" />
+                    </node>
+                    <node concept="3oM_SD" id="589APehYxNH" role="1PaTwD">
+                      <property role="3oM_SC" value="the" />
+                    </node>
+                    <node concept="3oM_SD" id="589APehYxNI" role="1PaTwD">
+                      <property role="3oM_SC" value="error" />
+                    </node>
+                    <node concept="3oM_SD" id="589APehYxNJ" role="1PaTwD">
+                      <property role="3oM_SC" value="from" />
+                    </node>
+                    <node concept="3oM_SD" id="589APehYxNK" role="1PaTwD">
+                      <property role="3oM_SC" value="being" />
+                    </node>
+                    <node concept="3oM_SD" id="589APehYxNL" role="1PaTwD">
+                      <property role="3oM_SC" value="propagated," />
+                    </node>
+                    <node concept="3oM_SD" id="589APehYxNM" role="1PaTwD">
+                      <property role="3oM_SC" value="enable" />
+                    </node>
+                    <node concept="3oM_SD" id="589APehYxNN" role="1PaTwD">
+                      <property role="3oM_SC" value="recover" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs6" id="4jcOV4hNvFS" role="3cqZAp">
+                  <node concept="3clFbT" id="4jcOV4hND48" role="3cqZAk">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="4jcOV4hNvG8" role="3clFbw">
+                <node concept="37vLTw" id="1laj_RTMHGR" role="3uHU7B">
+                  <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
+                </node>
+                <node concept="10Nm6u" id="4jcOV4hNvG9" role="3uHU7w" />
+              </node>
+            </node>
           </node>
-          <node concept="3y3z36" id="3mytCjY$4l2" role="3clFbw">
-            <node concept="10Nm6u" id="3mytCjY$4l3" role="3uHU7w" />
-            <node concept="37vLTw" id="3mytCjY$4l4" role="3uHU7B">
-              <ref role="3cqZAo" node="3o9wrC3sdyr" resolve="originIndex" />
+          <node concept="2ZW3vV" id="1laj_RSiJjE" role="3clFbw">
+            <node concept="3uibUv" id="1laj_RSiJvv" role="2ZW6by">
+              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            </node>
+            <node concept="2OqwBi" id="1laj_RSiJ2d" role="2ZW6bz">
+              <node concept="37vLTw" id="1laj_RSiJ2e" role="2Oq$k0">
+                <ref role="3cqZAo" node="4jcOV4hNvgq" resolve="ruleMatch" />
+              </node>
+              <node concept="liA8E" id="1laj_RSiJ2f" role="2OqNvi">
+                <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
+              </node>
             </node>
           </node>
         </node>
@@ -9375,33 +9287,291 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="1laj_RSAEvo" role="jymVt" />
-    <node concept="3clFb_" id="1laj_RSAF6R" role="jymVt">
-      <property role="TrG5h" value="consumeFeedback" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="4ekZiHddUGX" role="3clF46">
-        <property role="TrG5h" value="template" />
-        <node concept="2sp9CU" id="4ekZiHddVim" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5b5WPl4OLex" role="3clF46">
-        <property role="TrG5h" value="ruleTag" />
-        <node concept="3uibUv" id="5b5WPl4OMLj" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+    <node concept="2tJIrI" id="3o9wrC3sbje" role="jymVt" />
+    <node concept="3Tm1VV" id="3o9wrC3sa$i" role="1B3o_S" />
+    <node concept="3uibUv" id="3o9wrC3saA3" role="1zkMxy">
+      <ref role="3uigEE" node="3o9wrC3s0ii" resolve="DefaultSupervisor" />
+    </node>
+    <node concept="3UR2Jj" id="3mytCjY$O2g" role="lGtFl">
+      <node concept="TZ5HA" id="3mytCjY$O2h" role="TZ5H$">
+        <node concept="1dT_AC" id="3mytCjY$O2i" role="1dT_Ay">
+          <property role="1dT_AB" value="A supervisor that processes feedback from program evaluation and forwards/consumes it. " />
         </node>
       </node>
-      <node concept="37vLTG" id="1laj_RSAHJl" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="2sp9CU" id="1laj_RSAI0P" role="1tU5fm" />
+      <node concept="TZ5HA" id="3mytCjY$Ox0" role="TZ5H$">
+        <node concept="1dT_AC" id="3mytCjY$Ox1" role="1dT_Ay">
+          <property role="1dT_AB" value="Uses " />
+        </node>
+        <node concept="1dT_AA" id="3mytCjY_05q" role="1dT_Ay">
+          <node concept="92FcH" id="3mytCjY_05V" role="qph3F">
+            <node concept="TZ5HA" id="3mytCjY_05X" role="2XjZqd" />
+            <node concept="VXe08" id="3mytCjY_1b$" role="92FcQ">
+              <ref role="VXe09" to="ksgm:70Wv0dJhQb2" resolve="OriginIndex" />
+            </node>
+          </node>
+        </node>
+        <node concept="1dT_AC" id="3mytCjY_05p" role="1dT_Ay">
+          <property role="1dT_AB" value=" in order to decide which nodes to report feedback on. " />
+        </node>
       </node>
-      <node concept="37vLTG" id="1laj_RSAI4S" role="3clF46">
+    </node>
+    <node concept="312cEg" id="6RN9TdHnni_" role="jymVt">
+      <property role="TrG5h" value="feedbackConsumer" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="6RN9TdHnmT6" role="1B3o_S" />
+      <node concept="3uibUv" id="6RN9TdHnnaO" role="1tU5fm">
+        <ref role="3uigEE" node="6RN9TdHmQLy" resolve="FeedbackConsumer" />
+      </node>
+    </node>
+  </node>
+  <node concept="3HP615" id="6RN9TdHmQLy">
+    <property role="TrG5h" value="FeedbackConsumer" />
+    <node concept="3clFb_" id="1laj_RSC3bs" role="jymVt">
+      <property role="TrG5h" value="consumeFeedback" />
+      <node concept="37vLTG" id="4ekZiHdecEm" role="3clF46">
+        <property role="TrG5h" value="template" />
+        <node concept="2sp9CU" id="4ekZiHdedao" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="5rVYEA6lOcC" role="3clF46">
+        <property role="TrG5h" value="rule" />
+        <node concept="3uibUv" id="5rVYEA6lOhH" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1laj_RSC3bt" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="2sp9CU" id="1laj_RSC3bu" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1laj_RSC3bv" role="3clF46">
         <property role="TrG5h" value="feedback" />
-        <node concept="3uibUv" id="1laj_RSAIm_" role="1tU5fm">
+        <node concept="3uibUv" id="1laj_RSC3bw" role="1tU5fm">
           <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
         </node>
       </node>
-      <node concept="3cqZAl" id="1laj_RSAF6T" role="3clF45" />
-      <node concept="3Tmbuc" id="1laj_RSAFTC" role="1B3o_S" />
-      <node concept="3clFbS" id="1laj_RSAF6V" role="3clF47" />
+      <node concept="37vLTG" id="5b5WPl4Qdtu" role="3clF46">
+        <property role="TrG5h" value="feedbackKey" />
+        <node concept="3uibUv" id="5b5WPl4Qe15" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="1laj_RSC3bx" role="3clF45" />
+      <node concept="3Tmbuc" id="1laj_RSC3by" role="1B3o_S" />
+      <node concept="3clFbS" id="1laj_RSC3bz" role="3clF47" />
+    </node>
+    <node concept="3Tm1VV" id="6RN9TdHmQLz" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="6RN9TdHmQY0">
+    <property role="TrG5h" value="OriginScopeFeedbackConsumer" />
+    <node concept="2tJIrI" id="6RN9TdHmUhq" role="jymVt" />
+    <node concept="3clFbW" id="6RN9TdHmUdh" role="jymVt">
+      <node concept="3cqZAl" id="6RN9TdHmUdk" role="3clF45" />
+      <node concept="3clFbS" id="6RN9TdHmUdl" role="3clF47">
+        <node concept="3clFbJ" id="6RN9TdHmUzI" role="3cqZAp">
+          <node concept="3clFbS" id="6RN9TdHmUzJ" role="3clFbx">
+            <node concept="3clFbF" id="6RN9TdHmUzK" role="3cqZAp">
+              <node concept="37vLTI" id="6RN9TdHmUzL" role="3clFbG">
+                <node concept="2OqwBi" id="6RN9TdHmUzM" role="37vLTJ">
+                  <node concept="Xjq3P" id="6RN9TdHmUzN" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="6RN9TdHmUzO" role="2OqNvi">
+                    <ref role="2Oxat5" node="6RN9TdHmRTf" resolve="originIndex" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="6RN9TdHmUzP" role="37vLTx">
+                  <node concept="1eOMI4" id="6RN9TdHmUzQ" role="2Oq$k0">
+                    <node concept="10QFUN" id="6RN9TdHmUzR" role="1eOMHV">
+                      <node concept="3uibUv" id="6RN9TdHmUzS" role="10QFUM">
+                        <ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="CodeRulesProgram" />
+                      </node>
+                      <node concept="37vLTw" id="6RN9TdHmUzT" role="10QFUP">
+                        <ref role="3cqZAo" node="6RN9TdHmUoq" resolve="program" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="6RN9TdHmUzU" role="2OqNvi">
+                    <ref role="37wK5l" to="ksgm:70Wv0dJiKW2" resolve="originIndex" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="6RN9TdHmUzW" role="3clFbw">
+            <node concept="3uibUv" id="6RN9TdHmUzX" role="2ZW6by">
+              <ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="CodeRulesProgram" />
+            </node>
+            <node concept="37vLTw" id="6RN9TdHmUzY" role="2ZW6bz">
+              <ref role="3cqZAo" node="6RN9TdHmUoq" resolve="program" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="6RN9TdHmUzZ" role="9aQIa">
+            <node concept="3clFbS" id="6RN9TdHmU$0" role="9aQI4">
+              <node concept="3clFbF" id="6RN9TdHmU$1" role="3cqZAp">
+                <node concept="37vLTI" id="6RN9TdHmU$2" role="3clFbG">
+                  <node concept="10Nm6u" id="6RN9TdHmU$3" role="37vLTx" />
+                  <node concept="2OqwBi" id="6RN9TdHmU$4" role="37vLTJ">
+                    <node concept="Xjq3P" id="6RN9TdHmU$5" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="6RN9TdHmU$6" role="2OqNvi">
+                      <ref role="2Oxat5" node="6RN9TdHmRTf" resolve="originIndex" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5rVYEA6lVbU" role="3cqZAp">
+          <node concept="37vLTI" id="5rVYEA6lVbV" role="3clFbG">
+            <node concept="2OqwBi" id="5rVYEA6lVbW" role="37vLTJ">
+              <node concept="Xjq3P" id="5rVYEA6lVbX" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5rVYEA6lVbY" role="2OqNvi">
+                <ref role="2Oxat5" node="3o9wrC3sf7p" resolve="mainSymbol" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="5rVYEA6lVbZ" role="37vLTx">
+              <node concept="1pGfFk" id="5rVYEA6lVc0" role="2ShVmc">
+                <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
+                <node concept="Xl_RD" id="5rVYEA6lVc1" role="37wK5m">
+                  <property role="Xl_RC" value="main" />
+                </node>
+                <node concept="3cmrfG" id="5rVYEA6lVc2" role="37wK5m">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6RN9TdHmUds" role="1B3o_S" />
+      <node concept="37vLTG" id="6RN9TdHmUoq" role="3clF46">
+        <property role="TrG5h" value="program" />
+        <node concept="3uibUv" id="6RN9TdHmUop" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6RN9TdHmRfY" role="jymVt" />
+    <node concept="3Tm1VV" id="6RN9TdHmQY1" role="1B3o_S" />
+    <node concept="3uibUv" id="6RN9TdHmRhV" role="EKbjA">
+      <ref role="3uigEE" node="6RN9TdHmQLy" resolve="FeedbackConsumer" />
+    </node>
+    <node concept="3clFb_" id="6RN9TdHmRjh" role="jymVt">
+      <property role="TrG5h" value="consumeFeedback" />
+      <node concept="37vLTG" id="6RN9TdHmRji" role="3clF46">
+        <property role="TrG5h" value="template" />
+        <node concept="2sp9CU" id="6RN9TdHmRjj" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6RN9TdHmRjk" role="3clF46">
+        <property role="TrG5h" value="rule" />
+        <node concept="3uibUv" id="5rVYEA6lOTm" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6RN9TdHmRjm" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="2sp9CU" id="6RN9TdHmRjn" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6RN9TdHmRjo" role="3clF46">
+        <property role="TrG5h" value="feedback" />
+        <node concept="3uibUv" id="6RN9TdHmRjp" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5rVYEA6lP2E" role="3clF46">
+        <property role="TrG5h" value="feedbackKey" />
+        <node concept="3uibUv" id="5rVYEA6lPad" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6RN9TdHmRjq" role="3clF45" />
+      <node concept="3Tm1VV" id="6RN9TdHnltH" role="1B3o_S" />
+      <node concept="3clFbS" id="6RN9TdHmRjt" role="3clF47">
+        <node concept="3clFbH" id="5rVYEA6lXBc" role="3cqZAp" />
+        <node concept="3clFbJ" id="6RN9TdHmVcq" role="3cqZAp">
+          <node concept="3clFbS" id="6RN9TdHmVcr" role="3clFbx">
+            <node concept="3clFbF" id="6RN9TdHmVcB" role="3cqZAp">
+              <node concept="1rXfSq" id="6RN9TdHmVcC" role="3clFbG">
+                <ref role="37wK5l" node="6RN9TdHnlF0" resolve="consumeFeedbackImpl" />
+                <node concept="37vLTw" id="6RN9TdHnl3m" role="37wK5m">
+                  <ref role="3cqZAo" node="6RN9TdHmRji" resolve="template" />
+                </node>
+                <node concept="37vLTw" id="6RN9TdHnl6Q" role="37wK5m">
+                  <ref role="3cqZAo" node="6RN9TdHmRjk" resolve="rule" />
+                </node>
+                <node concept="37vLTw" id="6RN9TdHnlaw" role="37wK5m">
+                  <ref role="3cqZAo" node="6RN9TdHmRjm" resolve="target" />
+                </node>
+                <node concept="37vLTw" id="6RN9TdHmVcG" role="37wK5m">
+                  <ref role="3cqZAo" node="6RN9TdHmRjo" resolve="feedback" />
+                </node>
+                <node concept="37vLTw" id="5rVYEA6lQhS" role="37wK5m">
+                  <ref role="3cqZAo" node="5rVYEA6lP2E" resolve="feedbackKey" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="22lmx$" id="5rVYEA6lXsE" role="3clFbw">
+            <node concept="2OqwBi" id="6RN9TdHmVcS" role="3uHU7B">
+              <node concept="37vLTw" id="6RN9TdHmVcT" role="2Oq$k0">
+                <ref role="3cqZAo" node="6RN9TdHmRTf" resolve="originIndex" />
+              </node>
+              <node concept="liA8E" id="6RN9TdHmVcU" role="2OqNvi">
+                <ref role="37wK5l" to="ksgm:70Wv0dJhQbd" resolve="isValidTarget" />
+                <node concept="37vLTw" id="6RN9TdHnldT" role="37wK5m">
+                  <ref role="3cqZAo" node="6RN9TdHmRjm" resolve="target" />
+                </node>
+              </node>
+            </node>
+            <node concept="1rXfSq" id="1laj_RSiVqP" role="3uHU7w">
+              <ref role="37wK5l" node="1laj_RSiGQN" resolve="isOnStart" />
+              <node concept="37vLTw" id="1laj_RSiVqQ" role="37wK5m">
+                <ref role="3cqZAo" node="6RN9TdHmRjk" resolve="rule" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6RN9TdHmRju" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6RN9TdHnlzq" role="jymVt" />
+    <node concept="3clFb_" id="6RN9TdHnlF0" role="jymVt">
+      <property role="TrG5h" value="consumeFeedbackImpl" />
+      <node concept="37vLTG" id="6RN9TdHnlF1" role="3clF46">
+        <property role="TrG5h" value="template" />
+        <node concept="2sp9CU" id="6RN9TdHnlF2" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="5rVYEA6lPt_" role="3clF46">
+        <property role="TrG5h" value="rule" />
+        <node concept="3uibUv" id="5rVYEA6lPDO" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6RN9TdHnlF5" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="2sp9CU" id="6RN9TdHnlF6" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6RN9TdHnlF7" role="3clF46">
+        <property role="TrG5h" value="feedback" />
+        <node concept="3uibUv" id="6RN9TdHnlF8" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5rVYEA6lPWL" role="3clF46">
+        <property role="TrG5h" value="feedbackKey" />
+        <node concept="3uibUv" id="5rVYEA6lQ4W" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6RN9TdHnlF9" role="3clF45" />
+      <node concept="3Tmbuc" id="6RN9TdHmRjr" role="1B3o_S" />
+      <node concept="3clFbS" id="6RN9TdHnlFa" role="3clF47" />
+      <node concept="P$JXv" id="6RN9TdHofpd" role="lGtFl">
+        <node concept="TZ5HA" id="6RN9TdHofpe" role="TZ5H$">
+          <node concept="1dT_AC" id="6RN9TdHofpf" role="1dT_Ay">
+            <property role="1dT_AB" value="Override to get actual behavior" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="1laj_RSiHjF" role="jymVt" />
     <node concept="3clFb_" id="1laj_RSiGQN" role="jymVt">
@@ -9502,12 +9672,12 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="3o9wrC3sbje" role="jymVt" />
-    <node concept="312cEg" id="3o9wrC3sdyr" role="jymVt">
+    <node concept="2tJIrI" id="6RN9TdHnl$Q" role="jymVt" />
+    <node concept="312cEg" id="6RN9TdHmRTf" role="jymVt">
       <property role="TrG5h" value="originIndex" />
       <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="3o9wrC3sdys" role="1B3o_S" />
-      <node concept="3uibUv" id="3o9wrC3sdyv" role="1tU5fm">
+      <node concept="3Tm6S6" id="6RN9TdHmRgD" role="1B3o_S" />
+      <node concept="3uibUv" id="6RN9TdHmRh7" role="1tU5fm">
         <ref role="3uigEE" to="ksgm:70Wv0dJhQb2" resolve="OriginIndex" />
       </node>
     </node>
@@ -9519,33 +9689,6 @@
         <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
       </node>
     </node>
-    <node concept="3Tm1VV" id="3o9wrC3sa$i" role="1B3o_S" />
-    <node concept="3uibUv" id="3o9wrC3saA3" role="1zkMxy">
-      <ref role="3uigEE" node="3o9wrC3s0ii" resolve="DefaultSupervisor" />
-    </node>
-    <node concept="3UR2Jj" id="3mytCjY$O2g" role="lGtFl">
-      <node concept="TZ5HA" id="3mytCjY$O2h" role="TZ5H$">
-        <node concept="1dT_AC" id="3mytCjY$O2i" role="1dT_Ay">
-          <property role="1dT_AB" value="A supervisor that processes feedback from program evaluation and forwards/consumes it. " />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="3mytCjY$Ox0" role="TZ5H$">
-        <node concept="1dT_AC" id="3mytCjY$Ox1" role="1dT_Ay">
-          <property role="1dT_AB" value="Uses " />
-        </node>
-        <node concept="1dT_AA" id="3mytCjY_05q" role="1dT_Ay">
-          <node concept="92FcH" id="3mytCjY_05V" role="qph3F">
-            <node concept="TZ5HA" id="3mytCjY_05X" role="2XjZqd" />
-            <node concept="VXe08" id="3mytCjY_1b$" role="92FcQ">
-              <ref role="VXe09" to="ksgm:70Wv0dJhQb2" resolve="OriginIndex" />
-            </node>
-          </node>
-        </node>
-        <node concept="1dT_AC" id="3mytCjY_05p" role="1dT_Ay">
-          <property role="1dT_AB" value=" in order to decide which nodes to report feedback on. " />
-        </node>
-      </node>
-    </node>
   </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 834eef3f..d2a2e7ec 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
@@ -100,7 +100,6 @@
       </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -121,9 +120,7 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
@@ -141,9 +138,6 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
@@ -189,7 +183,6 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
@@ -247,13 +240,6 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
@@ -267,9 +253,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
-        <child id="1176906787974" name="rightExpression" index="576Qk" />
-      </concept>
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
@@ -283,7 +266,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -314,10 +296,6 @@
       </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
-      <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
-        <child id="1225711182005" name="list" index="1y566C" />
-        <child id="1225711191269" name="index" index="1y58nS" />
-      </concept>
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
@@ -333,7 +311,6 @@
       <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
         <child id="5686963296372573084" name="elementType" index="3O5elw" />
       </concept>
-      <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
   <node concept="312cEu" id="tyIfzC0ZNj">
@@ -1100,61 +1077,59 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3o9wrC3WGRK" role="3cqZAp">
-          <node concept="3cpWsn" id="3o9wrC3WGRL" role="3cpWs9">
-            <property role="TrG5h" value="supervisor" />
-            <node concept="3uibUv" id="3o9wrC3WGRM" role="1tU5fm">
-              <ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
+        <node concept="3cpWs8" id="5rVYEA66nwQ" role="3cqZAp">
+          <node concept="3cpWsn" id="5rVYEA66nwR" role="3cpWs9">
+            <property role="TrG5h" value="feedbackSink" />
+            <node concept="3uibUv" id="5rVYEA66nwS" role="1tU5fm">
+              <ref role="3uigEE" to="hano:6RN9TdHmQLy" resolve="FeedbackConsumer" />
             </node>
-            <node concept="2ShNRf" id="3o9wrC3WGRN" role="33vP2m">
-              <node concept="YeOm9" id="1laj_RSC4lW" role="2ShVmc">
-                <node concept="1Y3b0j" id="1laj_RSC4lZ" role="YeSDq">
+            <node concept="2ShNRf" id="5rVYEA66pxA" role="33vP2m">
+              <node concept="YeOm9" id="5rVYEA66rjv" role="2ShVmc">
+                <node concept="1Y3b0j" id="5rVYEA66rjy" role="YeSDq">
                   <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" node="3o9wrC3VM3U" resolve="PrincipalNodeReportingSupervisor" />
-                  <ref role="37wK5l" node="3o9wrC3VMfB" resolve="PrincipalNodeReportingSupervisor" />
-                  <node concept="3Tm1VV" id="1laj_RSC4m0" role="1B3o_S" />
-                  <node concept="2OqwBi" id="3o9wrC3WGRP" role="37wK5m">
-                    <node concept="37vLTw" id="3o9wrC3WGRQ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="tyIfzC1aUL" resolve="tplApp" />
-                    </node>
-                    <node concept="liA8E" id="3o9wrC3WIH9" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:1H_6AUT8p2f" resolve="getProgramSpec" />
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="1laj_RSC4Bl" role="jymVt">
+                  <ref role="1Y3XeK" to="hano:6RN9TdHmQLy" resolve="FeedbackConsumer" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <node concept="3Tm1VV" id="5rVYEA66rjz" role="1B3o_S" />
+                  <node concept="3clFb_" id="5rVYEA66rjE" role="jymVt">
                     <property role="TrG5h" value="consumeFeedback" />
-                    <node concept="37vLTG" id="4ekZiHdedYP" role="3clF46">
-                      <property role="TrG5h" value="templateRef" />
-                      <node concept="2sp9CU" id="4ekZiHdef4M" role="1tU5fm" />
+                    <node concept="37vLTG" id="5rVYEA66rjF" role="3clF46">
+                      <property role="TrG5h" value="template" />
+                      <node concept="2sp9CU" id="5rVYEA66rjG" role="1tU5fm" />
                     </node>
-                    <node concept="37vLTG" id="1IJQlQO_VYO" role="3clF46">
-                      <property role="TrG5h" value="ruleTag" />
-                      <node concept="3uibUv" id="1IJQlQO_WGD" role="1tU5fm">
-                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    <node concept="37vLTG" id="5rVYEA66rjH" role="3clF46">
+                      <property role="TrG5h" value="rule" />
+                      <node concept="3uibUv" id="5rVYEA6lYlm" role="1tU5fm">
+                        <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
                       </node>
                     </node>
-                    <node concept="37vLTG" id="1laj_RSC4Bm" role="3clF46">
-                      <property role="TrG5h" value="targetRef" />
-                      <node concept="2sp9CU" id="1laj_RSC4Bn" role="1tU5fm" />
+                    <node concept="37vLTG" id="5rVYEA66rjJ" role="3clF46">
+                      <property role="TrG5h" value="target" />
+                      <node concept="2sp9CU" id="5rVYEA66rjK" role="1tU5fm" />
                     </node>
-                    <node concept="37vLTG" id="1laj_RSC4Bo" role="3clF46">
+                    <node concept="37vLTG" id="5rVYEA66rjL" role="3clF46">
                       <property role="TrG5h" value="feedback" />
-                      <node concept="3uibUv" id="1laj_RSC4Bp" role="1tU5fm">
+                      <node concept="3uibUv" id="5rVYEA66rjM" role="1tU5fm">
                         <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
                       </node>
                     </node>
-                    <node concept="3cqZAl" id="1laj_RSC4Bq" role="3clF45" />
-                    <node concept="3Tmbuc" id="1laj_RSC4Br" role="1B3o_S" />
-                    <node concept="3clFbS" id="1laj_RSC4Bu" role="3clF47">
+                    <node concept="37vLTG" id="5rVYEA6lYSW" role="3clF46">
+                      <property role="TrG5h" value="feedbackKey" />
+                      <node concept="3uibUv" id="5rVYEA6lZlK" role="1tU5fm">
+                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                      </node>
+                    </node>
+                    <node concept="3cqZAl" id="5rVYEA66rjN" role="3clF45" />
+                    <node concept="3Tm1VV" id="5rVYEA6722A" role="1B3o_S" />
+                    <node concept="3clFbS" id="5rVYEA66rjQ" role="3clF47">
                       <node concept="3clFbJ" id="1laj_RSRVpk" role="3cqZAp">
                         <node concept="3clFbS" id="1laj_RSRVpm" role="3clFbx">
                           <node concept="3cpWs8" id="1laj_RSCq4h" role="3cqZAp">
                             <node concept="3cpWsn" id="1laj_RSCq4i" role="3cpWs9">
-                              <property role="TrG5h" value="target" />
+                              <property role="TrG5h" value="targetNode" />
                               <node concept="3Tqbb2" id="1laj_RSCq4j" role="1tU5fm" />
                               <node concept="2OqwBi" id="1laj_RSCq4k" role="33vP2m">
-                                <node concept="37vLTw" id="1laj_RSCqDc" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1laj_RSC4Bm" resolve="targetRef" />
+                                <node concept="37vLTw" id="5rVYEA66syQ" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5rVYEA66rjJ" resolve="target" />
                                 </node>
                                 <node concept="Vyspw" id="1laj_RSCq4m" role="2OqNvi">
                                   <node concept="37vLTw" id="1laj_RSCq4n" role="Vysub">
@@ -1167,11 +1142,11 @@
                           <node concept="3clFbF" id="1laj_RSCq4o" role="3cqZAp">
                             <node concept="37vLTI" id="7yV79t$Gptw" role="3clFbG">
                               <node concept="37vLTw" id="7yV79t$GpMd" role="37vLTx">
-                                <ref role="3cqZAo" node="1laj_RSC4Bo" resolve="feedback" />
+                                <ref role="3cqZAo" node="5rVYEA66rjL" resolve="feedback" />
                               </node>
                               <node concept="3EllGN" id="7yV79t$Gp01" role="37vLTJ">
                                 <node concept="37vLTw" id="7yV79t$GpdX" role="3ElVtu">
-                                  <ref role="3cqZAo" node="1laj_RSCq4i" resolve="target" />
+                                  <ref role="3cqZAo" node="1laj_RSCq4i" resolve="targetNode" />
                                 </node>
                                 <node concept="37vLTw" id="1laj_RSCq4q" role="3ElQJh">
                                   <ref role="3cqZAo" node="3o9wrC3yh0W" resolve="failures" />
@@ -1183,7 +1158,7 @@
                         <node concept="22lmx$" id="1laj_RT1WKC" role="3clFbw">
                           <node concept="2OqwBi" id="1laj_RT1XfU" role="3uHU7w">
                             <node concept="37vLTw" id="1laj_RT1X7G" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1laj_RSC4Bo" resolve="feedback" />
+                              <ref role="3cqZAo" node="5rVYEA66rjL" resolve="feedback" />
                             </node>
                             <node concept="liA8E" id="1laj_RT1Xun" role="2OqNvi">
                               <ref role="37wK5l" to="w7la:~EvaluationFeedback.isFailure()" resolve="isFailure" />
@@ -1191,12 +1166,12 @@
                           </node>
                           <node concept="3clFbC" id="1laj_RT1VRB" role="3uHU7B">
                             <node concept="Rm8GO" id="1laj_RT1WHf" role="3uHU7B">
-                              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.ERROR" resolve="ERROR" />
                               <ref role="1Px2BO" to="w7la:~EvaluationFeedback$Severity" resolve="EvaluationFeedback.Severity" />
+                              <ref role="Rm8GQ" to="w7la:~EvaluationFeedback$Severity.ERROR" resolve="ERROR" />
                             </node>
                             <node concept="2OqwBi" id="1laj_RT1WHg" role="3uHU7w">
                               <node concept="37vLTw" id="1laj_RT1WHh" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1laj_RSC4Bo" resolve="feedback" />
+                                <ref role="3cqZAo" node="5rVYEA66rjL" resolve="feedback" />
                               </node>
                               <node concept="liA8E" id="1laj_RT1WHi" role="2OqNvi">
                                 <ref role="37wK5l" to="w7la:~EvaluationFeedback.getSeverity()" resolve="getSeverity" />
@@ -1206,7 +1181,7 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="2AHcQZ" id="1laj_RSC4Bv" role="2AJF6D">
+                    <node concept="2AHcQZ" id="5rVYEA66rjS" role="2AJF6D">
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
@@ -1215,6 +1190,30 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="3o9wrC3WGRK" role="3cqZAp">
+          <node concept="3cpWsn" id="3o9wrC3WGRL" role="3cpWs9">
+            <property role="TrG5h" value="supervisor" />
+            <node concept="3uibUv" id="3o9wrC3WGRM" role="1tU5fm">
+              <ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
+            </node>
+            <node concept="2ShNRf" id="3o9wrC3WGRN" role="33vP2m">
+              <node concept="1pGfFk" id="5rVYEA66sG1" role="2ShVmc">
+                <ref role="37wK5l" node="3o9wrC3VMfB" resolve="PrincipalNodeReportingSupervisor" />
+                <node concept="2OqwBi" id="3o9wrC3WGRP" role="37wK5m">
+                  <node concept="37vLTw" id="3o9wrC3WGRQ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="tyIfzC1aUL" resolve="tplApp" />
+                  </node>
+                  <node concept="liA8E" id="3o9wrC3WIH9" role="2OqNvi">
+                    <ref role="37wK5l" to="hano:1H_6AUT8p2f" resolve="getProgramSpec" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="5rVYEA66tNp" role="37wK5m">
+                  <ref role="3cqZAo" node="5rVYEA66nwR" resolve="feedbackSink" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="1CcQBrQrYPT" role="3cqZAp">
           <node concept="37vLTI" id="1CcQBrQrYPV" role="3clFbG">
             <node concept="37vLTw" id="1CcQBrQrYPZ" role="37vLTJ">
@@ -2923,21 +2922,6 @@
   </node>
   <node concept="312cEu" id="3o9wrC3VM3U">
     <property role="TrG5h" value="PrincipalNodeReportingSupervisor" />
-    <property role="1sVAO0" value="true" />
-    <node concept="312cEg" id="3o9wrC3VO0X" role="jymVt">
-      <property role="TrG5h" value="ispec" />
-      <node concept="3Tm6S6" id="3o9wrC3VNvy" role="1B3o_S" />
-      <node concept="3uibUv" id="3o9wrC3VO0_" role="1tU5fm">
-        <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
-      </node>
-    </node>
-    <node concept="312cEg" id="3o9wrC3VMf9" role="jymVt">
-      <property role="TrG5h" value="mainSymbol" />
-      <node concept="3Tm6S6" id="3o9wrC3VMfa" role="1B3o_S" />
-      <node concept="3uibUv" id="3o9wrC3VMfb" role="1tU5fm">
-        <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="3o9wrC3VMfA" role="jymVt" />
     <node concept="3clFbW" id="3o9wrC3VMfB" role="jymVt">
       <node concept="37vLTG" id="3o9wrC3W9cf" role="3clF46">
@@ -2962,28 +2946,26 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="3o9wrC3VMg7" role="3cqZAp">
-          <node concept="37vLTI" id="3o9wrC3VMg8" role="3clFbG">
-            <node concept="2OqwBi" id="3o9wrC3VMg9" role="37vLTJ">
-              <node concept="Xjq3P" id="3o9wrC3VMga" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3o9wrC3VMgb" role="2OqNvi">
-                <ref role="2Oxat5" node="3o9wrC3VMf9" resolve="mainSymbol" />
-              </node>
+        <node concept="3clFbF" id="6RN9TdHonDD" role="3cqZAp">
+          <node concept="37vLTI" id="6RN9TdHooa3" role="3clFbG">
+            <node concept="37vLTw" id="6RN9TdHoogy" role="37vLTx">
+              <ref role="3cqZAo" node="6RN9TdHomDE" resolve="feedbackConsumer" />
             </node>
-            <node concept="2ShNRf" id="3o9wrC3VMgc" role="37vLTx">
-              <node concept="1pGfFk" id="3o9wrC3VMgd" role="2ShVmc">
-                <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
-                <node concept="Xl_RD" id="3o9wrC3VMge" role="37wK5m">
-                  <property role="Xl_RC" value="main" />
-                </node>
-                <node concept="3cmrfG" id="3o9wrC3VMgf" role="37wK5m">
-                  <property role="3cmrfH" value="0" />
-                </node>
+            <node concept="2OqwBi" id="6RN9TdHonP8" role="37vLTJ">
+              <node concept="Xjq3P" id="6RN9TdHonDB" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6RN9TdHoo14" role="2OqNvi">
+                <ref role="2Oxat5" node="6RN9TdHon5Q" resolve="feedbackConsumer" />
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="6RN9TdHomDE" role="3clF46">
+        <property role="TrG5h" value="feedbackConsumer" />
+        <node concept="3uibUv" id="6RN9TdHonzQ" role="1tU5fm">
+          <ref role="3uigEE" to="hano:6RN9TdHmQLy" resolve="FeedbackConsumer" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="3o9wrC3VMgi" role="jymVt" />
     <node concept="3clFb_" id="3o9wrC3VMgj" role="jymVt">
@@ -3183,107 +3165,35 @@
               </node>
             </node>
             <node concept="3clFbH" id="4ekZiHdQ811" role="3cqZAp" />
-            <node concept="3clFbH" id="4ekZiHdQ82O" role="3cqZAp" />
             <node concept="3clFbJ" id="3o9wrC3WedI" role="3cqZAp">
               <node concept="3clFbS" id="3o9wrC3WedK" role="3clFbx">
-                <node concept="1X3_iC" id="3o9wrC3Wkvr" role="lGtFl">
-                  <property role="3V$3am" value="statement" />
-                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                  <node concept="3cpWs8" id="3o9wrC3VMgM" role="8Wnug">
-                    <node concept="3cpWsn" id="3o9wrC3VMgN" role="3cpWs9">
-                      <property role="TrG5h" value="head" />
-                      <node concept="_YKpA" id="3o9wrC3VMgO" role="1tU5fm">
-                        <node concept="3uibUv" id="3o9wrC3VMgP" role="_ZDj9">
-                          <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="3o9wrC3VMgQ" role="33vP2m">
-                        <node concept="2OqwBi" id="3o9wrC3VMgR" role="2Oq$k0">
-                          <node concept="1eOMI4" id="3o9wrC3VMgS" role="2Oq$k0">
-                            <node concept="10QFUN" id="3o9wrC3VMgT" role="1eOMHV">
-                              <node concept="A3Dl8" id="3o9wrC3VMgU" role="10QFUM">
-                                <node concept="3uibUv" id="3o9wrC3VMgV" role="A3Ik2">
-                                  <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="3o9wrC3VMgW" role="10QFUP">
-                                <node concept="37vLTw" id="3o9wrC3VMgX" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
-                                </node>
-                                <node concept="liA8E" id="3o9wrC3VMgY" role="2OqNvi">
-                                  <ref role="37wK5l" to="av0y:~Rule.headKept()" resolve="headKept" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3QWeyG" id="3o9wrC3VMgZ" role="2OqNvi">
-                            <node concept="10QFUN" id="3o9wrC3VMh0" role="576Qk">
-                              <node concept="A3Dl8" id="3o9wrC3VMh1" role="10QFUM">
-                                <node concept="3uibUv" id="3o9wrC3VMh2" role="A3Ik2">
-                                  <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="3o9wrC3VMh3" role="10QFUP">
-                                <node concept="37vLTw" id="3o9wrC3VMh4" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
-                                </node>
-                                <node concept="liA8E" id="3o9wrC3VMh5" role="2OqNvi">
-                                  <ref role="37wK5l" to="av0y:~Rule.headReplaced()" resolve="headReplaced" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="ANE8D" id="3o9wrC3VMh6" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1X3_iC" id="3o9wrC3Wke8" role="lGtFl">
-                  <property role="3V$3am" value="statement" />
-                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                  <node concept="3cpWs8" id="3o9wrC3VMh7" role="8Wnug">
-                    <node concept="3cpWsn" id="3o9wrC3VMh8" role="3cpWs9">
-                      <property role="TrG5h" value="onStart" />
-                      <node concept="10P_77" id="3o9wrC3VMh9" role="1tU5fm" />
-                      <node concept="1Wc70l" id="3o9wrC3VMha" role="33vP2m">
-                        <node concept="2OqwBi" id="3o9wrC3VMhb" role="3uHU7w">
-                          <node concept="2OqwBi" id="3o9wrC3VMhc" role="2Oq$k0">
-                            <node concept="1y4W85" id="3o9wrC3VMhd" role="2Oq$k0">
-                              <node concept="3cmrfG" id="3o9wrC3VMhe" role="1y58nS">
-                                <property role="3cmrfH" value="0" />
-                              </node>
-                              <node concept="37vLTw" id="3o9wrC3VMhf" role="1y566C">
-                                <ref role="3cqZAo" node="3o9wrC3VMgN" resolve="head" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="3o9wrC3VMhg" role="2OqNvi">
-                              <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="3o9wrC3VMhh" role="2OqNvi">
-                            <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object)" resolve="equals" />
-                            <node concept="37vLTw" id="3o9wrC3VMhi" role="37wK5m">
-                              <ref role="3cqZAo" node="3o9wrC3VMf9" resolve="mainSymbol" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbC" id="3o9wrC3VMhj" role="3uHU7B">
-                          <node concept="2OqwBi" id="3o9wrC3VMhk" role="3uHU7B">
-                            <node concept="37vLTw" id="3o9wrC3VMhl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3o9wrC3VMgN" resolve="head" />
-                            </node>
-                            <node concept="34oBXx" id="3o9wrC3VMhm" role="2OqNvi" />
-                          </node>
-                          <node concept="3cmrfG" id="3o9wrC3VMhn" role="3uHU7w">
-                            <property role="3cmrfH" value="1" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
                 <node concept="3clFbH" id="3o9wrC3WiBc" role="3cqZAp" />
+                <node concept="3clFbF" id="6RN9TdHnrzY" role="3cqZAp">
+                  <node concept="2OqwBi" id="6RN9TdHnrTu" role="3clFbG">
+                    <node concept="37vLTw" id="6RN9TdHnrzW" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6RN9TdHon5Q" resolve="feedbackConsumer" />
+                    </node>
+                    <node concept="liA8E" id="6RN9TdHns3m" role="2OqNvi">
+                      <ref role="37wK5l" to="hano:1laj_RSC3bs" resolve="consumeFeedback" />
+                      <node concept="37vLTw" id="6RN9TdHns9Z" role="37wK5m">
+                        <ref role="3cqZAo" node="4ekZiHde8bF" resolve="templateRef" />
+                      </node>
+                      <node concept="37vLTw" id="5rVYEA6m0GN" role="37wK5m">
+                        <ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
+                      </node>
+                      <node concept="37vLTw" id="6RN9TdHnshf" role="37wK5m">
+                        <ref role="3cqZAo" node="3o9wrC3WcLt" resolve="targetRef" />
+                      </node>
+                      <node concept="37vLTw" id="6RN9TdHnsmM" role="37wK5m">
+                        <ref role="3cqZAo" node="3o9wrC3VMgo" resolve="feedback" />
+                      </node>
+                      <node concept="37vLTw" id="5rVYEA6m17e" role="37wK5m">
+                        <ref role="3cqZAo" node="5jKpGcQ_efe" resolve="pRuleTag" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="1laj_RSCjSy" role="3cqZAp" />
                 <node concept="3SKdUt" id="3o9wrC3VMhr" role="3cqZAp">
                   <node concept="1PaTwC" id="3o9wrC3VMhs" role="3ndbpf">
                     <node concept="3oM_SD" id="3o9wrC3VMht" role="1PaTwD">
@@ -3312,24 +3222,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbF" id="1laj_RSCkaQ" role="3cqZAp">
-                  <node concept="1rXfSq" id="1laj_RSCkaO" role="3clFbG">
-                    <ref role="37wK5l" node="1laj_RSC3bs" resolve="consumeFeedback" />
-                    <node concept="37vLTw" id="4ekZiHdeg5m" role="37wK5m">
-                      <ref role="3cqZAo" node="4ekZiHde8bF" resolve="templateRef" />
-                    </node>
-                    <node concept="37vLTw" id="5jKpGcQ_yx8" role="37wK5m">
-                      <ref role="3cqZAo" node="5jKpGcQ_efe" resolve="pRuleTag" />
-                    </node>
-                    <node concept="37vLTw" id="1laj_RSClyY" role="37wK5m">
-                      <ref role="3cqZAo" node="3o9wrC3WcLt" resolve="targetRef" />
-                    </node>
-                    <node concept="37vLTw" id="1laj_RSCln4" role="37wK5m">
-                      <ref role="3cqZAo" node="3o9wrC3VMgo" resolve="feedback" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="1laj_RSCjSy" role="3cqZAp" />
                 <node concept="3cpWs6" id="3o9wrC3VMhW" role="3cqZAp">
                   <node concept="3clFbT" id="3o9wrC3VMhX" role="3cqZAk">
                     <property role="3clFbU" value="true" />
@@ -3395,39 +3287,25 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="1laj_RSC3lb" role="jymVt" />
-    <node concept="3clFb_" id="1laj_RSC3bs" role="jymVt">
-      <property role="TrG5h" value="consumeFeedback" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="4ekZiHdecEm" role="3clF46">
-        <property role="TrG5h" value="template" />
-        <node concept="2sp9CU" id="4ekZiHdedao" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5b5WPl4Qdtu" role="3clF46">
-        <property role="TrG5h" value="ruleTag" />
-        <node concept="3uibUv" id="5b5WPl4Qe15" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1laj_RSC3bt" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="2sp9CU" id="1laj_RSC3bu" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1laj_RSC3bv" role="3clF46">
-        <property role="TrG5h" value="feedback" />
-        <node concept="3uibUv" id="1laj_RSC3bw" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1laj_RSC3bx" role="3clF45" />
-      <node concept="3Tmbuc" id="1laj_RSC3by" role="1B3o_S" />
-      <node concept="3clFbS" id="1laj_RSC3bz" role="3clF47" />
-    </node>
     <node concept="2tJIrI" id="3o9wrC3VM5I" role="jymVt" />
     <node concept="3Tm1VV" id="3o9wrC3VM3V" role="1B3o_S" />
     <node concept="3uibUv" id="3o9wrC3WiX8" role="1zkMxy">
       <ref role="3uigEE" to="hano:3o9wrC3s0ii" resolve="DefaultSupervisor" />
     </node>
+    <node concept="312cEg" id="3o9wrC3VO0X" role="jymVt">
+      <property role="TrG5h" value="ispec" />
+      <node concept="3Tm6S6" id="3o9wrC3VNvy" role="1B3o_S" />
+      <node concept="3uibUv" id="3o9wrC3VO0_" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+      </node>
+    </node>
+    <node concept="312cEg" id="6RN9TdHon5Q" role="jymVt">
+      <property role="TrG5h" value="feedbackConsumer" />
+      <node concept="3Tm6S6" id="6RN9TdHomTf" role="1B3o_S" />
+      <node concept="3uibUv" id="6RN9TdHonpD" role="1tU5fm">
+        <ref role="3uigEE" to="hano:6RN9TdHmQLy" resolve="FeedbackConsumer" />
+      </node>
+    </node>
   </node>
 </model>
 
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 e37000ec..21ae1e05 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
@@ -1303,48 +1303,19 @@
                     <ref role="3uigEE" to="hano:3o9wrC3sa$h" resolve="FeedbackReportingSupervisor" />
                   </node>
                   <node concept="2ShNRf" id="3o9wrC3tZfr" role="33vP2m">
-                    <node concept="YeOm9" id="1laj_RSBYFj" role="2ShVmc">
-                      <node concept="1Y3b0j" id="1laj_RSBYFm" role="YeSDq">
-                        <property role="2bfB8j" value="true" />
-                        <ref role="37wK5l" to="hano:3o9wrC3sC_c" resolve="FeedbackReportingSupervisor" />
-                        <ref role="1Y3XeK" to="hano:3o9wrC3sa$h" resolve="FeedbackReportingSupervisor" />
-                        <node concept="3Tm1VV" id="1laj_RSBYFn" role="1B3o_S" />
-                        <node concept="2OqwBi" id="3o9wrC3u3mt" role="37wK5m">
-                          <node concept="37vLTw" id="3o9wrC3u307" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
-                          </node>
-                          <node concept="liA8E" id="3o9wrC3u59R" role="2OqNvi">
-                            <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
-                          </node>
-                        </node>
-                        <node concept="3clFb_" id="1laj_RSC01i" role="jymVt">
-                          <property role="TrG5h" value="consumeFeedback" />
-                          <node concept="37vLTG" id="4ekZiHddYgg" role="3clF46">
-                            <property role="TrG5h" value="template" />
-                            <node concept="2sp9CU" id="4ekZiHde0r1" role="1tU5fm" />
-                          </node>
-                          <node concept="37vLTG" id="28zxH2wbMd6" role="3clF46">
-                            <property role="TrG5h" value="ruleTag" />
-                            <node concept="3uibUv" id="28zxH2wbMQH" role="1tU5fm">
-                              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    <node concept="1pGfFk" id="6RN9TdHofDR" role="2ShVmc">
+                      <ref role="37wK5l" to="hano:3o9wrC3sC_c" resolve="FeedbackReportingSupervisor" />
+                      <node concept="2ShNRf" id="6RN9TdHoj5N" role="37wK5m">
+                        <node concept="1pGfFk" id="6RN9TdHojUR" role="2ShVmc">
+                          <ref role="37wK5l" to="hano:6RN9TdHmUdh" resolve="OriginScopeFeedbackConsumer" />
+                          <node concept="2OqwBi" id="3o9wrC3u3mt" role="37wK5m">
+                            <node concept="37vLTw" id="3o9wrC3u307" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
                             </node>
-                          </node>
-                          <node concept="37vLTG" id="1laj_RSC01j" role="3clF46">
-                            <property role="TrG5h" value="target" />
-                            <node concept="2sp9CU" id="1laj_RSC01k" role="1tU5fm" />
-                          </node>
-                          <node concept="37vLTG" id="1laj_RSC01l" role="3clF46">
-                            <property role="TrG5h" value="feedback" />
-                            <node concept="3uibUv" id="1laj_RSC01m" role="1tU5fm">
-                              <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                            <node concept="liA8E" id="3o9wrC3u59R" role="2OqNvi">
+                              <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
                             </node>
                           </node>
-                          <node concept="3cqZAl" id="1laj_RSC01n" role="3clF45" />
-                          <node concept="3Tmbuc" id="1laj_RSC01o" role="1B3o_S" />
-                          <node concept="3clFbS" id="1laj_RSC01r" role="3clF47" />
-                          <node concept="2AHcQZ" id="1laj_RSC01s" role="2AJF6D">
-                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                          </node>
                         </node>
                       </node>
                     </node>
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 722ae437..e2994917 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
@@ -5074,7 +5074,7 @@
         <node concept="2sp9CU" id="4ekZiHdeE7H" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="5b5WPl4PFG2" role="3clF46">
-        <property role="TrG5h" value="ruleTag" />
+        <property role="TrG5h" value="feedbackKey" />
         <node concept="3uibUv" id="5b5WPl4PITj" role="1tU5fm">
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
@@ -5112,7 +5112,7 @@
                     <ref role="3cqZAo" node="4ekZiHdeBtB" resolve="template" />
                   </node>
                   <node concept="37vLTw" id="5b5WPl4QIzo" role="37wK5m">
-                    <ref role="3cqZAo" node="5b5WPl4PFG2" resolve="ruleTag" />
+                    <ref role="3cqZAo" node="5b5WPl4PFG2" resolve="feedbackKey" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 68ea8648..8f42e743 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -1939,20 +1939,19 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3cpWs8" id="3o9wrC3tl4y" role="3cqZAp">
-                    <node concept="3cpWsn" id="3o9wrC3tl4w" role="3cpWs9">
+                  <node concept="3cpWs8" id="6RN9TdHnHUM" role="3cqZAp">
+                    <node concept="3cpWsn" id="6RN9TdHnHUK" role="3cpWs9">
                       <property role="3TUv4t" value="true" />
-                      <property role="TrG5h" value="supervisor" />
-                      <node concept="3uibUv" id="3o9wrC3tmgD" role="1tU5fm">
-                        <ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
+                      <property role="TrG5h" value="feedbackSink" />
+                      <node concept="3uibUv" id="6RN9TdHnX9n" role="1tU5fm">
+                        <ref role="3uigEE" to="hano:6RN9TdHmQLy" resolve="FeedbackConsumer" />
                       </node>
-                      <node concept="2ShNRf" id="3o9wrC3trPm" role="33vP2m">
-                        <node concept="YeOm9" id="1laj_RSAOIc" role="2ShVmc">
-                          <node concept="1Y3b0j" id="1laj_RSAOIf" role="YeSDq">
+                      <node concept="2ShNRf" id="6RN9TdHnLvm" role="33vP2m">
+                        <node concept="YeOm9" id="6RN9TdHnY6O" role="2ShVmc">
+                          <node concept="1Y3b0j" id="6RN9TdHnY6R" role="YeSDq">
                             <property role="2bfB8j" value="true" />
-                            <ref role="1Y3XeK" to="hano:3o9wrC3sa$h" resolve="FeedbackReportingSupervisor" />
-                            <ref role="37wK5l" to="hano:3o9wrC3sC_c" resolve="FeedbackReportingSupervisor" />
-                            <node concept="3Tm1VV" id="1laj_RSAOIg" role="1B3o_S" />
+                            <ref role="1Y3XeK" to="hano:6RN9TdHmQY0" resolve="OriginScopeFeedbackConsumer" />
+                            <ref role="37wK5l" to="hano:6RN9TdHmUdh" resolve="OriginScopeFeedbackConsumer" />
                             <node concept="2OqwBi" id="3o9wrC3tvAX" role="37wK5m">
                               <node concept="37vLTw" id="3o9wrC3tu_g" role="2Oq$k0">
                                 <ref role="3cqZAo" node="7WKNeR9AoxI" resolve="programProducer" />
@@ -1961,31 +1960,38 @@
                                 <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
                               </node>
                             </node>
-                            <node concept="3clFb_" id="1laj_RSAQPC" role="jymVt">
-                              <property role="TrG5h" value="consumeFeedback" />
-                              <node concept="37vLTG" id="4ekZiHddVJ8" role="3clF46">
+                            <node concept="3Tm1VV" id="6RN9TdHnY6S" role="1B3o_S" />
+                            <node concept="3clFb_" id="6RN9TdHnZwV" role="jymVt">
+                              <property role="TrG5h" value="consumeFeedbackImpl" />
+                              <node concept="37vLTG" id="6RN9TdHnZwW" role="3clF46">
                                 <property role="TrG5h" value="template" />
-                                <node concept="2sp9CU" id="4ekZiHddXvL" role="1tU5fm" />
+                                <node concept="2sp9CU" id="6RN9TdHnZwX" role="1tU5fm" />
                               </node>
-                              <node concept="37vLTG" id="5b5WPl4OWvc" role="3clF46">
-                                <property role="TrG5h" value="ruleTag" />
-                                <node concept="3uibUv" id="5b5WPl4P7i$" role="1tU5fm">
-                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                              <node concept="37vLTG" id="6RN9TdHnZwY" role="3clF46">
+                                <property role="TrG5h" value="rule" />
+                                <node concept="3uibUv" id="5rVYEA6mgY6" role="1tU5fm">
+                                  <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
                                 </node>
                               </node>
-                              <node concept="37vLTG" id="1laj_RSAQPD" role="3clF46">
+                              <node concept="37vLTG" id="6RN9TdHnZx0" role="3clF46">
                                 <property role="TrG5h" value="target" />
-                                <node concept="2sp9CU" id="1laj_RSAQPE" role="1tU5fm" />
+                                <node concept="2sp9CU" id="6RN9TdHnZx1" role="1tU5fm" />
                               </node>
-                              <node concept="37vLTG" id="1laj_RSAQPF" role="3clF46">
+                              <node concept="37vLTG" id="6RN9TdHnZx2" role="3clF46">
                                 <property role="TrG5h" value="feedback" />
-                                <node concept="3uibUv" id="1laj_RSAQPG" role="1tU5fm">
+                                <node concept="3uibUv" id="6RN9TdHnZx3" role="1tU5fm">
                                   <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
                                 </node>
                               </node>
-                              <node concept="3cqZAl" id="1laj_RSAQPH" role="3clF45" />
-                              <node concept="3Tmbuc" id="1laj_RSAQPI" role="1B3o_S" />
-                              <node concept="3clFbS" id="1laj_RSAQPL" role="3clF47">
+                              <node concept="37vLTG" id="5rVYEA6mid8" role="3clF46">
+                                <property role="TrG5h" value="feedbackKey" />
+                                <node concept="3uibUv" id="5rVYEA6mjYK" role="1tU5fm">
+                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                                </node>
+                              </node>
+                              <node concept="3cqZAl" id="6RN9TdHnZx4" role="3clF45" />
+                              <node concept="3Tmbuc" id="6RN9TdHnZx5" role="1B3o_S" />
+                              <node concept="3clFbS" id="6RN9TdHnZx8" role="3clF47">
                                 <node concept="3clFbF" id="1laj_RSBzxu" role="3cqZAp">
                                   <node concept="1rXfSq" id="1laj_RSBzxt" role="3clFbG">
                                     <ref role="37wK5l" node="1laj_RSAZoB" resolve="addReportItem" />
@@ -1994,7 +2000,7 @@
                                       <ref role="1Pybhc" to="hano:3o9wrC3s0ii" resolve="DefaultSupervisor" />
                                       <node concept="2OqwBi" id="1laj_RSBA2L" role="37wK5m">
                                         <node concept="37vLTw" id="1laj_RSB_E8" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1laj_RSAQPF" resolve="feedback" />
+                                          <ref role="3cqZAo" node="6RN9TdHnZx2" resolve="feedback" />
                                         </node>
                                         <node concept="liA8E" id="1laj_RSBAe3" role="2OqNvi">
                                           <ref role="37wK5l" to="w7la:~EvaluationFeedback.getSeverity()" resolve="getSeverity" />
@@ -2002,17 +2008,17 @@
                                       </node>
                                     </node>
                                     <node concept="37vLTw" id="4ekZiHdeGCU" role="37wK5m">
-                                      <ref role="3cqZAo" node="4ekZiHddVJ8" resolve="template" />
+                                      <ref role="3cqZAo" node="6RN9TdHnZwW" resolve="template" />
                                     </node>
-                                    <node concept="37vLTw" id="5b5WPl4PQaX" role="37wK5m">
-                                      <ref role="3cqZAo" node="5b5WPl4OWvc" resolve="ruleTag" />
+                                    <node concept="37vLTw" id="5rVYEA6mlr9" role="37wK5m">
+                                      <ref role="3cqZAo" node="5rVYEA6mid8" resolve="feedbackKey" />
                                     </node>
                                     <node concept="37vLTw" id="1laj_RSBGdc" role="37wK5m">
-                                      <ref role="3cqZAo" node="1laj_RSAQPD" resolve="target" />
+                                      <ref role="3cqZAo" node="6RN9TdHnZx0" resolve="target" />
                                     </node>
                                     <node concept="2OqwBi" id="1laj_RSBGVk" role="37wK5m">
                                       <node concept="37vLTw" id="1laj_RSBGyd" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1laj_RSAQPF" resolve="feedback" />
+                                        <ref role="3cqZAo" node="6RN9TdHnZx2" resolve="feedback" />
                                       </node>
                                       <node concept="liA8E" id="1laj_RSBH6I" role="2OqNvi">
                                         <ref role="37wK5l" to="w7la:~EvaluationFeedback.getMessage()" resolve="getMessage" />
@@ -2021,7 +2027,7 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="2AHcQZ" id="1laj_RSAQPM" role="2AJF6D">
+                              <node concept="2AHcQZ" id="6RN9TdHnZx9" role="2AJF6D">
                                 <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                               </node>
                             </node>
@@ -2030,6 +2036,23 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3cpWs8" id="3o9wrC3tl4y" role="3cqZAp">
+                    <node concept="3cpWsn" id="3o9wrC3tl4w" role="3cpWs9">
+                      <property role="3TUv4t" value="true" />
+                      <property role="TrG5h" value="supervisor" />
+                      <node concept="3uibUv" id="3o9wrC3tmgD" role="1tU5fm">
+                        <ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
+                      </node>
+                      <node concept="2ShNRf" id="3o9wrC3trPm" role="33vP2m">
+                        <node concept="1pGfFk" id="6RN9TdHo4b$" role="2ShVmc">
+                          <ref role="37wK5l" to="hano:3o9wrC3sC_c" resolve="FeedbackReportingSupervisor" />
+                          <node concept="37vLTw" id="6RN9TdHo8NX" role="37wK5m">
+                            <ref role="3cqZAo" node="6RN9TdHnHUK" resolve="feedbackSink" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3clFbH" id="7WKNeR9AmNV" role="3cqZAp" />
                   <node concept="3clFbF" id="Hg6Enc7CQd" role="3cqZAp">
                     <node concept="37vLTI" id="Hg6Enc7CQe" role="3clFbG">
@@ -2667,7 +2690,7 @@
         <node concept="2sp9CU" id="4ekZiHdevUV" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="5b5WPl4Pvqv" role="3clF46">
-        <property role="TrG5h" value="ruleTag" />
+        <property role="TrG5h" value="feedbackKey" />
         <node concept="3uibUv" id="5b5WPl4PxZU" role="1tU5fm">
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 6c175fee..f3477e7c 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -450,7 +450,7 @@
         <node concept="2sp9CU" id="4ekZiHdezmg" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="5b5WPl4PA5$" role="3clF46">
-        <property role="TrG5h" value="ruleTag" />
+        <property role="TrG5h" value="feedbackKey" />
         <node concept="3uibUv" id="5b5WPl4PBA3" role="1tU5fm">
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>