diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 8099f03f..a80df02f 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -1810,7 +1810,67 @@
             <node concept="3clFbF" id="61G6TdBo87G" role="3cqZAp">
               <node concept="2OqwBi" id="61G6TdBo87H" role="3clFbG">
                 <node concept="liA8E" id="61G6TdBo87I" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:61G6TdBpSf1" resolve="provideFeedback" />
+                  <ref role="37wK5l" to="i348:3Pxu0s8x4Kl" resolve="reportFeedback" />
+                  <node concept="2OqwBi" id="55xYlrl2U6J" role="37wK5m">
+                    <node concept="1rXfSq" id="55xYlrl2U6K" role="2Oq$k0">
+                      <ref role="37wK5l" node="6tnA467FI0r" resolve="token" />
+                      <node concept="1ZhdrF" id="55xYlrl2U6L" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <property role="2qtEX8" value="baseMethodDeclaration" />
+                        <node concept="3$xsQk" id="55xYlrl2U6M" role="3$ytzL">
+                          <node concept="3clFbS" id="55xYlrl2U6N" role="2VODD2">
+                            <node concept="3clFbF" id="55xYlrl2U6O" role="3cqZAp">
+                              <node concept="2OqwBi" id="55xYlrl2U6P" role="3clFbG">
+                                <node concept="1iwH7S" id="55xYlrl2U6Q" role="2Oq$k0" />
+                                <node concept="1iwH70" id="55xYlrl2U6R" role="2OqNvi">
+                                  <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
+                                  <node concept="2OqwBi" id="55xYlrl2U6S" role="1iwH7V">
+                                    <node concept="30H73N" id="55xYlrl2U6T" role="2Oq$k0" />
+                                    <node concept="2Xjw5R" id="55xYlrl2U6U" role="2OqNvi">
+                                      <node concept="1xMEDy" id="55xYlrl2U6V" role="1xVPHs">
+                                        <node concept="chp4Y" id="55xYlrl2U6W" role="ri$Ld">
+                                          <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OwXpG" id="55xYlrl2U6X" role="2OqNvi">
+                      <ref role="2Oxat5" node="6tnA467FI0o" resolve="input" />
+                      <node concept="1ZhdrF" id="55xYlrl2U6Y" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
+                        <property role="2qtEX8" value="fieldDeclaration" />
+                        <node concept="3$xsQk" id="55xYlrl2U6Z" role="3$ytzL">
+                          <node concept="3clFbS" id="55xYlrl2U70" role="2VODD2">
+                            <node concept="3clFbF" id="55xYlrl2U71" role="3cqZAp">
+                              <node concept="2OqwBi" id="55xYlrl2U72" role="3clFbG">
+                                <node concept="1iwH7S" id="55xYlrl2U73" role="2Oq$k0" />
+                                <node concept="1iwH70" id="55xYlrl2U74" role="2OqNvi">
+                                  <ref role="1iwH77" node="36tQV5Au3A_" resolve="ruletemplate_token_input" />
+                                  <node concept="2OqwBi" id="55xYlrl2U75" role="1iwH7V">
+                                    <node concept="30H73N" id="55xYlrl2U76" role="2Oq$k0" />
+                                    <node concept="2Xjw5R" id="55xYlrl2U77" role="2OqNvi">
+                                      <node concept="1xMEDy" id="55xYlrl2U78" role="1xVPHs">
+                                        <node concept="chp4Y" id="55xYlrl2U79" role="ri$Ld">
+                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                   <node concept="10Nm6u" id="61G6TdBusYk" role="37wK5m">
                     <node concept="5jKBG" id="61G6TdBut2U" role="lGtFl">
                       <ref role="v9R2y" node="61G6TdBuqi8" resolve="frag_ProvideFeedbackOperation" />
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 7b4fb795..8603fdaa 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
@@ -3776,56 +3776,19 @@
             <ref role="3cqZAo" node="6OXbTDxtJVO" resolve="name" />
           </node>
           <node concept="2ShNRf" id="61G6TdBoJWH" role="37wK5m">
-            <node concept="YeOm9" id="61G6TdBqILW" role="2ShVmc">
-              <node concept="1Y3b0j" id="61G6TdBqILZ" role="YeSDq">
-                <property role="2bfB8j" value="true" />
-                <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
-                <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
-                <node concept="3Tm1VV" id="61G6TdBqIM0" role="1B3o_S" />
-                <node concept="2OqwBi" id="61G6TdBoJWJ" role="37wK5m">
-                  <node concept="37vLTw" id="61G6TdBoJWK" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
-                  </node>
-                  <node concept="liA8E" id="61G6TdBoJWL" role="2OqNvi">
-                    <ref role="37wK5l" node="72RDgIN45VE" resolve="repository" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="61G6TdBoJWN" role="37wK5m">
+            <node concept="1pGfFk" id="3Pxu0s87CHM" role="2ShVmc">
+              <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+              <node concept="2OqwBi" id="61G6TdBoJWJ" role="37wK5m">
+                <node concept="37vLTw" id="61G6TdBoJWK" role="2Oq$k0">
                   <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
                 </node>
-                <node concept="3clFb_" id="61G6TdBqITu" role="jymVt">
-                  <property role="TrG5h" value="provideFeedback" />
-                  <node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
-                    <property role="TrG5h" value="feedback" />
-                    <node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
-                      <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                    </node>
-                  </node>
-                  <node concept="3cqZAl" id="61G6TdBqITD" role="3clF45" />
-                  <node concept="3Tm1VV" id="61G6TdBqITE" role="1B3o_S" />
-                  <node concept="3clFbS" id="61G6TdBqITI" role="3clF47">
-                    <node concept="3SKdUt" id="61G6TdBqJcK" role="3cqZAp">
-                      <node concept="1PaTwC" id="61G6TdBqJcL" role="1aUNEU">
-                        <node concept="3oM_SD" id="61G6TdBqJcM" role="1PaTwD">
-                          <property role="3oM_SC" value="FIXME" />
-                        </node>
-                        <node concept="3oM_SD" id="61G6TdBqJd7" role="1PaTwD">
-                          <property role="3oM_SC" value="process" />
-                        </node>
-                        <node concept="3oM_SD" id="61G6TdBqJdq" role="1PaTwD">
-                          <property role="3oM_SC" value="report" />
-                        </node>
-                        <node concept="3oM_SD" id="61G6TdBqJdu" role="1PaTwD">
-                          <property role="3oM_SC" value="items" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2AHcQZ" id="61G6TdBqITJ" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                  </node>
+                <node concept="liA8E" id="61G6TdBoJWL" role="2OqNvi">
+                  <ref role="37wK5l" node="72RDgIN45VE" resolve="repository" />
                 </node>
               </node>
+              <node concept="37vLTw" id="61G6TdBoJWN" role="37wK5m">
+                <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
+              </node>
             </node>
           </node>
           <node concept="37vLTw" id="7i3KM7g75jt" role="37wK5m">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
index 95840b48..0528453c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
@@ -850,8 +850,8 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="5R9R5HilVOI" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
+                  <node concept="liA8E" id="3Pxu0s8jTB4" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 02143303..e08fc415 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -11991,7 +11991,6 @@
   <node concept="312cEu" id="7DvO2M9IiKB">
     <property role="TrG5h" value="MacroProcessing" />
     <property role="2bfB8j" value="false" />
-    <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="7DvO2M9IiKC" role="jymVt" />
     <node concept="3clFbW" id="7DvO2Ma0h_M" role="jymVt">
       <node concept="3cqZAl" id="7DvO2Ma0h_O" role="3clF45" />
@@ -12912,7 +12911,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="4VNF0fT41VU" role="jymVt" />
     <node concept="2tJIrI" id="6nFpYlucPih" role="jymVt" />
     <node concept="3clFb_" id="6nFpYlucRT5" role="jymVt">
       <property role="TrG5h" value="recordUpdate" />
@@ -12989,6 +12987,22 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6nFpYlufd2K" role="jymVt" />
+    <node concept="3clFb_" id="At0yqMNzB3" role="jymVt">
+      <property role="TrG5h" value="hasChanges" />
+      <node concept="10P_77" id="At0yqMNH$M" role="3clF45" />
+      <node concept="3Tm1VV" id="At0yqMNzB6" role="1B3o_S" />
+      <node concept="3clFbS" id="At0yqMNzB7" role="3clF47">
+        <node concept="3clFbF" id="At0yqMO6VW" role="3cqZAp">
+          <node concept="2OqwBi" id="At0yqMOc9M" role="3clFbG">
+            <node concept="37vLTw" id="At0yqMO6VV" role="2Oq$k0">
+              <ref role="3cqZAo" node="6nFpYlu6n2t" resolve="changedSet" />
+            </node>
+            <node concept="3GX2aA" id="At0yqMOgR1" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="At0yqMNuiC" role="jymVt" />
     <node concept="3clFb_" id="1XKnVQioNo" role="jymVt">
       <property role="TrG5h" value="invalidateChanged" />
       <node concept="37vLTG" id="1XKnVQiz0H" role="3clF46">
@@ -15427,11 +15441,11 @@
       <property role="TrG5h" value="originRefs" />
       <node concept="3Tm6S6" id="5HxDM7DcE86" role="1B3o_S" />
       <node concept="2hMVRd" id="5HxDM7DcE9K" role="1tU5fm">
-        <node concept="2sp9CU" id="5HxDM7DcEb2" role="2hN53Y" />
+        <node concept="3Tqbb2" id="3Pxu0s8jYW5" role="2hN53Y" />
       </node>
       <node concept="2ShNRf" id="5HxDM7DcEsN" role="33vP2m">
         <node concept="2i4dXS" id="5HxDM7DcEGR" role="2ShVmc">
-          <node concept="2sp9CU" id="5HxDM7DcEYC" role="HW$YZ" />
+          <node concept="3Tqbb2" id="3Pxu0s8jZtz" role="HW$YZ" />
           <node concept="10Nm6u" id="5HxDM7DcFhv" role="HW$Y0" />
         </node>
       </node>
@@ -15454,28 +15468,8 @@
               <ref role="3cqZAo" node="5HxDM7DcEb5" resolve="originRefs" />
             </node>
             <node concept="X8dFx" id="5HxDM7DcMJB" role="2OqNvi">
-              <node concept="2OqwBi" id="5HxDM7DcNVd" role="25WWJ7">
-                <node concept="37vLTw" id="5HxDM7DcMWV" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5HxDM7DcDPq" resolve="preambleRuleOrigins" />
-                </node>
-                <node concept="3$u5V9" id="5HxDM7DcOwm" role="2OqNvi">
-                  <node concept="1bVj0M" id="5HxDM7DcOwo" role="23t8la">
-                    <node concept="3clFbS" id="5HxDM7DcOwp" role="1bW5cS">
-                      <node concept="3clFbF" id="5HxDM7DcP9x" role="3cqZAp">
-                        <node concept="2OqwBi" id="5HxDM7DcPqn" role="3clFbG">
-                          <node concept="37vLTw" id="5HxDM7DcP9w" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5HxDM7DcOwq" resolve="it" />
-                          </node>
-                          <node concept="iZEcu" id="5HxDM7DcQG$" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="5HxDM7DcOwq" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5HxDM7DcOwr" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
+              <node concept="37vLTw" id="5HxDM7DcMWV" role="25WWJ7">
+                <ref role="3cqZAo" node="5HxDM7DcDPq" resolve="preambleRuleOrigins" />
               </node>
             </node>
           </node>
@@ -15614,8 +15608,8 @@
                   </node>
                   <node concept="3JPx81" id="5HxDM7DcL6E" role="2OqNvi">
                     <node concept="2OqwBi" id="5HxDM7DcIwH" role="25WWJ7">
-                      <node concept="liA8E" id="5HxDM7DcII1" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
+                      <node concept="liA8E" id="3Pxu0s8jZZE" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                       </node>
                       <node concept="37vLTw" id="7L9cSENHQFa" role="2Oq$k0">
                         <ref role="3cqZAo" node="7L9cSENH$qV" resolve="rex" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index b802dd39..d9940469 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -965,56 +965,19 @@
               <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
             </node>
             <node concept="2ShNRf" id="61G6TdBqAxu" role="33vP2m">
-              <node concept="YeOm9" id="61G6TdBqAxv" role="2ShVmc">
-                <node concept="1Y3b0j" id="61G6TdBqAxw" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
-                  <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
-                  <node concept="3Tm1VV" id="61G6TdBqAxx" role="1B3o_S" />
-                  <node concept="2OqwBi" id="61G6TdBqAxy" role="37wK5m">
-                    <node concept="37vLTw" id="61G6TdBqAxz" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
-                    </node>
-                    <node concept="liA8E" id="61G6TdBqAx$" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="61G6TdBqAxA" role="37wK5m">
+              <node concept="1pGfFk" id="3Pxu0s87$zF" role="2ShVmc">
+                <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                <node concept="2OqwBi" id="61G6TdBqAxy" role="37wK5m">
+                  <node concept="37vLTw" id="61G6TdBqAxz" role="2Oq$k0">
                     <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
                   </node>
-                  <node concept="3clFb_" id="61G6TdBqAxC" role="jymVt">
-                    <property role="TrG5h" value="provideFeedback" />
-                    <node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
-                      <property role="TrG5h" value="feedback" />
-                      <node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
-                        <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                      </node>
-                    </node>
-                    <node concept="3cqZAl" id="61G6TdBqAxN" role="3clF45" />
-                    <node concept="3Tm1VV" id="61G6TdBqAxO" role="1B3o_S" />
-                    <node concept="3clFbS" id="61G6TdBqAxP" role="3clF47">
-                      <node concept="3SKdUt" id="61G6TdBqAxQ" role="3cqZAp">
-                        <node concept="1PaTwC" id="61G6TdBqAxR" role="1aUNEU">
-                          <node concept="3oM_SD" id="61G6TdBqAxS" role="1PaTwD">
-                            <property role="3oM_SC" value="FIXME" />
-                          </node>
-                          <node concept="3oM_SD" id="61G6TdBqGQI" role="1PaTwD">
-                            <property role="3oM_SC" value="process" />
-                          </node>
-                          <node concept="3oM_SD" id="61G6TdBqGR1" role="1PaTwD">
-                            <property role="3oM_SC" value="report" />
-                          </node>
-                          <node concept="3oM_SD" id="61G6TdBqGR_" role="1PaTwD">
-                            <property role="3oM_SC" value="items" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2AHcQZ" id="61G6TdBqAxV" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
+                  <node concept="liA8E" id="61G6TdBqAx$" role="2OqNvi">
+                    <ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
                   </node>
                 </node>
+                <node concept="37vLTw" id="61G6TdBqAxA" role="37wK5m">
+                  <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                </node>
               </node>
             </node>
           </node>
@@ -1049,7 +1012,7 @@
               <ref role="3cqZAo" node="61G6TdBqAxt" resolve="macroProcessing" />
             </node>
             <node concept="liA8E" id="2LxIQemUJYl" role="2OqNvi">
-              <ref role="37wK5l" to="ksgm:4VNF0fT816Y" resolve="withRequirementsRecorder" />
+              <ref role="37wK5l" to="ksgm:4VNF0fT816Y" resolve="withDependencyUpdatable" />
               <node concept="37vLTw" id="2LxIQemUK79" role="37wK5m">
                 <ref role="3cqZAo" node="1XKnVQwJTH" resolve="updatesRecorder" />
               </node>
@@ -4668,48 +4631,29 @@
           </node>
           <node concept="3clFbJ" id="MSv3oweCrZ" role="3cqZAp">
             <node concept="3clFbS" id="MSv3oweCs1" role="3clFbx">
-              <node concept="3cpWs8" id="MSv3owhGhA" role="3cqZAp">
-                <node concept="3cpWsn" id="MSv3owhGhD" role="3cpWs9">
-                  <property role="TrG5h" value="originRef" />
-                  <node concept="3uibUv" id="MSv3owhNcg" role="1tU5fm">
-                    <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                  </node>
-                  <node concept="2OqwBi" id="MSv3oweDqw" role="33vP2m">
-                    <node concept="1eOMI4" id="MSv3oweDhS" role="2Oq$k0">
-                      <node concept="10QFUN" id="MSv3oweCQP" role="1eOMHV">
-                        <node concept="3uibUv" id="MSv3oweCUI" role="10QFUM">
+              <node concept="3cpWs8" id="3Pxu0s8fTYN" role="3cqZAp">
+                <node concept="3cpWsn" id="3Pxu0s8fTYO" role="3cpWs9">
+                  <property role="TrG5h" value="origin" />
+                  <node concept="3Tqbb2" id="3Pxu0s8fTeZ" role="1tU5fm" />
+                  <node concept="2OqwBi" id="3Pxu0s8fTYP" role="33vP2m">
+                    <node concept="1eOMI4" id="3Pxu0s8fTYQ" role="2Oq$k0">
+                      <node concept="10QFUN" id="3Pxu0s8fTYR" role="1eOMHV">
+                        <node concept="3uibUv" id="3Pxu0s8fTYS" role="10QFUM">
                           <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
                         </node>
-                        <node concept="37vLTw" id="MSv3oweCHv" role="10QFUP">
+                        <node concept="37vLTw" id="3Pxu0s8fTYT" role="10QFUP">
                           <ref role="3cqZAo" node="MSv3owey_W" resolve="rule" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="MSv3oweD_g" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
+                    <node concept="liA8E" id="3Pxu0s8fTYU" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                     </node>
                   </node>
                 </node>
               </node>
               <node concept="3clFbJ" id="MSv3owhKk3" role="3cqZAp">
                 <node concept="3clFbS" id="MSv3owhKk5" role="3clFbx">
-                  <node concept="3cpWs8" id="MSv3oweEf9" role="3cqZAp">
-                    <node concept="3cpWsn" id="MSv3oweEfc" role="3cpWs9">
-                      <property role="TrG5h" value="origin" />
-                      <node concept="3Tqbb2" id="MSv3oweEf7" role="1tU5fm" />
-                      <node concept="2OqwBi" id="MSv3oweDEK" role="33vP2m">
-                        <node concept="liA8E" id="MSv3oweDSY" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
-                          <node concept="37vLTw" id="MSv3oweDWj" role="37wK5m">
-                            <ref role="3cqZAo" node="MSv3oweiHc" resolve="repo" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="MSv3owhLyn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="MSv3owhGhD" resolve="originRef" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3clFbF" id="MSv3oweFpQ" role="3cqZAp">
                     <node concept="2OqwBi" id="MSv3owePK$" role="3clFbG">
                       <node concept="2OqwBi" id="MSv3oweLTg" role="2Oq$k0">
@@ -4728,8 +4672,8 @@
                         <node concept="2YIFZM" id="MSv3owg1zI" role="37wK5m">
                           <ref role="37wK5l" node="6uUkLpHm8V7" resolve="nodeToString" />
                           <ref role="1Pybhc" node="3evPR3EeeoU" resolve="TestDebugInfoPrinter" />
-                          <node concept="37vLTw" id="MSv3owg2on" role="37wK5m">
-                            <ref role="3cqZAo" node="MSv3oweEfc" resolve="origin" />
+                          <node concept="37vLTw" id="3Pxu0s8g0tr" role="37wK5m">
+                            <ref role="3cqZAo" node="3Pxu0s8fTYO" resolve="origin" />
                           </node>
                         </node>
                       </node>
@@ -4738,8 +4682,8 @@
                 </node>
                 <node concept="3y3z36" id="MSv3owhLp4" role="3clFbw">
                   <node concept="10Nm6u" id="MSv3owhLuV" role="3uHU7w" />
-                  <node concept="37vLTw" id="MSv3owhLe7" role="3uHU7B">
-                    <ref role="3cqZAo" node="MSv3owhGhD" resolve="originRef" />
+                  <node concept="37vLTw" id="3Pxu0s8fV3C" role="3uHU7B">
+                    <ref role="3cqZAo" node="3Pxu0s8fTYO" resolve="origin" />
                   </node>
                 </node>
               </node>
@@ -5293,7 +5237,7 @@
                       <ref role="3cqZAo" node="1z4$59jegXF" resolve="it" />
                     </node>
                     <node concept="liA8E" id="362mGRZLKCR" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackIdentity" />
+                      <ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackKey" />
                     </node>
                   </node>
                 </node>
@@ -5391,7 +5335,7 @@
                       <ref role="3cqZAo" node="362mGRZM0tr" resolve="it" />
                     </node>
                     <node concept="liA8E" id="362mGRZM0tq" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackIdentity" />
+                      <ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackKey" />
                     </node>
                   </node>
                 </node>
@@ -9930,27 +9874,14 @@
                   <node concept="3clFbS" id="6jc_YgcRhfw" role="3clFbx">
                     <node concept="3cpWs8" id="6jc_YgcRjyO" role="3cqZAp">
                       <node concept="3cpWsn" id="6jc_YgcRjyR" role="3cpWs9">
-                        <property role="TrG5h" value="resolved" />
+                        <property role="TrG5h" value="org" />
                         <node concept="3Tqbb2" id="6jc_YgcRjyM" role="1tU5fm" />
-                        <node concept="2OqwBi" id="6jc_YgcRk9O" role="33vP2m">
-                          <node concept="2OqwBi" id="6jc_YgcRjZb" role="2Oq$k0">
-                            <node concept="37vLTw" id="6jc_YgcRjZc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6jc_YgcRhD5" resolve="ruleEx" />
-                            </node>
-                            <node concept="liA8E" id="6jc_YgcRjZd" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
-                            </node>
+                        <node concept="2OqwBi" id="6jc_YgcRjZb" role="33vP2m">
+                          <node concept="37vLTw" id="6jc_YgcRjZc" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6jc_YgcRhD5" resolve="ruleEx" />
                           </node>
-                          <node concept="liA8E" id="6jc_YgcRknM" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
-                            <node concept="2OqwBi" id="6jc_YgcRkOa" role="37wK5m">
-                              <node concept="37vLTw" id="6jc_YgcRkxi" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6jc_YgcOZ2n" resolve="launcher" />
-                              </node>
-                              <node concept="liA8E" id="6jc_YgcRl43" role="2OqNvi">
-                                <ref role="37wK5l" node="3o9wrC3CZg_" resolve="getRepo" />
-                              </node>
-                            </node>
+                          <node concept="liA8E" id="3Pxu0s8f_uo" role="2OqNvi">
+                            <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                           </node>
                         </node>
                       </node>
@@ -9966,7 +9897,7 @@
                               <node concept="liA8E" id="6jc_YgcRfca" role="2OqNvi">
                                 <ref role="37wK5l" node="6jc_YgcQJPK" resolve="addedRulesFor" />
                                 <node concept="37vLTw" id="6jc_YgcRmJv" role="37wK5m">
-                                  <ref role="3cqZAo" node="6jc_YgcRjyR" resolve="resolved" />
+                                  <ref role="3cqZAo" node="6jc_YgcRjyR" resolve="org" />
                                 </node>
                               </node>
                             </node>
@@ -9981,7 +9912,7 @@
                       <node concept="3y3z36" id="6jc_YgcRlPT" role="3clFbw">
                         <node concept="10Nm6u" id="6jc_YgcRlZy" role="3uHU7w" />
                         <node concept="37vLTw" id="6jc_YgcRlDe" role="3uHU7B">
-                          <ref role="3cqZAo" node="6jc_YgcRjyR" resolve="resolved" />
+                          <ref role="3cqZAo" node="6jc_YgcRjyR" resolve="org" />
                         </node>
                       </node>
                     </node>
@@ -9992,8 +9923,8 @@
                       <node concept="37vLTw" id="6jc_YgcRiv2" role="2Oq$k0">
                         <ref role="3cqZAo" node="6jc_YgcRhD5" resolve="ruleEx" />
                       </node>
-                      <node concept="liA8E" id="6jc_YgcRiNb" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
+                      <node concept="liA8E" id="3Pxu0s8f$ya" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                       </node>
                     </node>
                   </node>
@@ -10086,27 +10017,14 @@
                       <node concept="3clFbS" id="6jc_YgcRpx_" role="3clFbx">
                         <node concept="3cpWs8" id="6jc_YgcRpxA" role="3cqZAp">
                           <node concept="3cpWsn" id="6jc_YgcRpxB" role="3cpWs9">
-                            <property role="TrG5h" value="resolved" />
+                            <property role="TrG5h" value="org" />
                             <node concept="3Tqbb2" id="6jc_YgcRpxC" role="1tU5fm" />
-                            <node concept="2OqwBi" id="6jc_YgcRpxD" role="33vP2m">
-                              <node concept="2OqwBi" id="6jc_YgcRpxE" role="2Oq$k0">
-                                <node concept="liA8E" id="6jc_YgcRpxG" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
-                                </node>
-                                <node concept="37vLTw" id="6jc_YgcRqAa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6jc_YgcQ$4I" resolve="removedRule" />
-                                </node>
+                            <node concept="2OqwBi" id="6jc_YgcRpxE" role="33vP2m">
+                              <node concept="liA8E" id="3Pxu0s8fC_6" role="2OqNvi">
+                                <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                               </node>
-                              <node concept="liA8E" id="6jc_YgcRpxH" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
-                                <node concept="2OqwBi" id="6jc_YgcRpxI" role="37wK5m">
-                                  <node concept="37vLTw" id="6jc_YgcRpxJ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6jc_YgcOZ2n" resolve="launcher" />
-                                  </node>
-                                  <node concept="liA8E" id="6jc_YgcRpxK" role="2OqNvi">
-                                    <ref role="37wK5l" node="3o9wrC3CZg_" resolve="getRepo" />
-                                  </node>
-                                </node>
+                              <node concept="37vLTw" id="6jc_YgcRqAa" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6jc_YgcQ$4I" resolve="removedRule" />
                               </node>
                             </node>
                           </node>
@@ -10122,7 +10040,7 @@
                                   <node concept="liA8E" id="6jc_YgcRpxR" role="2OqNvi">
                                     <ref role="37wK5l" node="6jc_YgcR0mn" resolve="removedRulesFor" />
                                     <node concept="37vLTw" id="6jc_YgcRpxS" role="37wK5m">
-                                      <ref role="3cqZAo" node="6jc_YgcRpxB" resolve="resolved" />
+                                      <ref role="3cqZAo" node="6jc_YgcRpxB" resolve="org" />
                                     </node>
                                   </node>
                                 </node>
@@ -10137,7 +10055,7 @@
                           <node concept="3y3z36" id="6jc_YgcRpxV" role="3clFbw">
                             <node concept="10Nm6u" id="6jc_YgcRpxW" role="3uHU7w" />
                             <node concept="37vLTw" id="6jc_YgcRpxX" role="3uHU7B">
-                              <ref role="3cqZAo" node="6jc_YgcRpxB" resolve="resolved" />
+                              <ref role="3cqZAo" node="6jc_YgcRpxB" resolve="org" />
                             </node>
                           </node>
                         </node>
@@ -10148,8 +10066,8 @@
                           <node concept="37vLTw" id="6jc_YgcRqu3" role="2Oq$k0">
                             <ref role="3cqZAo" node="6jc_YgcQ$4I" resolve="removedRule" />
                           </node>
-                          <node concept="liA8E" id="6jc_YgcRpy2" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
+                          <node concept="liA8E" id="3Pxu0s8fBDQ" role="2OqNvi">
+                            <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                           </node>
                         </node>
                       </node>
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 52b65703..294a7c5c 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
@@ -3405,56 +3405,19 @@
                     <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
                   </node>
                   <node concept="2ShNRf" id="61G6TdBqDRl" role="33vP2m">
-                    <node concept="YeOm9" id="61G6TdBqDRm" role="2ShVmc">
-                      <node concept="1Y3b0j" id="61G6TdBqDRn" role="YeSDq">
-                        <property role="2bfB8j" value="true" />
-                        <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
-                        <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
-                        <node concept="3Tm1VV" id="61G6TdBqDRo" role="1B3o_S" />
-                        <node concept="2OqwBi" id="61G6TdBqDRp" role="37wK5m">
-                          <node concept="37vLTw" id="61G6TdBqDRq" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
-                          </node>
-                          <node concept="liA8E" id="61G6TdBqDRr" role="2OqNvi">
-                            <ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="61G6TdBqDRt" role="37wK5m">
+                    <node concept="1pGfFk" id="3Pxu0s87EMf" role="2ShVmc">
+                      <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                      <node concept="2OqwBi" id="61G6TdBqDRp" role="37wK5m">
+                        <node concept="37vLTw" id="61G6TdBqDRq" role="2Oq$k0">
                           <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
                         </node>
-                        <node concept="3clFb_" id="61G6TdBqDRv" role="jymVt">
-                          <property role="TrG5h" value="provideFeedback" />
-                          <node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
-                            <property role="TrG5h" value="feedback" />
-                            <node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
-                              <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                            </node>
-                          </node>
-                          <node concept="3cqZAl" id="61G6TdBqDRE" role="3clF45" />
-                          <node concept="3Tm1VV" id="61G6TdBqDRF" role="1B3o_S" />
-                          <node concept="3clFbS" id="61G6TdBqDRG" role="3clF47">
-                            <node concept="3SKdUt" id="61G6TdBqG4h" role="3cqZAp">
-                              <node concept="1PaTwC" id="61G6TdBqG4i" role="1aUNEU">
-                                <node concept="3oM_SD" id="61G6TdBqG4j" role="1PaTwD">
-                                  <property role="3oM_SC" value="FIXME" />
-                                </node>
-                                <node concept="3oM_SD" id="61G6TdBqG93" role="1PaTwD">
-                                  <property role="3oM_SC" value="process" />
-                                </node>
-                                <node concept="3oM_SD" id="61G6TdBqGah" role="1PaTwD">
-                                  <property role="3oM_SC" value="report" />
-                                </node>
-                                <node concept="3oM_SD" id="61G6TdBqGaI" role="1PaTwD">
-                                  <property role="3oM_SC" value="items" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2AHcQZ" id="61G6TdBqDRH" role="2AJF6D">
-                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                          </node>
+                        <node concept="liA8E" id="61G6TdBqDRr" role="2OqNvi">
+                          <ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
                         </node>
                       </node>
+                      <node concept="37vLTw" id="61G6TdBqDRt" role="37wK5m">
+                        <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                      </node>
                     </node>
                   </node>
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index d46f197d..a68afe82 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -3000,59 +3000,13 @@
                 <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
               </node>
               <node concept="2ShNRf" id="61G6TdBDyzM" role="33vP2m">
-                <node concept="YeOm9" id="61G6TdBDyzN" role="2ShVmc">
-                  <node concept="1Y3b0j" id="61G6TdBDyzO" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
-                    <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
-                    <node concept="3Tm1VV" id="61G6TdBDyzP" role="1B3o_S" />
-                    <node concept="37vLTw" id="61G6TdBDyzQ" role="37wK5m">
-                      <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
-                    </node>
-                    <node concept="37vLTw" id="61G6TdBDyzS" role="37wK5m">
-                      <ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
-                    </node>
-                    <node concept="3clFb_" id="61G6TdBDyzU" role="jymVt">
-                      <property role="TrG5h" value="provideFeedback" />
-                      <node concept="37vLTG" id="61G6TdBDyzV" role="3clF46">
-                        <property role="TrG5h" value="feedback" />
-                        <node concept="3uibUv" id="61G6TdBDyzW" role="1tU5fm">
-                          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                        </node>
-                      </node>
-                      <node concept="3cqZAl" id="61G6TdBDyzX" role="3clF45" />
-                      <node concept="3Tm1VV" id="61G6TdBDyzY" role="1B3o_S" />
-                      <node concept="3clFbS" id="61G6TdBDyzZ" role="3clF47">
-                        <node concept="3SKdUt" id="61G6TdBDy$0" role="3cqZAp">
-                          <node concept="1PaTwC" id="61G6TdBDy$1" role="1aUNEU">
-                            <node concept="3oM_SD" id="61G6TdBDy$2" role="1PaTwD">
-                              <property role="3oM_SC" value="FIXME" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$3" role="1PaTwD">
-                              <property role="3oM_SC" value="provide" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$4" role="1PaTwD">
-                              <property role="3oM_SC" value="appropriate" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$5" role="1PaTwD">
-                              <property role="3oM_SC" value="reporting" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$6" role="1PaTwD">
-                              <property role="3oM_SC" value="for" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$7" role="1PaTwD">
-                              <property role="3oM_SC" value="typechecking" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$8" role="1PaTwD">
-                              <property role="3oM_SC" value="errors" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2AHcQZ" id="61G6TdBDy$9" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                      </node>
-                    </node>
+                <node concept="1pGfFk" id="3Pxu0s87Llu" role="2ShVmc">
+                  <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                  <node concept="37vLTw" id="61G6TdBDyzQ" role="37wK5m">
+                    <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                  </node>
+                  <node concept="37vLTw" id="61G6TdBDyzS" role="37wK5m">
+                    <ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index bd150d40..e9f97434 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -3090,17 +3090,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="5Qx6_660tQu" role="3cqZAp" />
-          <node concept="3clFbF" id="syqlb1TGDb" role="3cqZAp">
-            <node concept="2OqwBi" id="syqlb1THkU" role="3clFbG">
-              <node concept="37vLTw" id="syqlb1TGD9" role="2Oq$k0">
-                <ref role="3cqZAo" node="9dktABR$KQ" resolve="typesIndex" />
-              </node>
-              <node concept="liA8E" id="syqlb1Uwyj" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:syqlb1TNjY" resolve="markUsed" />
-              </node>
-            </node>
-          </node>
         </node>
         <node concept="2AHcQZ" id="2Hyoxv0bBN" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
@@ -3206,43 +3195,16 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="1z4$59j71i9" role="3cqZAp" />
-          <node concept="3cpWs8" id="9dktABQBqG" role="3cqZAp">
-            <node concept="3cpWsn" id="9dktABQBqH" role="3cpWs9">
-              <property role="TrG5h" value="typesIndex" />
-              <node concept="3uibUv" id="9dktABQKwh" role="1tU5fm">
-                <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+          <node concept="3clFbF" id="At0yqMXSkh" role="3cqZAp">
+            <node concept="2OqwBi" id="At0yqMXZs2" role="3clFbG">
+              <node concept="37vLTw" id="At0yqMXSkf" role="2Oq$k0">
+                <ref role="3cqZAo" node="1z4$59j5F_5" resolve="typecheckingService" />
               </node>
-              <node concept="2OqwBi" id="9dktABQBqI" role="33vP2m">
-                <node concept="liA8E" id="9dktABQBqJ" role="2OqNvi">
-                  <ref role="37wK5l" to="tj24:19OC90lY7P" resolve="cachedTypes" />
-                  <node concept="37vLTw" id="9dktABQBqK" role="37wK5m">
-                    <ref role="3cqZAo" node="19OC90nb5K" resolve="containingRoot" />
-                  </node>
+              <node concept="liA8E" id="At0yqMY6Qp" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:At0yqMUA4l" resolve="isCacheUpToDate" />
+                <node concept="37vLTw" id="At0yqMYnat" role="37wK5m">
+                  <ref role="3cqZAo" node="19OC90nb5K" resolve="containingRoot" />
                 </node>
-                <node concept="37vLTw" id="1z4$59j6War" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1z4$59j5F_5" resolve="typecheckingService" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="1z4$59iLDzF" role="3cqZAp" />
-          <node concept="3cpWs6" id="syqlb1U_qh" role="3cqZAp">
-            <node concept="3K4zz7" id="5Qx6_669ATc" role="3cqZAk">
-              <node concept="2OqwBi" id="5Qx6_669ATd" role="3K4E3e">
-                <node concept="37vLTw" id="5Qx6_669ATe" role="2Oq$k0">
-                  <ref role="3cqZAo" node="9dktABQBqH" resolve="typesIndex" />
-                </node>
-                <node concept="liA8E" id="5Qx6_669ATf" role="2OqNvi">
-                  <ref role="37wK5l" to="tj24:syqlb1UmCh" resolve="isUsed" />
-                </node>
-              </node>
-              <node concept="3clFbT" id="5Qx6_669ATg" role="3K4GZi" />
-              <node concept="3y3z36" id="5Qx6_669ATh" role="3K4Cdx">
-                <node concept="37vLTw" id="5Qx6_669ATi" role="3uHU7B">
-                  <ref role="3cqZAo" node="9dktABQBqH" resolve="typesIndex" />
-                </node>
-                <node concept="10Nm6u" id="5Qx6_669ATj" role="3uHU7w" />
               </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 5f342ad9..805a5ce0 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
@@ -2974,59 +2974,42 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="1RYTbd8y62z" role="jymVt">
-        <property role="TrG5h" value="dropInvalidatedTypes" />
-        <node concept="3cqZAl" id="1RYTbd8y62_" role="3clF45" />
-        <node concept="3Tm1VV" id="1RYTbd8y62A" role="1B3o_S" />
-        <node concept="3clFbS" id="1RYTbd8y62B" role="3clF47">
+      <node concept="3clFb_" id="3Pxu0s8qa6J" role="jymVt">
+        <property role="TrG5h" value="dropInvalidated" />
+        <node concept="37vLTG" id="3Pxu0s8qK9v" role="3clF46">
+          <property role="TrG5h" value="origins" />
+          <node concept="3vKaQO" id="3Pxu0s8qK9w" role="1tU5fm">
+            <node concept="3Tqbb2" id="3Pxu0s8qK9x" role="3O5elw" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="3Pxu0s8qK9y" role="3clF46">
+          <property role="TrG5h" value="feedbackKeys" />
+          <node concept="3vKaQO" id="3Pxu0s8qK9z" role="1tU5fm">
+            <node concept="3uibUv" id="3Pxu0s8qK9$" role="3O5elw">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="3Pxu0s8qa6L" role="3clF45" />
+        <node concept="3Tm1VV" id="3Pxu0s8qa6M" role="1B3o_S" />
+        <node concept="3clFbS" id="3Pxu0s8qa6N" role="3clF47">
           <node concept="3clFbF" id="1RYTbd8ySwx" role="3cqZAp">
             <node concept="2OqwBi" id="1RYTbd8ySwy" role="3clFbG">
               <node concept="Xjq3P" id="1RYTbd8ySwz" role="2Oq$k0">
                 <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
               </node>
               <node concept="liA8E" id="1RYTbd8ySw$" role="2OqNvi">
-                <ref role="37wK5l" node="1RYTbd8ynDp" resolve="dropInvalidatedTypes" />
-                <node concept="37vLTw" id="1RYTbd8yUCO" role="37wK5m">
-                  <ref role="3cqZAo" node="1RYTbd8y7Mf" resolve="locations" />
+                <ref role="37wK5l" node="3Pxu0s8oq7g" resolve="dropInvalidated" />
+                <node concept="37vLTw" id="3Pxu0s8qZJj" role="37wK5m">
+                  <ref role="3cqZAo" node="3Pxu0s8qK9v" resolve="origins" />
+                </node>
+                <node concept="37vLTw" id="3Pxu0s8ra0v" role="37wK5m">
+                  <ref role="3cqZAo" node="3Pxu0s8qK9y" resolve="feedbackKeys" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="1RYTbd8y7Mf" role="3clF46">
-          <property role="TrG5h" value="locations" />
-          <node concept="3vKaQO" id="1RYTbd8y7Md" role="1tU5fm">
-            <node concept="2sp9CU" id="1RYTbd8y83s" role="3O5elw" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="1RYTbd8yUNB" role="jymVt">
-        <property role="TrG5h" value="dropInvalidatedFeedback" />
-        <node concept="3cqZAl" id="1RYTbd8yUNC" role="3clF45" />
-        <node concept="3Tm1VV" id="1RYTbd8yUND" role="1B3o_S" />
-        <node concept="3clFbS" id="1RYTbd8yUNE" role="3clF47">
-          <node concept="3clFbF" id="1RYTbd8yUNF" role="3cqZAp">
-            <node concept="2OqwBi" id="1RYTbd8yUNG" role="3clFbG">
-              <node concept="Xjq3P" id="1RYTbd8yUNH" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="1RYTbd8yUNI" role="2OqNvi">
-                <ref role="37wK5l" node="1RYTbd8z07l" resolve="dropInvalidatedFeedback" />
-                <node concept="37vLTw" id="1RYTbd8yUNJ" role="37wK5m">
-                  <ref role="3cqZAo" node="1RYTbd8yUNK" resolve="keys" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="1RYTbd8yUNK" role="3clF46">
-          <property role="TrG5h" value="keys" />
-          <node concept="3vKaQO" id="1RYTbd8yUNL" role="1tU5fm">
-            <node concept="3uibUv" id="1RYTbd8zT$y" role="3O5elw">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="3clFb_" id="1z4$59jqkE8" role="jymVt">
         <property role="TrG5h" value="addReportItem" />
@@ -3298,47 +3281,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5cBWTAejXzX" role="jymVt" />
-    <node concept="3clFb_" id="syqlb1TNjY" role="jymVt">
-      <property role="TrG5h" value="markUsed" />
-      <node concept="3cqZAl" id="syqlb1TNk0" role="3clF45" />
-      <node concept="3Tm1VV" id="syqlb1TNk1" role="1B3o_S" />
-      <node concept="3clFbS" id="syqlb1TNk2" role="3clF47">
-        <node concept="3clFbF" id="syqlb1Ua0C" role="3cqZAp">
-          <node concept="37vLTI" id="syqlb1UaAv" role="3clFbG">
-            <node concept="3clFbT" id="syqlb1UaCG" role="37vLTx">
-              <property role="3clFbU" value="true" />
-            </node>
-            <node concept="2OqwBi" id="syqlb1Ua7c" role="37vLTJ">
-              <node concept="Xjq3P" id="syqlb1Ua0B" role="2Oq$k0" />
-              <node concept="2OwXpG" id="syqlb1Uadu" role="2OqNvi">
-                <ref role="2Oxat5" node="syqlb1TYuj" resolve="used" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="syqlb1Vpwi" role="lGtFl">
-        <node concept="TZ5HA" id="syqlb1Vpwj" role="TZ5H$">
-          <node concept="1dT_AC" id="syqlb1Vpwk" role="1dT_Ay">
-            <property role="1dT_AB" value="Set auxiliary flag indicating that this index is used to report cache state. " />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="syqlb1THJC" role="jymVt" />
-    <node concept="3clFb_" id="syqlb1UmCh" role="jymVt">
-      <property role="TrG5h" value="isUsed" />
-      <node concept="10P_77" id="syqlb1UqcQ" role="3clF45" />
-      <node concept="3Tm1VV" id="syqlb1UmCl" role="1B3o_S" />
-      <node concept="3clFbS" id="syqlb1UmCm" role="3clF47">
-        <node concept="3cpWs6" id="syqlb1UuzG" role="3cqZAp">
-          <node concept="37vLTw" id="syqlb1Uu$N" role="3cqZAk">
-            <ref role="3cqZAo" node="syqlb1TYuj" resolve="used" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="hXo0G7uqXB" role="jymVt" />
     <node concept="3clFb_" id="6QH_LDtcxgN" role="jymVt">
       <property role="TrG5h" value="getType" />
       <node concept="37vLTG" id="6QH_LDtcxgO" role="3clF46">
@@ -3696,19 +3638,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1z4$59jr4ea" role="jymVt" />
-    <node concept="3clFb_" id="7gMIJIydDx5" role="jymVt">
-      <property role="TrG5h" value="isActive" />
-      <node concept="10P_77" id="7gMIJIydJDP" role="3clF45" />
-      <node concept="3Tm1VV" id="7gMIJIydDx8" role="1B3o_S" />
-      <node concept="3clFbS" id="7gMIJIydDx9" role="3clF47">
-        <node concept="3clFbF" id="7gMIJIye4cn" role="3cqZAp">
-          <node concept="37vLTw" id="7gMIJIye4cm" role="3clFbG">
-            <ref role="3cqZAo" node="7gMIJIyc8MI" resolve="active" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7gMIJIydXXl" role="jymVt" />
     <node concept="3clFb_" id="7gMIJIycJB4" role="jymVt">
       <property role="TrG5h" value="disengage" />
       <node concept="3cqZAl" id="7gMIJIycJB6" role="3clF45" />
@@ -3780,17 +3709,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7gMIJIyd7Bj" role="3cqZAp">
-          <node concept="37vLTI" id="7gMIJIyd8Ku" role="3clFbG">
-            <node concept="3clFbT" id="7gMIJIyd8RS" role="37vLTx" />
-            <node concept="2OqwBi" id="7gMIJIyd7Jh" role="37vLTJ">
-              <node concept="Xjq3P" id="7gMIJIyd7Bi" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7gMIJIyd7Y5" role="2OqNvi">
-                <ref role="2Oxat5" node="7gMIJIyc8MI" resolve="active" />
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7gMIJIychNo" role="jymVt" />
@@ -4098,38 +4016,207 @@
       </node>
     </node>
     <node concept="2tJIrI" id="9dktABH5SO" role="jymVt" />
-    <node concept="3clFb_" id="1RYTbd8ynDp" role="jymVt">
-      <property role="TrG5h" value="dropInvalidatedTypes" />
-      <node concept="37vLTG" id="1RYTbd8yF__" role="3clF46">
-        <property role="TrG5h" value="locations" />
-        <node concept="3vKaQO" id="1RYTbd8yK2i" role="1tU5fm">
-          <node concept="2sp9CU" id="1RYTbd8yKEc" role="3O5elw" />
+    <node concept="3clFb_" id="3Pxu0s8oq7g" role="jymVt">
+      <property role="TrG5h" value="dropInvalidated" />
+      <node concept="37vLTG" id="3Pxu0s8oGkp" role="3clF46">
+        <property role="TrG5h" value="origins" />
+        <node concept="3vKaQO" id="3Pxu0s8oPzD" role="1tU5fm">
+          <node concept="3Tqbb2" id="3Pxu0s8oQ7M" role="3O5elw" />
         </node>
       </node>
-      <node concept="3cqZAl" id="1RYTbd8ynDr" role="3clF45" />
-      <node concept="3Tmbuc" id="1RYTbd8yrUx" role="1B3o_S" />
-      <node concept="3clFbS" id="1RYTbd8ynDt" role="3clF47">
-        <node concept="1DcWWT" id="1RYTbd8yMXZ" role="3cqZAp">
-          <node concept="3clFbS" id="1RYTbd8yMY2" role="2LFqv$">
-            <node concept="3clFbF" id="1RYTbd8yO8m" role="3cqZAp">
-              <node concept="2OqwBi" id="1RYTbd8yOHD" role="3clFbG">
-                <node concept="37vLTw" id="1RYTbd8yO8l" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6QH_LDtcJq4" resolve="typeNodes" />
-                </node>
-                <node concept="kI3uX" id="1RYTbd8yP__" role="2OqNvi">
-                  <node concept="37vLTw" id="1RYTbd8yPEm" role="kIiFs">
-                    <ref role="3cqZAo" node="1RYTbd8yMY3" resolve="loc" />
+      <node concept="37vLTG" id="3Pxu0s8oQFQ" role="3clF46">
+        <property role="TrG5h" value="feedbackKeys" />
+        <node concept="3vKaQO" id="3Pxu0s8oVZC" role="1tU5fm">
+          <node concept="3uibUv" id="3Pxu0s8oW_D" role="3O5elw">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="3Pxu0s8oq7i" role="3clF45" />
+      <node concept="3Tmbuc" id="3Pxu0s8ow0S" role="1B3o_S" />
+      <node concept="3clFbS" id="3Pxu0s8oq7k" role="3clF47">
+        <node concept="3clFbJ" id="3Pxu0s8stqM" role="3cqZAp">
+          <node concept="3clFbS" id="3Pxu0s8stqO" role="3clFbx">
+            <node concept="1DcWWT" id="1RYTbd8yMXZ" role="3cqZAp">
+              <node concept="3clFbS" id="1RYTbd8yMY2" role="2LFqv$">
+                <node concept="3clFbF" id="1RYTbd8yO8m" role="3cqZAp">
+                  <node concept="2OqwBi" id="1RYTbd8yOHD" role="3clFbG">
+                    <node concept="37vLTw" id="1RYTbd8yO8l" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6QH_LDtcJq4" resolve="typeNodes" />
+                    </node>
+                    <node concept="kI3uX" id="1RYTbd8yP__" role="2OqNvi">
+                      <node concept="2OqwBi" id="3Pxu0s8pLBG" role="kIiFs">
+                        <node concept="liA8E" id="3Pxu0s8q08k" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                        </node>
+                        <node concept="2JrnkZ" id="3Pxu0s8pLBL" role="2Oq$k0">
+                          <node concept="37vLTw" id="1RYTbd8yPEm" role="2JrQYb">
+                            <ref role="3cqZAo" node="1RYTbd8yMY3" resolve="org" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="3clFbF" id="3Pxu0s8$7D7" role="3cqZAp">
+                  <node concept="2OqwBi" id="3Pxu0s8$7D8" role="3clFbG">
+                    <node concept="37vLTw" id="3Pxu0s8$7D9" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5Qx6_659JRp" resolve="tcReportItems" />
+                    </node>
+                    <node concept="kI3uX" id="3Pxu0s8$7Da" role="2OqNvi">
+                      <node concept="37vLTw" id="3Pxu0s8$cXV" role="kIiFs">
+                        <ref role="3cqZAo" node="1RYTbd8yMY3" resolve="org" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWsn" id="1RYTbd8yMY3" role="1Duv9x">
+                <property role="TrG5h" value="org" />
+                <node concept="3Tqbb2" id="3Pxu0s8pxQe" role="1tU5fm" />
+              </node>
+              <node concept="37vLTw" id="3Pxu0s8prXL" role="1DdaDG">
+                <ref role="3cqZAo" node="3Pxu0s8oGkp" resolve="origins" />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="3Pxu0s8sAcJ" role="3clFbw">
+            <node concept="10Nm6u" id="3Pxu0s8sE0C" role="3uHU7w" />
+            <node concept="37vLTw" id="3Pxu0s8syH8" role="3uHU7B">
+              <ref role="3cqZAo" node="3Pxu0s8oGkp" resolve="origins" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3Pxu0s8sXK1" role="3cqZAp">
+          <node concept="3clFbS" id="3Pxu0s8sXK3" role="3clFbx">
+            <node concept="1DcWWT" id="1RYTbd8z07s" role="3cqZAp">
+              <node concept="3clFbS" id="1RYTbd8z07t" role="2LFqv$">
+                <node concept="3clFbF" id="1RYTbd8z07u" role="3cqZAp">
+                  <node concept="2OqwBi" id="1RYTbd8z07v" role="3clFbG">
+                    <node concept="37vLTw" id="1RYTbd8zwtf" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5Qx6_659JRp" resolve="tcReportItems" />
+                    </node>
+                    <node concept="kI3uX" id="1RYTbd8z07x" role="2OqNvi">
+                      <node concept="37vLTw" id="1RYTbd8z07y" role="kIiFs">
+                        <ref role="3cqZAo" node="1RYTbd8z07z" resolve="key" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWsn" id="1RYTbd8z07z" role="1Duv9x">
+                <property role="TrG5h" value="key" />
+                <node concept="3uibUv" id="1RYTbd8zMwY" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="3Pxu0s8p59x" role="1DdaDG">
+                <ref role="3cqZAo" node="3Pxu0s8oQFQ" resolve="feedbackKeys" />
+              </node>
+            </node>
+            <node concept="3SKdUt" id="3Pxu0s8$n4s" role="3cqZAp">
+              <node concept="1PaTwC" id="3Pxu0s8$n4t" role="1aUNEU">
+                <node concept="3oM_SD" id="3Pxu0s8$s37" role="1PaTwD">
+                  <property role="3oM_SC" value="TODO:" />
+                </node>
+                <node concept="3oM_SD" id="3Pxu0s8$s39" role="1PaTwD">
+                  <property role="3oM_SC" value="review" />
+                </node>
+                <node concept="3oM_SD" id="3Pxu0s8$s3c" role="1PaTwD">
+                  <property role="3oM_SC" value="this" />
+                </node>
+                <node concept="3oM_SD" id="3Pxu0s8$s3g" role="1PaTwD">
+                  <property role="3oM_SC" value="code" />
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="19fWAfyd_vQ" role="3cqZAp">
+              <node concept="1PaTwC" id="19fWAfyd_vR" role="1aUNEU">
+                <node concept="3oM_SD" id="19fWAfyd_vS" role="1PaTwD">
+                  <property role="3oM_SC" value="reset" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_vT" role="1PaTwD">
+                  <property role="3oM_SC" value="keys" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_vU" role="1PaTwD">
+                  <property role="3oM_SC" value="from" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_vV" role="1PaTwD">
+                  <property role="3oM_SC" value="previous" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_vW" role="1PaTwD">
+                  <property role="3oM_SC" value="session" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_vX" role="1PaTwD">
+                  <property role="3oM_SC" value="to" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_vY" role="1PaTwD">
+                  <property role="3oM_SC" value="current" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_vZ" role="1PaTwD">
+                  <property role="3oM_SC" value="ones." />
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="19fWAfyd_w0" role="3cqZAp">
+              <node concept="1PaTwC" id="19fWAfyd_w1" role="1aUNEU">
+                <node concept="3oM_SD" id="19fWAfyd_w2" role="1PaTwD">
+                  <property role="3oM_SC" value="current" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_w3" role="1PaTwD">
+                  <property role="3oM_SC" value="invalid" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_w4" role="1PaTwD">
+                  <property role="3oM_SC" value="keys" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_w5" role="1PaTwD">
+                  <property role="3oM_SC" value="are" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_w6" role="1PaTwD">
+                  <property role="3oM_SC" value="needed" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_w7" role="1PaTwD">
+                  <property role="3oM_SC" value="for" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_w8" role="1PaTwD">
+                  <property role="3oM_SC" value="filtering" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_w9" role="1PaTwD">
+                  <property role="3oM_SC" value="out" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_wa" role="1PaTwD">
+                  <property role="3oM_SC" value="certain" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_wb" role="1PaTwD">
+                  <property role="3oM_SC" value="feedback" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_wc" role="1PaTwD">
+                  <property role="3oM_SC" value="items" />
+                </node>
+                <node concept="3oM_SD" id="19fWAfyd_wd" role="1PaTwD">
+                  <property role="3oM_SC" value="later." />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="19fWAfydoCe" role="3cqZAp">
+              <node concept="37vLTI" id="19fWAfydqiT" role="3clFbG">
+                <node concept="2OqwBi" id="19fWAfydoNq" role="37vLTJ">
+                  <node concept="Xjq3P" id="19fWAfydoCc" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="19fWAfydp3g" role="2OqNvi">
+                    <ref role="2Oxat5" node="1DIG_2lNsYk" resolve="invalidFeedbackKeys" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="3Pxu0s8pegY" role="37vLTx">
+                  <ref role="3cqZAo" node="3Pxu0s8oQFQ" resolve="feedbackKeys" />
+                </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWsn" id="1RYTbd8yMY3" role="1Duv9x">
-            <property role="TrG5h" value="loc" />
-            <node concept="2sp9CU" id="1RYTbd8yMY7" role="1tU5fm" />
-          </node>
-          <node concept="37vLTw" id="1RYTbd8yMY8" role="1DdaDG">
-            <ref role="3cqZAo" node="1RYTbd8yF__" resolve="locations" />
+          <node concept="3y3z36" id="3Pxu0s8t6Os" role="3clFbw">
+            <node concept="10Nm6u" id="3Pxu0s8tb$2" role="3uHU7w" />
+            <node concept="37vLTw" id="3Pxu0s8t1cA" role="3uHU7B">
+              <ref role="3cqZAo" node="3Pxu0s8oQFQ" resolve="feedbackKeys" />
+            </node>
           </node>
         </node>
       </node>
@@ -4173,7 +4260,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="9dktABHyKE" role="jymVt" />
+    <node concept="2tJIrI" id="3yEb0I3SVca" role="jymVt" />
     <node concept="3clFb_" id="3yEb0I3WCjJ" role="jymVt">
       <property role="TrG5h" value="addReportItem" />
       <node concept="3Tmbuc" id="1z4$59jjQI7" role="1B3o_S" />
@@ -4200,7 +4287,7 @@
             </node>
             <node concept="3cpWs8" id="1XMs8FbYgum" role="3cqZAp">
               <node concept="3cpWsn" id="1XMs8FbYgun" role="3cpWs9">
-                <property role="TrG5h" value="triKey" />
+                <property role="TrG5h" value="key" />
                 <node concept="3uibUv" id="1XMs8FbYguo" role="1tU5fm">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -4209,7 +4296,7 @@
                     <ref role="3cqZAo" node="5Qx6_659VvG" resolve="tri" />
                   </node>
                   <node concept="liA8E" id="1XMs8FbZh_H" role="2OqNvi">
-                    <ref role="37wK5l" node="5b5WPl4QD9T" resolve="getFeedbackIdentity" />
+                    <ref role="37wK5l" node="5b5WPl4QD9T" resolve="getFeedbackKey" />
                   </node>
                 </node>
               </node>
@@ -4225,7 +4312,7 @@
                 </node>
                 <node concept="3JPx81" id="1DIG_2lNBqV" role="2OqNvi">
                   <node concept="37vLTw" id="1DIG_2lNBzL" role="25WWJ7">
-                    <ref role="3cqZAo" node="1XMs8FbYgun" resolve="triKey" />
+                    <ref role="3cqZAo" node="1XMs8FbYgun" resolve="key" />
                   </node>
                 </node>
               </node>
@@ -4244,7 +4331,7 @@
                     </node>
                     <node concept="3EllGN" id="5Qx6_659YQM" role="37vLTJ">
                       <node concept="37vLTw" id="1XMs8FbYVJr" role="3ElVtu">
-                        <ref role="3cqZAo" node="1XMs8FbYgun" resolve="triKey" />
+                        <ref role="3cqZAo" node="1XMs8FbYgun" resolve="key" />
                       </node>
                       <node concept="37vLTw" id="5Qx6_659YjY" role="3ElQJh">
                         <ref role="3cqZAo" node="5Qx6_659JRp" resolve="tcReportItems" />
@@ -4260,7 +4347,7 @@
                   </node>
                   <node concept="2Nt0df" id="5Qx6_659Y5k" role="2OqNvi">
                     <node concept="37vLTw" id="1XMs8FbYUYU" role="38cxEo">
-                      <ref role="3cqZAo" node="1XMs8FbYgun" resolve="triKey" />
+                      <ref role="3cqZAo" node="1XMs8FbYgun" resolve="key" />
                     </node>
                   </node>
                 </node>
@@ -4270,7 +4357,7 @@
               <node concept="2OqwBi" id="1XMs8FbYZiN" role="3clFbG">
                 <node concept="3EllGN" id="1XMs8FbYYb2" role="2Oq$k0">
                   <node concept="37vLTw" id="1XMs8FbYYuR" role="3ElVtu">
-                    <ref role="3cqZAo" node="1XMs8FbYgun" resolve="triKey" />
+                    <ref role="3cqZAo" node="1XMs8FbYgun" resolve="key" />
                   </node>
                   <node concept="37vLTw" id="1XMs8FbYXi2" role="3ElQJh">
                     <ref role="3cqZAo" node="5Qx6_659JRp" resolve="tcReportItems" />
@@ -4320,128 +4407,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1RYTbd8z5Fo" role="jymVt" />
-    <node concept="3clFb_" id="1RYTbd8z07l" role="jymVt">
-      <property role="TrG5h" value="dropInvalidatedFeedback" />
-      <node concept="37vLTG" id="1RYTbd8z07m" role="3clF46">
-        <property role="TrG5h" value="locations" />
-        <node concept="3vKaQO" id="1RYTbd8z07n" role="1tU5fm">
-          <node concept="3uibUv" id="1RYTbd8zIFR" role="3O5elw">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1RYTbd8z07p" role="3clF45" />
-      <node concept="3Tmbuc" id="1RYTbd8z07q" role="1B3o_S" />
-      <node concept="3clFbS" id="1RYTbd8z07r" role="3clF47">
-        <node concept="1DcWWT" id="1RYTbd8z07s" role="3cqZAp">
-          <node concept="3clFbS" id="1RYTbd8z07t" role="2LFqv$">
-            <node concept="3clFbF" id="1RYTbd8z07u" role="3cqZAp">
-              <node concept="2OqwBi" id="1RYTbd8z07v" role="3clFbG">
-                <node concept="37vLTw" id="1RYTbd8zwtf" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Qx6_659JRp" resolve="tcReportItems" />
-                </node>
-                <node concept="kI3uX" id="1RYTbd8z07x" role="2OqNvi">
-                  <node concept="37vLTw" id="1RYTbd8z07y" role="kIiFs">
-                    <ref role="3cqZAo" node="1RYTbd8z07z" resolve="key" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="1RYTbd8z07z" role="1Duv9x">
-            <property role="TrG5h" value="key" />
-            <node concept="3uibUv" id="1RYTbd8zMwY" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="1RYTbd8z07_" role="1DdaDG">
-            <ref role="3cqZAo" node="1RYTbd8z07m" resolve="locations" />
-          </node>
-        </node>
-        <node concept="3SKdUt" id="19fWAfyd_vQ" role="3cqZAp">
-          <node concept="1PaTwC" id="19fWAfyd_vR" role="1aUNEU">
-            <node concept="3oM_SD" id="19fWAfyd_vS" role="1PaTwD">
-              <property role="3oM_SC" value="reset" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_vT" role="1PaTwD">
-              <property role="3oM_SC" value="keys" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_vU" role="1PaTwD">
-              <property role="3oM_SC" value="from" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_vV" role="1PaTwD">
-              <property role="3oM_SC" value="previous" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_vW" role="1PaTwD">
-              <property role="3oM_SC" value="session" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_vX" role="1PaTwD">
-              <property role="3oM_SC" value="to" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_vY" role="1PaTwD">
-              <property role="3oM_SC" value="current" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_vZ" role="1PaTwD">
-              <property role="3oM_SC" value="ones." />
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="19fWAfyd_w0" role="3cqZAp">
-          <node concept="1PaTwC" id="19fWAfyd_w1" role="1aUNEU">
-            <node concept="3oM_SD" id="19fWAfyd_w2" role="1PaTwD">
-              <property role="3oM_SC" value="current" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_w3" role="1PaTwD">
-              <property role="3oM_SC" value="invalid" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_w4" role="1PaTwD">
-              <property role="3oM_SC" value="keys" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_w5" role="1PaTwD">
-              <property role="3oM_SC" value="are" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_w6" role="1PaTwD">
-              <property role="3oM_SC" value="needed" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_w7" role="1PaTwD">
-              <property role="3oM_SC" value="for" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_w8" role="1PaTwD">
-              <property role="3oM_SC" value="filtering" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_w9" role="1PaTwD">
-              <property role="3oM_SC" value="out" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_wa" role="1PaTwD">
-              <property role="3oM_SC" value="certain" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_wb" role="1PaTwD">
-              <property role="3oM_SC" value="feedback" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_wc" role="1PaTwD">
-              <property role="3oM_SC" value="items" />
-            </node>
-            <node concept="3oM_SD" id="19fWAfyd_wd" role="1PaTwD">
-              <property role="3oM_SC" value="later." />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="19fWAfydoCe" role="3cqZAp">
-          <node concept="37vLTI" id="19fWAfydqiT" role="3clFbG">
-            <node concept="37vLTw" id="19fWAfydrJM" role="37vLTx">
-              <ref role="3cqZAo" node="1RYTbd8z07m" resolve="locations" />
-            </node>
-            <node concept="2OqwBi" id="19fWAfydoNq" role="37vLTJ">
-              <node concept="Xjq3P" id="19fWAfydoCc" role="2Oq$k0" />
-              <node concept="2OwXpG" id="19fWAfydp3g" role="2OqNvi">
-                <ref role="2Oxat5" node="1DIG_2lNsYk" resolve="invalidFeedbackKeys" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3yEb0I3SVca" role="jymVt" />
     <node concept="3clFb_" id="1z4$59j_T$f" role="jymVt">
       <property role="TrG5h" value="putConvertsTo" />
       <node concept="37vLTG" id="1z4$59j_T$g" role="3clF46">
@@ -5119,20 +5084,6 @@
         </node>
       </node>
     </node>
-    <node concept="312cEg" id="syqlb1TYuj" role="jymVt">
-      <property role="TrG5h" value="used" />
-      <node concept="3Tm6S6" id="syqlb1TYuk" role="1B3o_S" />
-      <node concept="10P_77" id="syqlb1U4dU" role="1tU5fm" />
-      <node concept="3clFbT" id="syqlb1U4lL" role="33vP2m" />
-    </node>
-    <node concept="312cEg" id="7gMIJIyc8MI" role="jymVt">
-      <property role="TrG5h" value="active" />
-      <node concept="3Tm6S6" id="7gMIJIyc8MJ" role="1B3o_S" />
-      <node concept="10P_77" id="7gMIJIyceKg" role="1tU5fm" />
-      <node concept="3clFbT" id="7gMIJIycgEh" role="33vP2m">
-        <property role="3clFbU" value="true" />
-      </node>
-    </node>
     <node concept="3UR2Jj" id="6$gg4kB0QnP" role="lGtFl">
       <node concept="TZ5HA" id="6$gg4kB0QnQ" role="TZ5H$">
         <node concept="1dT_AC" id="6$gg4kB0QnR" role="1dT_Ay">
@@ -6405,6 +6356,7 @@
             <property role="2bfB8j" value="true" />
             <ref role="37wK5l" node="7i3KM7g1T3X" resolve="CachedData.DataFlavour" />
             <ref role="1Y3XeK" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+            <node concept="2tJIrI" id="At0yqMN9Rq" role="jymVt" />
             <node concept="3Tm1VV" id="4Zz6A5Ig5UJ" role="1B3o_S" />
             <node concept="2OqwBi" id="6nFpYluEI4u" role="37wK5m">
               <node concept="3VsKOn" id="6nFpYluEshF" role="2Oq$k0">
@@ -6417,6 +6369,32 @@
             <node concept="3uibUv" id="6nFpYluDjjq" role="2Ghqu4">
               <ref role="3uigEE" to="ksgm:6nFpYlu02jD" resolve="UpdatesRecorder" />
             </node>
+            <node concept="3clFb_" id="At0yqMNbpz" role="jymVt">
+              <property role="TrG5h" value="needsUpdate" />
+              <node concept="10P_77" id="At0yqMNbp$" role="3clF45" />
+              <node concept="3Tm1VV" id="At0yqMNbp_" role="1B3o_S" />
+              <node concept="3clFbS" id="At0yqMNbpI" role="3clF47">
+                <node concept="3clFbF" id="At0yqMNkJ4" role="3cqZAp">
+                  <node concept="2OqwBi" id="At0yqMNl0Z" role="3clFbG">
+                    <node concept="37vLTw" id="At0yqMNkJ3" role="2Oq$k0">
+                      <ref role="3cqZAo" node="At0yqMNj2W" resolve="t" />
+                    </node>
+                    <node concept="liA8E" id="At0yqMOm5g" role="2OqNvi">
+                      <ref role="37wK5l" to="ksgm:At0yqMNzB3" resolve="hasChanges" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="At0yqMNbpJ" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
+              <node concept="37vLTG" id="At0yqMNj2W" role="3clF46">
+                <property role="TrG5h" value="t" />
+                <node concept="3uibUv" id="At0yqMNj2V" role="1tU5fm">
+                  <ref role="3uigEE" to="ksgm:6nFpYlu02jD" resolve="UpdatesRecorder" />
+                </node>
+              </node>
+            </node>
             <node concept="3clFb_" id="6YGKjaPwdNs" role="jymVt">
               <property role="TrG5h" value="dataSet" />
               <node concept="3cqZAl" id="6YGKjaPwdNt" role="3clF45" />
@@ -7143,9 +7121,9 @@
       </node>
       <node concept="2tJIrI" id="1RYTbd8jIZ1" role="jymVt" />
       <node concept="3clFb_" id="1RYTbd8cOQG" role="jymVt">
-        <property role="TrG5h" value="withInvalidatedFeedback" />
+        <property role="TrG5h" value="withInvalidatedFeedbackKeys" />
         <node concept="37vLTG" id="1RYTbd8cYjG" role="3clF46">
-          <property role="TrG5h" value="invalidatedFeedback" />
+          <property role="TrG5h" value="invalidatedFeedbackKeys" />
           <node concept="2hMVRd" id="1RYTbd8dlRP" role="1tU5fm">
             <node concept="3uibUv" id="1RYTbd8d$RM" role="2hN53Y">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
@@ -7165,11 +7143,11 @@
               <node concept="2OqwBi" id="1RYTbd8dHSt" role="37vLTJ">
                 <node concept="Xjq3P" id="1RYTbd8dHYm" role="2Oq$k0" />
                 <node concept="2OwXpG" id="1RYTbd8dHSw" role="2OqNvi">
-                  <ref role="2Oxat5" node="1RYTbd8dCTO" resolve="invalidatedFeedback" />
+                  <ref role="2Oxat5" node="1RYTbd8dCTO" resolve="invalidatedFeedbackKeys" />
                 </node>
               </node>
               <node concept="37vLTw" id="1RYTbd8dCTZ" role="37vLTx">
-                <ref role="3cqZAo" node="1RYTbd8cYjG" resolve="invalidatedFeedback" />
+                <ref role="3cqZAo" node="1RYTbd8cYjG" resolve="invalidatedFeedbackKeys" />
               </node>
             </node>
           </node>
@@ -7180,11 +7158,11 @@
       </node>
       <node concept="2tJIrI" id="1RYTbd8duYV" role="jymVt" />
       <node concept="3clFb_" id="1RYTbd8duYG" role="jymVt">
-        <property role="TrG5h" value="withInvalidated" />
+        <property role="TrG5h" value="withInvalidatedOrigins" />
         <node concept="37vLTG" id="1RYTbd8duYH" role="3clF46">
-          <property role="TrG5h" value="invalidatedLocations" />
+          <property role="TrG5h" value="invalidatedOrigins" />
           <node concept="2hMVRd" id="1RYTbd8duYI" role="1tU5fm">
-            <node concept="2sp9CU" id="1RYTbd8duYJ" role="2hN53Y" />
+            <node concept="3Tqbb2" id="3Pxu0s8lPdq" role="2hN53Y" />
           </node>
         </node>
         <node concept="3uibUv" id="1RYTbd8duYK" role="3clF45">
@@ -7200,11 +7178,11 @@
               <node concept="2OqwBi" id="1RYTbd8duYP" role="37vLTJ">
                 <node concept="Xjq3P" id="1RYTbd8duYQ" role="2Oq$k0" />
                 <node concept="2OwXpG" id="1RYTbd8duYR" role="2OqNvi">
-                  <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedLocations" />
+                  <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedOrigins" />
                 </node>
               </node>
               <node concept="37vLTw" id="1RYTbd8duYS" role="37vLTx">
-                <ref role="3cqZAo" node="1RYTbd8duYH" resolve="invalidatedLocations" />
+                <ref role="3cqZAo" node="1RYTbd8duYH" resolve="invalidatedOrigins" />
               </node>
             </node>
           </node>
@@ -7316,14 +7294,14 @@
         </node>
       </node>
       <node concept="312cEg" id="1RYTbd8dm$e" role="jymVt">
-        <property role="TrG5h" value="invalidatedLocations" />
+        <property role="TrG5h" value="invalidatedOrigins" />
         <node concept="3Tm6S6" id="1RYTbd8dm$f" role="1B3o_S" />
         <node concept="2hMVRd" id="1RYTbd8dm$h" role="1tU5fm">
-          <node concept="2sp9CU" id="1RYTbd8dm$i" role="2hN53Y" />
+          <node concept="3Tqbb2" id="3Pxu0s8mb9_" role="2hN53Y" />
         </node>
       </node>
       <node concept="312cEg" id="1RYTbd8dCTO" role="jymVt">
-        <property role="TrG5h" value="invalidatedFeedback" />
+        <property role="TrG5h" value="invalidatedFeedbackKeys" />
         <node concept="3Tm6S6" id="1RYTbd8dCTP" role="1B3o_S" />
         <node concept="2hMVRd" id="1RYTbd8dCTR" role="1tU5fm">
           <node concept="3uibUv" id="1RYTbd8dCTS" role="2hN53Y">
@@ -7881,68 +7859,28 @@
                                           </node>
                                         </node>
                                         <node concept="3clFbS" id="1RYTbd8sGIv" role="1bW5cS">
-                                          <node concept="3clFbJ" id="1RYTbd8zAdZ" role="3cqZAp">
-                                            <node concept="3clFbS" id="1RYTbd8zAe1" role="3clFbx">
-                                              <node concept="3clFbF" id="1RYTbd8zDVn" role="3cqZAp">
-                                                <node concept="2OqwBi" id="1RYTbd8zEum" role="3clFbG">
-                                                  <node concept="37vLTw" id="1RYTbd8zDVl" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="1RYTbd8sGIt" resolve="update" />
-                                                  </node>
-                                                  <node concept="liA8E" id="1RYTbd8zEQt" role="2OqNvi">
-                                                    <ref role="37wK5l" node="1RYTbd8yUNB" resolve="dropInvalidatedFeedback" />
-                                                    <node concept="2OqwBi" id="1RYTbd8zFVT" role="37wK5m">
-                                                      <node concept="37vLTw" id="1RYTbd8zFiI" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                                      </node>
-                                                      <node concept="2OwXpG" id="1RYTbd8zGu$" role="2OqNvi">
-                                                        <ref role="2Oxat5" node="1RYTbd8dCTO" resolve="invalidatedFeedback" />
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                </node>
+                                          <node concept="3clFbF" id="3Pxu0s8rqFa" role="3cqZAp">
+                                            <node concept="2OqwBi" id="3Pxu0s8rGMT" role="3clFbG">
+                                              <node concept="37vLTw" id="3Pxu0s8rBRl" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="1RYTbd8sGIt" resolve="update" />
                                               </node>
-                                            </node>
-                                            <node concept="3y3z36" id="1RYTbd8zCQE" role="3clFbw">
-                                              <node concept="10Nm6u" id="1RYTbd8zDCC" role="3uHU7w" />
-                                              <node concept="2OqwBi" id="1RYTbd8zAZX" role="3uHU7B">
-                                                <node concept="37vLTw" id="1RYTbd8zAwo" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                                </node>
-                                                <node concept="2OwXpG" id="1RYTbd8zBry" role="2OqNvi">
-                                                  <ref role="2Oxat5" node="1RYTbd8dCTO" resolve="invalidatedFeedback" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="3clFbJ" id="1RYTbd8zW_f" role="3cqZAp">
-                                            <node concept="3clFbS" id="1RYTbd8zW_g" role="3clFbx">
-                                              <node concept="3clFbF" id="1RYTbd8zW_h" role="3cqZAp">
-                                                <node concept="2OqwBi" id="1RYTbd8zW_i" role="3clFbG">
-                                                  <node concept="37vLTw" id="1RYTbd8zW_j" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="1RYTbd8sGIt" resolve="update" />
+                                              <node concept="liA8E" id="3Pxu0s8rNHY" role="2OqNvi">
+                                                <ref role="37wK5l" node="3Pxu0s8qa6J" resolve="dropInvalidated" />
+                                                <node concept="2OqwBi" id="3Pxu0s8rYva" role="37wK5m">
+                                                  <node concept="37vLTw" id="3Pxu0s8rYvb" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
                                                   </node>
-                                                  <node concept="liA8E" id="1RYTbd8zW_k" role="2OqNvi">
-                                                    <ref role="37wK5l" node="1RYTbd8y62z" resolve="dropInvalidatedTypes" />
-                                                    <node concept="2OqwBi" id="1RYTbd8zW_l" role="37wK5m">
-                                                      <node concept="37vLTw" id="1RYTbd8zW_m" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                                      </node>
-                                                      <node concept="2OwXpG" id="1RYTbd8zZo0" role="2OqNvi">
-                                                        <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedLocations" />
-                                                      </node>
-                                                    </node>
+                                                  <node concept="2OwXpG" id="3Pxu0s8rYvc" role="2OqNvi">
+                                                    <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedOrigins" />
                                                   </node>
                                                 </node>
-                                              </node>
-                                            </node>
-                                            <node concept="3y3z36" id="1RYTbd8zW_o" role="3clFbw">
-                                              <node concept="10Nm6u" id="1RYTbd8zW_p" role="3uHU7w" />
-                                              <node concept="2OqwBi" id="1RYTbd8zW_q" role="3uHU7B">
-                                                <node concept="37vLTw" id="1RYTbd8zW_r" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                                </node>
-                                                <node concept="2OwXpG" id="1RYTbd8zYlh" role="2OqNvi">
-                                                  <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedLocations" />
+                                                <node concept="2OqwBi" id="3Pxu0s8sbz9" role="37wK5m">
+                                                  <node concept="37vLTw" id="3Pxu0s8sbza" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
+                                                  </node>
+                                                  <node concept="2OwXpG" id="3Pxu0s8sbzb" role="2OqNvi">
+                                                    <ref role="2Oxat5" node="1RYTbd8dCTO" resolve="invalidatedFeedbackKeys" />
+                                                  </node>
                                                 </node>
                                               </node>
                                             </node>
@@ -9673,6 +9611,75 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4duYm8_iT_v" role="jymVt" />
+    <node concept="3clFb_" id="At0yqMUA4l" role="jymVt">
+      <property role="TrG5h" value="isCacheUpToDate" />
+      <node concept="37vLTG" id="At0yqMVkco" role="3clF46">
+        <property role="TrG5h" value="root" />
+        <node concept="3Tqbb2" id="At0yqMVnog" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="At0yqMUSTl" role="3clF45" />
+      <node concept="3Tm1VV" id="At0yqMUA4o" role="1B3o_S" />
+      <node concept="3clFbS" id="At0yqMUA4p" role="3clF47">
+        <node concept="3SKdUt" id="At0yqMVnsL" role="3cqZAp">
+          <node concept="1PaTwC" id="At0yqMVnsM" role="1aUNEU">
+            <node concept="3oM_SD" id="At0yqMVnsN" role="1PaTwD">
+              <property role="3oM_SC" value="ensure" />
+            </node>
+            <node concept="3oM_SD" id="At0yqMVnsO" role="1PaTwD">
+              <property role="3oM_SC" value="we" />
+            </node>
+            <node concept="3oM_SD" id="At0yqMVnsP" role="1PaTwD">
+              <property role="3oM_SC" value="can" />
+            </node>
+            <node concept="3oM_SD" id="At0yqMVnsQ" role="1PaTwD">
+              <property role="3oM_SC" value="read" />
+            </node>
+            <node concept="3oM_SD" id="At0yqMVnsR" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="At0yqMVnsS" role="1PaTwD">
+              <property role="3oM_SC" value="model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="At0yqMVnsT" role="3cqZAp">
+          <node concept="2OqwBi" id="At0yqMVnsU" role="3clFbG">
+            <node concept="2OqwBi" id="At0yqMVnsV" role="2Oq$k0">
+              <node concept="37vLTw" id="At0yqMVnsW" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="At0yqMVnsX" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
+              </node>
+            </node>
+            <node concept="liA8E" id="At0yqMVnsY" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="At0yqMWELA" role="3cqZAp">
+          <node concept="2OqwBi" id="At0yqMWJ51" role="3clFbG">
+            <node concept="37vLTw" id="At0yqMWEL$" role="2Oq$k0">
+              <ref role="3cqZAo" node="1z4$59jKKYm" resolve="state" />
+            </node>
+            <node concept="liA8E" id="At0yqMWPPK" role="2OqNvi">
+              <ref role="37wK5l" node="At0yqMVCuW" resolve="isCacheUpToDate" />
+              <node concept="2OqwBi" id="At0yqMX35H" role="37wK5m">
+                <node concept="liA8E" id="At0yqMXmwZ" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                </node>
+                <node concept="2JrnkZ" id="At0yqMX35M" role="2Oq$k0">
+                  <node concept="37vLTw" id="At0yqMWW4i" role="2JrQYb">
+                    <ref role="3cqZAo" node="At0yqMVkco" resolve="root" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="At0yqMUuKt" role="jymVt" />
     <node concept="3clFb_" id="1RYTbd7Di6U" role="jymVt">
       <property role="TrG5h" value="getState" />
       <node concept="3uibUv" id="1RYTbd7Do$0" role="3clF45">
@@ -11665,7 +11672,7 @@
             <node concept="2OqwBi" id="5b5WPl4QxEJ" role="37vLTJ">
               <node concept="Xjq3P" id="5b5WPl4QxcI" role="2Oq$k0" />
               <node concept="2OwXpG" id="5b5WPl4Qywt" role="2OqNvi">
-                <ref role="2Oxat5" node="5b5WPl4Qrak" resolve="feedbackIdentity" />
+                <ref role="2Oxat5" node="5b5WPl4Qrak" resolve="feedbackKey" />
               </node>
             </node>
           </node>
@@ -11679,60 +11686,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1FOQehxMMQ5" role="jymVt" />
-    <node concept="3clFbW" id="1FOQehxMMLH" role="jymVt">
-      <node concept="37vLTG" id="1FOQehxMMLI" role="3clF46">
-        <property role="TrG5h" value="stat" />
-        <node concept="3uibUv" id="1FOQehxMMLJ" role="1tU5fm">
-          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1FOQehxMMLK" role="3clF46">
-        <property role="TrG5h" value="nodeRef" />
-        <node concept="3uibUv" id="1FOQehxMMLL" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1FOQehxMMLM" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="1FOQehxMMLN" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1FOQehxMN30" role="3clF46">
-        <property role="TrG5h" value="cause" />
-        <node concept="3uibUv" id="1FOQehxMN5T" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1FOQehxMMLO" role="3clF45" />
-      <node concept="3Tm1VV" id="1FOQehxMMLP" role="1B3o_S" />
-      <node concept="3clFbS" id="1FOQehxMMLQ" role="3clF47">
-        <node concept="XkiVB" id="1FOQehxMMLR" role="3cqZAp">
-          <ref role="37wK5l" to="d6hs:~NodeReportItemBase.&lt;init&gt;(jetbrains.mps.errors.MessageStatus,org.jetbrains.mps.openapi.model.SNodeReference,java.lang.String)" resolve="NodeReportItemBase" />
-          <node concept="37vLTw" id="1FOQehxMMLS" role="37wK5m">
-            <ref role="3cqZAo" node="1FOQehxMMLI" resolve="stat" />
-          </node>
-          <node concept="37vLTw" id="1FOQehxMMLT" role="37wK5m">
-            <ref role="3cqZAo" node="1FOQehxMMLK" resolve="nodeRef" />
-          </node>
-          <node concept="37vLTw" id="1FOQehxMMLU" role="37wK5m">
-            <ref role="3cqZAo" node="1FOQehxMMLM" resolve="message" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="1FOQehxMN6y" role="3cqZAp">
-          <node concept="37vLTI" id="1FOQehxMN6$" role="3clFbG">
-            <node concept="2OqwBi" id="1FOQehxMNbX" role="37vLTJ">
-              <node concept="Xjq3P" id="1FOQehxMNeB" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1FOQehxMNc0" role="2OqNvi">
-                <ref role="2Oxat5" node="1FOQehxMN6u" resolve="cause" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="1FOQehxMN6C" role="37vLTx">
-              <ref role="3cqZAo" node="1FOQehxMN30" resolve="cause" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1FOQehwowbp" role="jymVt" />
     <node concept="3Tm1VV" id="1FOQehwovmX" role="1B3o_S" />
     <node concept="3uibUv" id="1FOQehwovnW" role="1zkMxy">
       <ref role="3uigEE" to="d6hs:~NodeReportItemBase" resolve="NodeReportItemBase" />
@@ -11833,11 +11786,11 @@
     </node>
     <node concept="2tJIrI" id="5b5WPl4QzZM" role="jymVt" />
     <node concept="3clFb_" id="5b5WPl4QD9T" role="jymVt">
-      <property role="TrG5h" value="getFeedbackIdentity" />
+      <property role="TrG5h" value="getFeedbackKey" />
       <node concept="3clFbS" id="5b5WPl4QD9W" role="3clF47">
         <node concept="3clFbF" id="5b5WPl4QFJb" role="3cqZAp">
           <node concept="37vLTw" id="5b5WPl4QFJa" role="3clFbG">
-            <ref role="3cqZAo" node="5b5WPl4Qrak" resolve="feedbackIdentity" />
+            <ref role="3cqZAo" node="5b5WPl4Qrak" resolve="feedbackKey" />
           </node>
         </node>
       </node>
@@ -11869,6 +11822,11 @@
         <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
       </node>
     </node>
+    <node concept="312cEg" id="3Pxu0s8yRNl" role="jymVt">
+      <property role="TrG5h" value="origin" />
+      <node concept="3Tm6S6" id="3Pxu0s8yRNm" role="1B3o_S" />
+      <node concept="3Tqbb2" id="3Pxu0s8yRZL" role="1tU5fm" />
+    </node>
     <node concept="3uibUv" id="4ekZiHdbRUL" role="EKbjA">
       <ref role="3uigEE" to="d6hs:~RuleIdFlavouredItem" resolve="RuleIdFlavouredItem" />
     </node>
@@ -11880,7 +11838,7 @@
       </node>
     </node>
     <node concept="312cEg" id="5b5WPl4Qrak" role="jymVt">
-      <property role="TrG5h" value="feedbackIdentity" />
+      <property role="TrG5h" value="feedbackKey" />
       <node concept="3Tm6S6" id="5b5WPl4QoOJ" role="1B3o_S" />
       <node concept="3uibUv" id="5b5WPl4QpBo" role="1tU5fm">
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
@@ -12064,6 +12022,58 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4Dkptq1OIZz" role="jymVt" />
+    <node concept="3clFb_" id="At0yqMVCuW" role="jymVt">
+      <property role="TrG5h" value="isCacheUpToDate" />
+      <node concept="37vLTG" id="At0yqMWbwW" role="3clF46">
+        <property role="TrG5h" value="unitRef" />
+        <node concept="3uibUv" id="At0yqMWbwX" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="10P_77" id="At0yqMW1zQ" role="3clF45" />
+      <node concept="3Tm1VV" id="At0yqMVCuZ" role="1B3o_S" />
+      <node concept="3clFbS" id="At0yqMVCv0" role="3clF47">
+        <node concept="3cpWs8" id="At0yqMWanp" role="3cqZAp">
+          <node concept="3cpWsn" id="At0yqMWanq" role="3cpWs9">
+            <property role="TrG5h" value="ch" />
+            <node concept="3uibUv" id="At0yqMW9u7" role="1tU5fm">
+              <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
+            </node>
+            <node concept="2OqwBi" id="At0yqMWanr" role="33vP2m">
+              <node concept="liA8E" id="At0yqMWans" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                <node concept="37vLTw" id="At0yqMWcOH" role="37wK5m">
+                  <ref role="3cqZAo" node="At0yqMWbwW" resolve="unitRef" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="At0yqMWanu" role="2Oq$k0">
+                <ref role="3cqZAo" node="4Z$O9mrTa0z" resolve="unitCacheHolders" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="At0yqMW8R5" role="3cqZAp">
+          <node concept="3K4zz7" id="At0yqMWhHr" role="3clFbG">
+            <node concept="2OqwBi" id="At0yqMWjWf" role="3K4E3e">
+              <node concept="37vLTw" id="At0yqMWiG2" role="2Oq$k0">
+                <ref role="3cqZAo" node="At0yqMWanq" resolve="ch" />
+              </node>
+              <node concept="liA8E" id="At0yqMWv2C" role="2OqNvi">
+                <ref role="37wK5l" node="At0yqMWnw7" resolve="isCacheUpToDate" />
+              </node>
+            </node>
+            <node concept="3clFbT" id="At0yqMWwnM" role="3K4GZi" />
+            <node concept="3y3z36" id="At0yqMWfok" role="3K4Cdx">
+              <node concept="10Nm6u" id="At0yqMWgpr" role="3uHU7w" />
+              <node concept="37vLTw" id="At0yqMWanv" role="3uHU7B">
+                <ref role="3cqZAo" node="At0yqMWanq" resolve="ch" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="At0yqMVw_E" role="jymVt" />
     <node concept="3clFb_" id="1T5MAgPidDk" role="jymVt">
       <property role="TrG5h" value="typeCollector" />
       <node concept="3uibUv" id="1T5MAgPipeJ" role="3clF45">
@@ -13227,6 +13237,46 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4Z$O9mrQJI7" role="jymVt" />
+    <node concept="3clFb_" id="At0yqMWnw7" role="jymVt">
+      <property role="TrG5h" value="isCacheUpToDate" />
+      <node concept="10P_77" id="At0yqMWoXs" role="3clF45" />
+      <node concept="3clFbS" id="At0yqMWnwa" role="3clF47">
+        <node concept="3clFbF" id="At0yqMWqe8" role="3cqZAp">
+          <node concept="3fqX7Q" id="At0yqN0ZAY" role="3clFbG">
+            <node concept="2OqwBi" id="At0yqN0ZB0" role="3fr31v">
+              <node concept="2OqwBi" id="At0yqN0ZB1" role="2Oq$k0">
+                <node concept="37vLTw" id="At0yqN0ZB2" role="2Oq$k0">
+                  <ref role="3cqZAo" node="51a$_pPNotH" resolve="uniqueKey2data" />
+                </node>
+                <node concept="T8wYR" id="At0yqN0ZB3" role="2OqNvi" />
+              </node>
+              <node concept="2HwmR7" id="At0yqN0ZB4" role="2OqNvi">
+                <node concept="1bVj0M" id="At0yqN0ZB5" role="23t8la">
+                  <node concept="3clFbS" id="At0yqN0ZB6" role="1bW5cS">
+                    <node concept="3clFbF" id="At0yqN0ZB7" role="3cqZAp">
+                      <node concept="2OqwBi" id="At0yqN0ZB8" role="3clFbG">
+                        <node concept="37vLTw" id="At0yqN0ZB9" role="2Oq$k0">
+                          <ref role="3cqZAo" node="At0yqN0ZBb" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="At0yqN0ZBa" role="2OqNvi">
+                          <ref role="37wK5l" node="At0yqMRQt2" resolve="anyNeedsUpdate" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="At0yqN0ZBb" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="At0yqN0ZBc" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="At0yqMWoKC" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="At0yqMWlVE" role="jymVt" />
     <node concept="3clFb_" id="5Qx6_65_i3k" role="jymVt">
       <property role="TrG5h" value="updateCache" />
       <node concept="37vLTG" id="6b6o3l3huA6" role="3clF46">
@@ -13308,7 +13358,7 @@
         </node>
         <node concept="3clFbF" id="3UgiLeDlxom" role="3cqZAp">
           <node concept="1rXfSq" id="5MNibEMYmSq" role="3clFbG">
-            <ref role="37wK5l" node="5MNibEMYjj8" resolve="clearAllSessionData" />
+            <ref role="37wK5l" node="5MNibEMYjj8" resolve="clearAllData" />
           </node>
         </node>
       </node>
@@ -13381,7 +13431,7 @@
     </node>
     <node concept="2tJIrI" id="565UPcqrAiu" role="jymVt" />
     <node concept="3clFb_" id="5MNibEMYjj8" role="jymVt">
-      <property role="TrG5h" value="clearAllSessionData" />
+      <property role="TrG5h" value="clearAllData" />
       <node concept="3cqZAl" id="5MNibEMYjja" role="3clF45" />
       <node concept="3clFbS" id="5MNibEMYjjb" role="3clF47">
         <node concept="3clFbF" id="7i3KM7g2gWj" role="3cqZAp">
@@ -13498,6 +13548,122 @@
   <node concept="312cEu" id="7i3KM7g1Hnp">
     <property role="TrG5h" value="CachedData" />
     <node concept="2tJIrI" id="7i3KM7g1KUz" role="jymVt" />
+    <node concept="3clFb_" id="At0yqMRQt2" role="jymVt">
+      <property role="TrG5h" value="anyNeedsUpdate" />
+      <node concept="10P_77" id="At0yqMRSih" role="3clF45" />
+      <node concept="3clFbS" id="At0yqMRQt5" role="3clF47">
+        <node concept="3cpWs8" id="At0yqMSDN6" role="3cqZAp">
+          <node concept="3cpWsn" id="At0yqMSDN9" role="3cpWs9">
+            <property role="TrG5h" value="anyDataNeedsUpdate" />
+            <node concept="10P_77" id="At0yqMSDN4" role="1tU5fm" />
+            <node concept="3clFbT" id="At0yqMSP74" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="1DcWWT" id="At0yqMS2MC" role="3cqZAp">
+          <node concept="3clFbS" id="At0yqMS2MF" role="2LFqv$">
+            <node concept="3clFbF" id="At0yqMSUXh" role="3cqZAp">
+              <node concept="3vZ8r8" id="At0yqMSX1W" role="3clFbG">
+                <node concept="1rXfSq" id="At0yqMU1XN" role="37vLTx">
+                  <ref role="37wK5l" node="At0yqMTn_0" resolve="needsUpdate" />
+                  <node concept="37vLTw" id="At0yqMU3p8" role="37wK5m">
+                    <ref role="3cqZAo" node="At0yqMS2MG" resolve="df" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="At0yqMSUXf" role="37vLTJ">
+                  <ref role="3cqZAo" node="At0yqMSDN9" resolve="anyDataNeedsUpdate" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="At0yqMS2MG" role="1Duv9x">
+            <property role="TrG5h" value="df" />
+            <node concept="3uibUv" id="At0yqMS2MK" role="1tU5fm">
+              <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+              <node concept="3qTvmN" id="At0yqMS2ML" role="11_B2D" />
+            </node>
+          </node>
+          <node concept="2ShNRf" id="At0yqMS6v$" role="1DdaDG">
+            <node concept="Tc6Ow" id="At0yqMSa2g" role="2ShVmc">
+              <node concept="3uibUv" id="At0yqMSl_u" role="HW$YZ">
+                <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+                <node concept="3qTvmN" id="At0yqMSp8l" role="11_B2D" />
+              </node>
+              <node concept="2OqwBi" id="At0yqMSk1t" role="I$8f6">
+                <node concept="37vLTw" id="At0yqMSk1u" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7i3KM7g1OmB" resolve="rawData" />
+                </node>
+                <node concept="3lbrtF" id="At0yqMSk1v" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="At0yqMTa0b" role="3cqZAp">
+          <node concept="37vLTw" id="At0yqMTa09" role="3clFbG">
+            <ref role="3cqZAo" node="At0yqMSDN9" resolve="anyDataNeedsUpdate" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="At0yqMRRrp" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="At0yqMRP9i" role="jymVt" />
+    <node concept="3clFb_" id="At0yqMTn_0" role="jymVt">
+      <property role="TrG5h" value="needsUpdate" />
+      <node concept="37vLTG" id="At0yqMTqB$" role="3clF46">
+        <property role="TrG5h" value="flavour" />
+        <node concept="3uibUv" id="At0yqMTzeO" role="1tU5fm">
+          <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+          <node concept="16syzq" id="At0yqMTzsR" role="11_B2D">
+            <ref role="16sUi3" node="At0yqMTsc0" resolve="V" />
+          </node>
+        </node>
+      </node>
+      <node concept="10P_77" id="At0yqMTLmZ" role="3clF45" />
+      <node concept="3clFbS" id="At0yqMTn_3" role="3clF47">
+        <node concept="3cpWs8" id="At0yqMTGRr" role="3cqZAp">
+          <node concept="3cpWsn" id="At0yqMTGRs" role="3cpWs9">
+            <property role="TrG5h" value="data" />
+            <node concept="16syzq" id="At0yqMTGE7" role="1tU5fm">
+              <ref role="16sUi3" node="At0yqMTsc0" resolve="V" />
+            </node>
+            <node concept="2OqwBi" id="At0yqMTGRt" role="33vP2m">
+              <node concept="37vLTw" id="At0yqMTGRu" role="2Oq$k0">
+                <ref role="3cqZAo" node="At0yqMTqB$" resolve="flavour" />
+              </node>
+              <node concept="liA8E" id="At0yqMTGRv" role="2OqNvi">
+                <ref role="37wK5l" node="7i3KM7g1MO_" resolve="get" />
+                <node concept="Xjq3P" id="At0yqMTGRw" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="At0yqMTzyV" role="3cqZAp">
+          <node concept="1Wc70l" id="At0yqMTQ5$" role="3clFbG">
+            <node concept="2OqwBi" id="At0yqMTTdn" role="3uHU7w">
+              <node concept="37vLTw" id="At0yqMTRx7" role="2Oq$k0">
+                <ref role="3cqZAo" node="At0yqMTqB$" resolve="flavour" />
+              </node>
+              <node concept="liA8E" id="At0yqMTVky" role="2OqNvi">
+                <ref role="37wK5l" node="At0yqMMNgR" resolve="needsUpdate" />
+                <node concept="37vLTw" id="At0yqMTWTx" role="37wK5m">
+                  <ref role="3cqZAo" node="At0yqMTGRs" resolve="data" />
+                </node>
+              </node>
+            </node>
+            <node concept="3y3z36" id="At0yqMTMQ1" role="3uHU7B">
+              <node concept="37vLTw" id="At0yqMTGRx" role="3uHU7B">
+                <ref role="3cqZAo" node="At0yqMTGRs" resolve="data" />
+              </node>
+              <node concept="10Nm6u" id="At0yqMTOEy" role="3uHU7w" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="At0yqMTp6L" role="1B3o_S" />
+      <node concept="16euLQ" id="At0yqMTsc0" role="16eVyc">
+        <property role="TrG5h" value="V" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="At0yqMTlI5" role="jymVt" />
     <node concept="3clFb_" id="7i3KM7g1KV4" role="jymVt">
       <property role="TrG5h" value="get" />
       <node concept="37vLTG" id="7i3KM7g1LeA" role="3clF46">
@@ -13850,7 +14016,31 @@
           </node>
         </node>
       </node>
-      <node concept="2tJIrI" id="4Zz6A5IeLRC" role="jymVt" />
+      <node concept="2tJIrI" id="At0yqMMZGh" role="jymVt" />
+      <node concept="3clFb_" id="At0yqMMNgR" role="jymVt">
+        <property role="TrG5h" value="needsUpdate" />
+        <node concept="37vLTG" id="At0yqMNhso" role="3clF46">
+          <property role="TrG5h" value="t" />
+          <node concept="16syzq" id="At0yqMNiAr" role="1tU5fm">
+            <ref role="16sUi3" node="7i3KM7g1LMe" resolve="T" />
+          </node>
+        </node>
+        <node concept="10P_77" id="At0yqMMQbW" role="3clF45" />
+        <node concept="3Tm1VV" id="At0yqMMNgU" role="1B3o_S" />
+        <node concept="3clFbS" id="At0yqMMNgV" role="3clF47">
+          <node concept="3clFbF" id="At0yqMMYz7" role="3cqZAp">
+            <node concept="3clFbT" id="At0yqMMYz6" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="P$JXv" id="At0yqMN29f" role="lGtFl">
+          <node concept="TZ5HA" id="At0yqMN29g" role="TZ5H$">
+            <node concept="1dT_AC" id="At0yqMN29h" role="1dT_Ay">
+              <property role="1dT_AB" value="Override to signal stale data." />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="At0yqMMKo1" role="jymVt" />
       <node concept="3clFb_" id="4Zz6A5IfmYN" role="jymVt">
         <property role="TrG5h" value="dataCleared" />
         <node concept="3cqZAl" id="4Zz6A5IfmYP" role="3clF45" />
@@ -14230,7 +14420,6 @@
         </node>
       </node>
     </node>
-    <node concept="3Tm1VV" id="7i3KM7g1Hnq" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="7i3KM7gxDuw">
     <property role="3GE5qa" value="launch.step" />
@@ -14399,32 +14588,19 @@
               <node concept="1bVj0M" id="51ek2rQMIOb" role="37wK5m">
                 <node concept="3clFbS" id="51ek2rQMIOd" role="1bW5cS">
                   <node concept="3clFbH" id="51ek2rQMIUq" role="3cqZAp" />
-                  <node concept="3cpWs8" id="51ek2rQMIYC" role="3cqZAp">
-                    <node concept="3cpWsn" id="51ek2rQMIYD" role="3cpWs9">
-                      <property role="TrG5h" value="changeSetClosure" />
-                      <node concept="2hMVRd" id="51ek2rQMIYE" role="1tU5fm">
-                        <node concept="3Tqbb2" id="51ek2rQMIYF" role="2hN53Y" />
-                      </node>
-                    </node>
-                  </node>
                   <node concept="1QHqEK" id="51ek2rQMIYG" role="3cqZAp">
                     <node concept="1QHqEC" id="51ek2rQMIYH" role="1QHqEI">
                       <node concept="3clFbS" id="51ek2rQMIYI" role="1bW5cS">
-                        <node concept="3clFbF" id="51ek2rQMIYV" role="3cqZAp">
-                          <node concept="37vLTI" id="51ek2rQMIYW" role="3clFbG">
-                            <node concept="2OqwBi" id="51ek2rQMIYX" role="37vLTx">
-                              <node concept="37vLTw" id="51ek2rQMIYY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6nFpYlucr5w" resolve="updatesRecorder" />
-                              </node>
-                              <node concept="liA8E" id="1XKnVQm$4Y" role="2OqNvi">
-                                <ref role="37wK5l" to="ksgm:1XKnVQioNo" resolve="invalidateChanged" />
-                                <node concept="37vLTw" id="1XKnVQmCHR" role="37wK5m">
-                                  <ref role="3cqZAo" to="1yqb:6nFpYluqFen" resolve="planHandler" />
-                                </node>
-                              </node>
+                        <node concept="3clFbF" id="3Pxu0s89Eyi" role="3cqZAp">
+                          <node concept="2OqwBi" id="3Pxu0s89Eyk" role="3clFbG">
+                            <node concept="37vLTw" id="3Pxu0s89Eyl" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6nFpYlucr5w" resolve="updatesRecorder" />
                             </node>
-                            <node concept="37vLTw" id="51ek2rQMIZV" role="37vLTJ">
-                              <ref role="3cqZAo" node="51ek2rQMIYD" resolve="changeSetClosure" />
+                            <node concept="liA8E" id="3Pxu0s89Eym" role="2OqNvi">
+                              <ref role="37wK5l" to="ksgm:1XKnVQioNo" resolve="invalidateChanged" />
+                              <node concept="37vLTw" id="3Pxu0s89Eyn" role="37wK5m">
+                                <ref role="3cqZAo" to="1yqb:6nFpYluqFen" resolve="planHandler" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -15638,7 +15814,29 @@
                     </node>
                     <node concept="3cqZAl" id="61G6TdB_yxm" role="3clF45" />
                     <node concept="3Tm1VV" id="61G6TdB_yxn" role="1B3o_S" />
-                    <node concept="3clFbS" id="61G6TdB_yxo" role="3clF47">
+                    <node concept="3clFbS" id="61G6TdB_yxo" role="3clF47" />
+                    <node concept="2AHcQZ" id="61G6TdB_yxR" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="61G6TdB_yxU" role="37wK5m">
+                    <ref role="3cqZAo" node="61G6TdB_yxS" resolve="session" />
+                  </node>
+                  <node concept="3clFb_" id="3Pxu0s8yb1c" role="jymVt">
+                    <property role="TrG5h" value="reportFeedback" />
+                    <node concept="37vLTG" id="3Pxu0s8yb1d" role="3clF46">
+                      <property role="TrG5h" value="origin" />
+                      <node concept="3Tqbb2" id="3Pxu0s8yb1e" role="1tU5fm" />
+                    </node>
+                    <node concept="37vLTG" id="3Pxu0s8yb1f" role="3clF46">
+                      <property role="TrG5h" value="feedback" />
+                      <node concept="3uibUv" id="3Pxu0s8yb1g" role="1tU5fm">
+                        <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+                      </node>
+                    </node>
+                    <node concept="3cqZAl" id="3Pxu0s8yb1h" role="3clF45" />
+                    <node concept="3Tm1VV" id="3Pxu0s8yb1i" role="1B3o_S" />
+                    <node concept="3clFbS" id="3Pxu0s8yb1r" role="3clF47">
                       <node concept="3cpWs8" id="61G6TdB_yxp" role="3cqZAp">
                         <node concept="3cpWsn" id="61G6TdB_yxq" role="3cpWs9">
                           <property role="TrG5h" value="details" />
@@ -15647,7 +15845,7 @@
                           </node>
                           <node concept="2OqwBi" id="61G6TdB_yxs" role="33vP2m">
                             <node concept="37vLTw" id="61G6TdB_yxt" role="2Oq$k0">
-                              <ref role="3cqZAo" node="61G6TdB_yxk" resolve="feedback" />
+                              <ref role="3cqZAo" node="3Pxu0s8yb1f" resolve="feedback" />
                             </node>
                             <node concept="liA8E" id="61G6TdB_yxu" role="2OqNvi">
                               <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
@@ -15669,7 +15867,7 @@
                                   <ref role="37wK5l" to="cxk7:3o9wrC3WoA4" resolve="severityToStatus" />
                                   <node concept="2OqwBi" id="61G6TdB_yxA" role="37wK5m">
                                     <node concept="37vLTw" id="61G6TdB_yxB" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="61G6TdB_yxk" resolve="feedback" />
+                                      <ref role="3cqZAo" node="3Pxu0s8yb1f" resolve="feedback" />
                                     </node>
                                     <node concept="liA8E" id="61G6TdB_yxC" role="2OqNvi">
                                       <ref role="37wK5l" to="w7la:~EvaluationFeedback.getSeverity()" resolve="getSeverity" />
@@ -15691,7 +15889,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="61G6TdB_yxI" role="37wK5m">
                                   <node concept="37vLTw" id="61G6TdB_yxJ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="61G6TdB_yxk" resolve="feedback" />
+                                    <ref role="3cqZAo" node="3Pxu0s8yb1f" resolve="feedback" />
                                   </node>
                                   <node concept="liA8E" id="61G6TdB_yxK" role="2OqNvi">
                                     <ref role="37wK5l" to="w7la:~EvaluationFeedback.getMessage()" resolve="getMessage" />
@@ -15710,20 +15908,19 @@
                                     <ref role="37wK5l" to="cxk7:4ekZiHddjyV" resolve="getTemplate" />
                                   </node>
                                 </node>
-                                <node concept="10Nm6u" id="61G6TdB_yxQ" role="37wK5m" />
+                                <node concept="37vLTw" id="3Pxu0s8zxEF" role="37wK5m">
+                                  <ref role="3cqZAo" node="3Pxu0s8yb1d" resolve="origin" />
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="2AHcQZ" id="61G6TdB_yxR" role="2AJF6D">
+                    <node concept="2AHcQZ" id="3Pxu0s8yb1s" role="2AJF6D">
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
-                  <node concept="37vLTw" id="61G6TdB_yxU" role="37wK5m">
-                    <ref role="3cqZAo" node="61G6TdB_yxS" resolve="session" />
-                  </node>
                 </node>
               </node>
             </node>
@@ -18530,7 +18727,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4VNF0fT8eRS" role="2OqNvi">
-                  <ref role="37wK5l" to="ksgm:4VNF0fT816Y" resolve="withRequirementsRecorder" />
+                  <ref role="37wK5l" to="ksgm:4VNF0fT816Y" resolve="withDependencyUpdatable" />
                   <node concept="37vLTw" id="4VNF0fT8jj6" role="37wK5m">
                     <ref role="3cqZAo" node="6nFpYlvfHC5" resolve="updatesRecorder" />
                   </node>
@@ -18984,7 +19181,7 @@
               <node concept="liA8E" id="5iJsa3_bKFZ" role="2OqNvi">
                 <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
                 <node concept="10M0yZ" id="2EG5v$dH9T0" role="37wK5m">
-                  <ref role="3cqZAo" to="1yqb:2EG5v$dFgce" resolve="INVALIDATED_NODES" />
+                  <ref role="3cqZAo" to="1yqb:2EG5v$dFgce" resolve="INVALIDATED_ORIGINS" />
                   <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
                 </node>
                 <node concept="1bVj0M" id="5iJsa3_bLzH" role="37wK5m">
@@ -19000,7 +19197,7 @@
                               <ref role="3cqZAo" node="5iJsa3_bLAX" resolve="invalidated" />
                             </node>
                             <node concept="3vKaQO" id="5Qx6_65sjQ7" role="10QFUM">
-                              <node concept="2sp9CU" id="1RYTbd8hxen" role="3O5elw" />
+                              <node concept="3Tqbb2" id="3Pxu0s8lyQ0" role="3O5elw" />
                             </node>
                           </node>
                         </node>
@@ -19026,7 +19223,7 @@
               <node concept="liA8E" id="5iJsa3_cjX7" role="2OqNvi">
                 <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
                 <node concept="10M0yZ" id="5iJsa3_cl5P" role="37wK5m">
-                  <ref role="3cqZAo" to="1yqb:2yEnwsh8n5F" resolve="INVALID_FEEDBACK" />
+                  <ref role="3cqZAo" to="1yqb:2yEnwsh8n5F" resolve="INVALIDATED_FEEDBACK_KEYS" />
                   <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
                 </node>
                 <node concept="1bVj0M" id="5iJsa3_clXm" role="37wK5m">
@@ -19108,6 +19305,68 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="55xYlrl0F41" role="3cqZAp" />
+          <node concept="3cpWs8" id="55xYlrl0F9e" role="3cqZAp">
+            <node concept="3cpWsn" id="55xYlrl0F9f" role="3cpWs9">
+              <property role="TrG5h" value="cachedSessionData" />
+              <node concept="3uibUv" id="55xYlrl0F9g" role="1tU5fm">
+                <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
+              </node>
+              <node concept="1rXfSq" id="55xYlrl0F9h" role="33vP2m">
+                <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
+                <node concept="37vLTw" id="55xYlrl0F9i" role="37wK5m">
+                  <ref role="3cqZAo" node="5Qx6_65s9rq" resolve="aspectClique" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="55xYlrl0K5R" role="3cqZAp">
+            <node concept="3cpWsn" id="55xYlrl0K5S" role="3cpWs9">
+              <property role="TrG5h" value="updatesRecorder" />
+              <node concept="3uibUv" id="55xYlrl0K5T" role="1tU5fm">
+                <ref role="3uigEE" to="ksgm:6nFpYlu02jD" resolve="UpdatesRecorder" />
+              </node>
+              <node concept="2OqwBi" id="55xYlrl0K5U" role="33vP2m">
+                <node concept="37vLTw" id="55xYlrl0K5V" role="2Oq$k0">
+                  <ref role="3cqZAo" node="55xYlrl0F9f" resolve="cachedSessionData" />
+                </node>
+                <node concept="liA8E" id="55xYlrl0K5W" role="2OqNvi">
+                  <ref role="37wK5l" node="7i3KM7g1KV4" resolve="get" />
+                  <node concept="10M0yZ" id="55xYlrl0K5X" role="37wK5m">
+                    <ref role="3cqZAo" node="6nFpYluD3aD" resolve="UPDATES" />
+                    <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="55xYlrl0XwU" role="3cqZAp">
+            <node concept="3clFbS" id="55xYlrl0XwW" role="3clFbx">
+              <node concept="3clFbF" id="55xYlrl17T6" role="3cqZAp">
+                <node concept="2OqwBi" id="55xYlrl1bu_" role="3clFbG">
+                  <node concept="37vLTw" id="55xYlrl17T4" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5Qx6_65sCpg" resolve="invalidatedSet" />
+                  </node>
+                  <node concept="X8dFx" id="55xYlrl1fd9" role="2OqNvi">
+                    <node concept="2OqwBi" id="55xYlrl1oZm" role="25WWJ7">
+                      <node concept="37vLTw" id="55xYlrl1kwm" role="2Oq$k0">
+                        <ref role="3cqZAo" node="55xYlrl0K5S" resolve="updatesRecorder" />
+                      </node>
+                      <node concept="liA8E" id="55xYlrl1t2M" role="2OqNvi">
+                        <ref role="37wK5l" to="ksgm:3DPJ8QIziiQ" resolve="invalidatedSet" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3y3z36" id="55xYlrl14xv" role="3clFbw">
+              <node concept="10Nm6u" id="55xYlrl14yZ" role="3uHU7w" />
+              <node concept="37vLTw" id="55xYlrl11yq" role="3uHU7B">
+                <ref role="3cqZAo" node="55xYlrl0K5S" resolve="updatesRecorder" />
+              </node>
+            </node>
+          </node>
           <node concept="3clFbH" id="5Qx6_65sjSJ" role="3cqZAp" />
           <node concept="3cpWs8" id="q1hCiybRQn" role="3cqZAp">
             <node concept="3cpWsn" id="q1hCiybRQq" role="3cpWs9">
@@ -19369,14 +19628,14 @@
                       <ref role="3cqZAo" node="1RYTbd8gD1y" resolve="response" />
                     </node>
                     <node concept="liA8E" id="1RYTbd8gQeT" role="2OqNvi">
-                      <ref role="37wK5l" node="1RYTbd8duYG" resolve="withInvalidated" />
+                      <ref role="37wK5l" node="1RYTbd8duYG" resolve="withInvalidatedOrigins" />
                       <node concept="37vLTw" id="1RYTbd8gQuv" role="37wK5m">
                         <ref role="3cqZAo" node="5Qx6_65sCpg" resolve="invalidatedSet" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="1RYTbd8gRU3" role="2OqNvi">
-                    <ref role="37wK5l" node="1RYTbd8cOQG" resolve="withInvalidatedFeedback" />
+                    <ref role="37wK5l" node="1RYTbd8cOQG" resolve="withInvalidatedFeedbackKeys" />
                     <node concept="37vLTw" id="1RYTbd8gSdL" role="37wK5m">
                       <ref role="3cqZAo" node="6NlBtKd2D$W" resolve="invalidatedFeedbackKeys" />
                     </node>
@@ -19404,11 +19663,11 @@
         <property role="TrG5h" value="invalidatedSet" />
         <node concept="3Tm6S6" id="5Qx6_65sCph" role="1B3o_S" />
         <node concept="2hMVRd" id="5Qx6_65sQvW" role="1tU5fm">
-          <node concept="2sp9CU" id="1RYTbd8hzle" role="2hN53Y" />
+          <node concept="3Tqbb2" id="3Pxu0s8lB6u" role="2hN53Y" />
         </node>
         <node concept="2ShNRf" id="5Qx6_65sXF5" role="33vP2m">
           <node concept="2i4dXS" id="5Qx6_65sXBU" role="2ShVmc">
-            <node concept="2sp9CU" id="1RYTbd8h_69" role="HW$YZ" />
+            <node concept="3Tqbb2" id="3Pxu0s8mCE6" role="HW$YZ" />
           </node>
         </node>
       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 58349f8a..0bc2f7e9 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -19627,52 +19627,23 @@
           <node concept="1QHqEK" id="6QkkSolKHzY" role="3cqZAp">
             <node concept="1QHqEC" id="6QkkSolKHzZ" role="1QHqEI">
               <node concept="3clFbS" id="6QkkSolKH$0" role="1bW5cS">
-                <node concept="3cpWs8" id="6QkkSolKH$1" role="3cqZAp">
-                  <node concept="3cpWsn" id="6QkkSolKH$2" role="3cpWs9">
-                    <property role="TrG5h" value="ref" />
-                    <property role="3TUv4t" value="true" />
-                    <node concept="3uibUv" id="6QkkSolKH$3" role="1tU5fm">
-                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                <node concept="3cpWs8" id="3Pxu0s8gDPC" role="3cqZAp">
+                  <node concept="3cpWsn" id="3Pxu0s8gDPD" role="3cpWs9">
+                    <property role="TrG5h" value="origin" />
+                    <node concept="3uibUv" id="3Pxu0s8gOTy" role="1tU5fm">
+                      <ref role="3uigEE" to="w1kc:~SNode" resolve="SNode" />
                     </node>
-                    <node concept="2OqwBi" id="6QkkSolKH$5" role="33vP2m">
-                      <node concept="37vLTw" id="6QkkSolKH$6" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6QkkSolKGTF" resolve="ruleEx" />
-                      </node>
-                      <node concept="liA8E" id="6tnA4678ZwI" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="6QkkSolKH$8" role="3cqZAp">
-                  <node concept="3cpWsn" id="6QkkSolKH$9" role="3cpWs9">
-                    <property role="TrG5h" value="snode" />
-                    <node concept="3uibUv" id="6QkkSolKH$a" role="1tU5fm">
-                      <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                    </node>
-                    <node concept="3K4zz7" id="6i42QSs9SBB" role="33vP2m">
-                      <node concept="10Nm6u" id="6i42QSs9Tqt" role="3K4GZi" />
-                      <node concept="3y3z36" id="6i42QSs9RSr" role="3K4Cdx">
-                        <node concept="10Nm6u" id="6i42QSs9S7U" role="3uHU7w" />
-                        <node concept="37vLTw" id="6i42QSs9Rqf" role="3uHU7B">
-                          <ref role="3cqZAo" node="6QkkSolKH$2" resolve="ref" />
+                    <node concept="10QFUN" id="3Pxu0s8gQKY" role="33vP2m">
+                      <node concept="2OqwBi" id="3Pxu0s8gDPE" role="10QFUP">
+                        <node concept="37vLTw" id="3Pxu0s8gDPF" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6QkkSolKGTF" resolve="ruleEx" />
+                        </node>
+                        <node concept="liA8E" id="3Pxu0s8gDPG" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                         </node>
                       </node>
-                      <node concept="2OqwBi" id="6QkkSolKH$b" role="3K4E3e">
-                        <node concept="37vLTw" id="6QkkSolKH$c" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6QkkSolKH$2" resolve="ref" />
-                        </node>
-                        <node concept="liA8E" id="6QkkSolKH$d" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
-                          <node concept="2OqwBi" id="6QkkSolKH$e" role="37wK5m">
-                            <node concept="37vLTw" id="6QkkSolKH$f" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
-                            </node>
-                            <node concept="liA8E" id="6QkkSolKH$g" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                            </node>
-                          </node>
-                        </node>
+                      <node concept="3uibUv" id="3Pxu0s8gQKZ" role="10QFUM">
+                        <ref role="3uigEE" to="w1kc:~SNode" resolve="SNode" />
                       </node>
                     </node>
                   </node>
@@ -19687,8 +19658,8 @@
                       </node>
                       <node concept="liA8E" id="428_4iYzSiW" role="2OqNvi">
                         <ref role="37wK5l" node="19fWAfxfBp1" resolve="extractPresentation" />
-                        <node concept="37vLTw" id="4_RQpN_djSO" role="37wK5m">
-                          <ref role="3cqZAo" node="6QkkSolKH$9" resolve="snode" />
+                        <node concept="37vLTw" id="3Pxu0s8gKZR" role="37wK5m">
+                          <ref role="3cqZAo" node="3Pxu0s8gDPD" resolve="origin" />
                         </node>
                       </node>
                     </node>
@@ -19705,11 +19676,11 @@
                         </node>
                         <node concept="2EnYce" id="6QkkSolKH$o" role="37wK5m">
                           <node concept="2EnYce" id="6QkkSolKH$p" role="2Oq$k0">
-                            <node concept="37vLTw" id="6QkkSolKH$q" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6QkkSolKH$9" resolve="snode" />
+                            <node concept="37vLTw" id="3Pxu0s8gM$y" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3Pxu0s8gDPD" resolve="origin" />
                             </node>
                             <node concept="liA8E" id="6QkkSolKH$r" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getConcept()" resolve="getConcept" />
+                              <ref role="37wK5l" to="w1kc:~SNode.getConcept()" resolve="getConcept" />
                             </node>
                           </node>
                           <node concept="liA8E" id="6QkkSolKH$s" role="2OqNvi">
@@ -19731,37 +19702,52 @@
                                 <node concept="3Tm1VV" id="6QkkSolKH$y" role="1B3o_S" />
                                 <node concept="3cqZAl" id="6QkkSolKH$z" role="3clF45" />
                                 <node concept="3clFbS" id="6QkkSolKH$$" role="3clF47">
-                                  <node concept="3clFbF" id="6QkkSolKH$_" role="3cqZAp">
-                                    <node concept="2OqwBi" id="6QkkSolKH$A" role="3clFbG">
-                                      <node concept="2OqwBi" id="6QkkSolKH$B" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="6QkkSolKH$C" role="2Oq$k0">
-                                          <node concept="2ShNRf" id="6QkkSolKH$D" role="2Oq$k0">
-                                            <node concept="1pGfFk" id="6QkkSolKH$E" role="2ShVmc">
-                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
-                                              <node concept="37vLTw" id="6QkkSolKH$F" role="37wK5m">
-                                                <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
+                                  <node concept="3clFbJ" id="3Pxu0s8h9CJ" role="3cqZAp">
+                                    <node concept="3clFbS" id="3Pxu0s8h9CL" role="3clFbx">
+                                      <node concept="3clFbF" id="6QkkSolKH$_" role="3cqZAp">
+                                        <node concept="2OqwBi" id="6QkkSolKH$A" role="3clFbG">
+                                          <node concept="2OqwBi" id="6QkkSolKH$B" role="2Oq$k0">
+                                            <node concept="2OqwBi" id="6QkkSolKH$C" role="2Oq$k0">
+                                              <node concept="2ShNRf" id="6QkkSolKH$D" role="2Oq$k0">
+                                                <node concept="1pGfFk" id="6QkkSolKH$E" role="2ShVmc">
+                                                  <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
+                                                  <node concept="37vLTw" id="6QkkSolKH$F" role="37wK5m">
+                                                    <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="liA8E" id="6QkkSolKH$G" role="2OqNvi">
+                                                <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
+                                                <node concept="3clFbT" id="6QkkSolKH$H" role="37wK5m">
+                                                  <property role="3clFbU" value="false" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="liA8E" id="6QkkSolKH$I" role="2OqNvi">
+                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
+                                              <node concept="3clFbT" id="6QkkSolKH$J" role="37wK5m">
+                                                <property role="3clFbU" value="true" />
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="liA8E" id="6QkkSolKH$G" role="2OqNvi">
-                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
-                                            <node concept="3clFbT" id="6QkkSolKH$H" role="37wK5m">
-                                              <property role="3clFbU" value="false" />
+                                          <node concept="liA8E" id="6QkkSolKH$K" role="2OqNvi">
+                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
+                                            <node concept="2OqwBi" id="3Pxu0s8hi6U" role="37wK5m">
+                                              <node concept="37vLTw" id="3Pxu0s8gS6P" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="3Pxu0s8gDPD" resolve="origin" />
+                                              </node>
+                                              <node concept="liA8E" id="3Pxu0s8h6ij" role="2OqNvi">
+                                                <ref role="37wK5l" to="w1kc:~SNode.getReference()" resolve="getReference" />
+                                              </node>
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="liA8E" id="6QkkSolKH$I" role="2OqNvi">
-                                          <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
-                                          <node concept="3clFbT" id="6QkkSolKH$J" role="37wK5m">
-                                            <property role="3clFbU" value="true" />
-                                          </node>
-                                        </node>
                                       </node>
-                                      <node concept="liA8E" id="6QkkSolKH$K" role="2OqNvi">
-                                        <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
-                                        <node concept="37vLTw" id="6QkkSolKH$L" role="37wK5m">
-                                          <ref role="3cqZAo" node="6QkkSolKH$2" resolve="ref" />
-                                        </node>
+                                    </node>
+                                    <node concept="3y3z36" id="3Pxu0s8hd$s" role="3clFbw">
+                                      <node concept="10Nm6u" id="3Pxu0s8heWG" role="3uHU7w" />
+                                      <node concept="37vLTw" id="3Pxu0s8hbJS" role="3uHU7B">
+                                        <ref role="3cqZAo" node="3Pxu0s8gDPD" resolve="origin" />
                                       </node>
                                     </node>
                                   </node>
@@ -21973,8 +21959,8 @@
                 <node concept="37vLTw" id="6bBjpI8anRH" role="2Oq$k0">
                   <ref role="3cqZAo" node="6RFuZEC715N" resolve="ruleEx" />
                 </node>
-                <node concept="liA8E" id="6tnA4678XaQ" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
+                <node concept="liA8E" id="3Pxu0s8g7uE" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                 </node>
               </node>
             </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index b38101c9..25beaa26 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -1798,7 +1798,7 @@
       </node>
     </node>
     <node concept="Wx3nA" id="2yEnwsh8n5F" role="jymVt">
-      <property role="TrG5h" value="INVALID_FEEDBACK" />
+      <property role="TrG5h" value="INVALIDATED_FEEDBACK_KEYS" />
       <node concept="3Tm1VV" id="2yEnwsh8n5G" role="1B3o_S" />
       <node concept="2YIFZM" id="2yEnwsh8n5H" role="33vP2m">
         <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
@@ -1815,7 +1815,7 @@
       </node>
     </node>
     <node concept="Wx3nA" id="2EG5v$dFgce" role="jymVt">
-      <property role="TrG5h" value="INVALIDATED_NODES" />
+      <property role="TrG5h" value="INVALIDATED_ORIGINS" />
       <node concept="3Tm1VV" id="2EG5v$dFgcf" role="1B3o_S" />
       <node concept="2YIFZM" id="2EG5v$dFgcg" role="33vP2m">
         <ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
@@ -2501,12 +2501,12 @@
                         </node>
                         <node concept="3cpWs8" id="2EG5v$dFmTU" role="3cqZAp">
                           <node concept="3cpWsn" id="2EG5v$dFmTX" role="3cpWs9">
-                            <property role="TrG5h" value="invalidated" />
+                            <property role="TrG5h" value="invalidatedOrigins" />
                             <node concept="3vKaQO" id="2EG5v$dFmTR" role="1tU5fm">
-                              <node concept="2sp9CU" id="1RYTbd8hrEg" role="3O5elw" />
+                              <node concept="3Tqbb2" id="3Pxu0s8k8tA" role="3O5elw" />
                             </node>
                             <node concept="1rXfSq" id="2EG5v$dG07H" role="33vP2m">
-                              <ref role="37wK5l" node="2EG5v$dDKbh" resolve="getInvalidated" />
+                              <ref role="37wK5l" node="2EG5v$dDKbh" resolve="collectInvalidatedOrigins" />
                               <node concept="2OqwBi" id="6KCGZaSxuGM" role="37wK5m">
                                 <node concept="37vLTw" id="6KCGZaSxtQH" role="2Oq$k0">
                                   <ref role="3cqZAo" node="4J__M6Mw24" resolve="evaluationResult" />
@@ -2551,7 +2551,7 @@
                               </node>
                               <node concept="2OqwBi" id="q1hCixUYFz" role="37wK5m">
                                 <node concept="37vLTw" id="51ek2rQHN6Z" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2yEnwsh8n5F" resolve="INVALID_FEEDBACK" />
+                                  <ref role="3cqZAo" node="2yEnwsh8n5F" resolve="INVALIDATED_FEEDBACK_KEYS" />
                                 </node>
                                 <node concept="liA8E" id="q1hCixUYF_" role="2OqNvi">
                                   <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
@@ -2562,12 +2562,12 @@
                               </node>
                               <node concept="2OqwBi" id="2EG5v$dFjOp" role="37wK5m">
                                 <node concept="37vLTw" id="2EG5v$dFior" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2EG5v$dFgce" resolve="INVALIDATED_NODES" />
+                                  <ref role="3cqZAo" node="2EG5v$dFgce" resolve="INVALIDATED_ORIGINS" />
                                 </node>
                                 <node concept="liA8E" id="2EG5v$dFkOS" role="2OqNvi">
                                   <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
                                   <node concept="37vLTw" id="2EG5v$dGPCg" role="37wK5m">
-                                    <ref role="3cqZAo" node="2EG5v$dFmTX" resolve="invalidated" />
+                                    <ref role="3cqZAo" node="2EG5v$dFmTX" resolve="invalidatedOrigins" />
                                   </node>
                                 </node>
                               </node>
@@ -2679,18 +2679,18 @@
     </node>
     <node concept="2tJIrI" id="2EG5v$dDC27" role="jymVt" />
     <node concept="3clFb_" id="2EG5v$dDKbh" role="jymVt">
-      <property role="TrG5h" value="getInvalidated" />
+      <property role="TrG5h" value="collectInvalidatedOrigins" />
       <node concept="3clFbS" id="2EG5v$dDKbk" role="3clF47">
         <node concept="3cpWs8" id="2EG5v$dFx$H" role="3cqZAp">
           <node concept="3cpWsn" id="2EG5v$dFx$K" role="3cpWs9">
             <property role="TrG5h" value="invalidOrigins" />
             <node concept="2ShNRf" id="2EG5v$dF$cN" role="33vP2m">
               <node concept="2i4dXS" id="2EG5v$dFBP6" role="2ShVmc">
-                <node concept="2sp9CU" id="2EG5v$dFCiK" role="HW$YZ" />
+                <node concept="3Tqbb2" id="3Pxu0s8k6b7" role="HW$YZ" />
               </node>
             </node>
             <node concept="2hMVRd" id="2EG5v$dFB68" role="1tU5fm">
-              <node concept="2sp9CU" id="2EG5v$dFBiS" role="2hN53Y" />
+              <node concept="3Tqbb2" id="3Pxu0s8k4Xz" role="2hN53Y" />
             </node>
           </node>
         </node>
@@ -2735,8 +2735,8 @@
                         <node concept="37vLTw" id="2EG5v$dFI3s" role="2Oq$k0">
                           <ref role="3cqZAo" node="2EG5v$dFHhH" resolve="ruleEx" />
                         </node>
-                        <node concept="liA8E" id="2EG5v$dFIUp" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
+                        <node concept="liA8E" id="3Pxu0s8k3w3" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                         </node>
                       </node>
                     </node>
@@ -2799,7 +2799,7 @@
         </node>
       </node>
       <node concept="3vKaQO" id="2EG5v$dFtoQ" role="3clF45">
-        <node concept="2sp9CU" id="1RYTbd8hoku" role="3O5elw" />
+        <node concept="3Tqbb2" id="3Pxu0s8k16z" role="3O5elw" />
       </node>
       <node concept="P$JXv" id="2EG5v$dFT$I" role="lGtFl">
         <node concept="TZ5HA" id="2EG5v$dFT$J" role="TZ5H$">
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index be9f3b08..9000c841 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -975,59 +975,13 @@
                 <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
               </node>
               <node concept="2ShNRf" id="61G6TdBDyzM" role="33vP2m">
-                <node concept="YeOm9" id="61G6TdBDyzN" role="2ShVmc">
-                  <node concept="1Y3b0j" id="61G6TdBDyzO" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
-                    <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
-                    <node concept="3Tm1VV" id="61G6TdBDyzP" role="1B3o_S" />
-                    <node concept="37vLTw" id="61G6TdBDyzQ" role="37wK5m">
-                      <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
-                    </node>
-                    <node concept="37vLTw" id="61G6TdBDyzS" role="37wK5m">
-                      <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
-                    </node>
-                    <node concept="3clFb_" id="61G6TdBDyzU" role="jymVt">
-                      <property role="TrG5h" value="provideFeedback" />
-                      <node concept="37vLTG" id="61G6TdBDyzV" role="3clF46">
-                        <property role="TrG5h" value="feedback" />
-                        <node concept="3uibUv" id="61G6TdBE_pW" role="1tU5fm">
-                          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                        </node>
-                      </node>
-                      <node concept="3cqZAl" id="61G6TdBDyzX" role="3clF45" />
-                      <node concept="3Tm1VV" id="61G6TdBDyzY" role="1B3o_S" />
-                      <node concept="3clFbS" id="61G6TdBDyzZ" role="3clF47">
-                        <node concept="3SKdUt" id="61G6TdBDy$0" role="3cqZAp">
-                          <node concept="1PaTwC" id="61G6TdBDy$1" role="1aUNEU">
-                            <node concept="3oM_SD" id="61G6TdBDy$2" role="1PaTwD">
-                              <property role="3oM_SC" value="FIXME" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$3" role="1PaTwD">
-                              <property role="3oM_SC" value="provide" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$4" role="1PaTwD">
-                              <property role="3oM_SC" value="appropriate" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$5" role="1PaTwD">
-                              <property role="3oM_SC" value="reporting" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$6" role="1PaTwD">
-                              <property role="3oM_SC" value="for" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$7" role="1PaTwD">
-                              <property role="3oM_SC" value="typechecking" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdBDy$8" role="1PaTwD">
-                              <property role="3oM_SC" value="errors" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2AHcQZ" id="61G6TdBDy$9" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                      </node>
-                    </node>
+                <node concept="1pGfFk" id="3Pxu0s87IsV" role="2ShVmc">
+                  <ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
+                  <node concept="37vLTw" id="61G6TdBDyzQ" role="37wK5m">
+                    <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                  </node>
+                  <node concept="37vLTw" id="61G6TdBDyzS" role="37wK5m">
+                    <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 584fa98f..13cef2fe 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -2517,7 +2517,6 @@
     <node concept="2tJIrI" id="5itBwM7VoD8" role="jymVt" />
     <node concept="3clFb_" id="61G6TdBpSf1" role="jymVt">
       <property role="TrG5h" value="provideFeedback" />
-      <property role="1EzhhJ" value="true" />
       <node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
         <property role="TrG5h" value="feedback" />
         <node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
@@ -2526,7 +2525,55 @@
       </node>
       <node concept="3cqZAl" id="61G6TdBpSf3" role="3clF45" />
       <node concept="3Tm1VV" id="61G6TdBpSf4" role="1B3o_S" />
-      <node concept="3clFbS" id="61G6TdBpSf5" role="3clF47" />
+      <node concept="3clFbS" id="61G6TdBpSf5" role="3clF47">
+        <node concept="3SKdUt" id="3Pxu0s87mWG" role="3cqZAp">
+          <node concept="1PaTwC" id="3Pxu0s87mWH" role="1aUNEU">
+            <node concept="3oM_SD" id="3Pxu0s87nYU" role="1PaTwD">
+              <property role="3oM_SC" value="NOP" />
+            </node>
+            <node concept="3oM_SD" id="3Pxu0s87nYW" role="1PaTwD">
+              <property role="3oM_SC" value="by" />
+            </node>
+            <node concept="3oM_SD" id="3Pxu0s87nYZ" role="1PaTwD">
+              <property role="3oM_SC" value="default" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3Pxu0s8xlUQ" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3Pxu0s8wRwl" role="jymVt" />
+    <node concept="3clFb_" id="3Pxu0s8x4Kl" role="jymVt">
+      <property role="TrG5h" value="reportFeedback" />
+      <node concept="37vLTG" id="3Pxu0s8xh3t" role="3clF46">
+        <property role="TrG5h" value="origin" />
+        <node concept="3Tqbb2" id="3Pxu0s8xid0" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3Pxu0s8xi$y" role="3clF46">
+        <property role="TrG5h" value="feedback" />
+        <node concept="3uibUv" id="3Pxu0s8xk3l" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="3Pxu0s8x4Kn" role="3clF45" />
+      <node concept="3Tm1VV" id="3Pxu0s8x4Ko" role="1B3o_S" />
+      <node concept="3clFbS" id="3Pxu0s8x4Kp" role="3clF47">
+        <node concept="3SKdUt" id="3Pxu0s8xkGe" role="3cqZAp">
+          <node concept="1PaTwC" id="3Pxu0s8xkGf" role="1aUNEU">
+            <node concept="3oM_SD" id="3Pxu0s8xlUC" role="1PaTwD">
+              <property role="3oM_SC" value="NOP" />
+            </node>
+            <node concept="3oM_SD" id="3Pxu0s8xlUE" role="1PaTwD">
+              <property role="3oM_SC" value="by" />
+            </node>
+            <node concept="3oM_SD" id="3Pxu0s8xlUH" role="1PaTwD">
+              <property role="3oM_SC" value="default" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="61G6TdBpQuz" role="jymVt" />
     <node concept="3clFb_" id="7DvO2M9IiMh" role="jymVt">
@@ -3119,18 +3166,16 @@
     <property role="1sVAO0" value="true" />
     <property role="3GE5qa" value="rule" />
     <node concept="2tJIrI" id="7nPD14OaO2C" role="jymVt" />
-    <node concept="3clFb_" id="6tnA4677QqC" role="jymVt">
+    <node concept="3clFb_" id="3Pxu0s8egWa" role="jymVt">
+      <property role="TrG5h" value="origin" />
       <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="originRef" />
-      <node concept="3uibUv" id="6tnA4677Qtx" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-      <node concept="3Tm1VV" id="6tnA4677QqF" role="1B3o_S" />
-      <node concept="3clFbS" id="6tnA4677QqG" role="3clF47" />
-      <node concept="P$JXv" id="6tnA4677Qt4" role="lGtFl">
-        <node concept="TZ5HA" id="6tnA4677Qt5" role="TZ5H$">
-          <node concept="1dT_AC" id="6tnA4677Qt6" role="1dT_Ay">
-            <property role="1dT_AB" value="A reference to the node that was used as the origin to generate this rule. " />
+      <node concept="3Tqbb2" id="3Pxu0s8egXz" role="3clF45" />
+      <node concept="3Tm1VV" id="3Pxu0s8egWd" role="1B3o_S" />
+      <node concept="3clFbS" id="3Pxu0s8egWe" role="3clF47" />
+      <node concept="P$JXv" id="3Pxu0s8eh8J" role="lGtFl">
+        <node concept="TZ5HA" id="3Pxu0s8eh8K" role="TZ5H$">
+          <node concept="1dT_AC" id="3Pxu0s8eh8L" role="1dT_Ay">
+            <property role="1dT_AB" value="Node that used to trigger this rule, null for constant rules. " />
           </node>
         </node>
       </node>
@@ -5844,12 +5889,8 @@
               <node concept="37vLTw" id="cmlg9NUDfU" role="37wK5m">
                 <ref role="3cqZAo" node="7nPD14Ob4vA" resolve="templateRef" />
               </node>
-              <node concept="2YIFZM" id="6tnA4678cYq" role="37wK5m">
-                <ref role="37wK5l" to="i8bi:4o40NPkYQhu" resolve="getPointer" />
-                <ref role="1Pybhc" to="i8bi:5IkW5anFcyt" resolve="SNodeOperations" />
-                <node concept="37vLTw" id="6tnA4678d3H" role="37wK5m">
-                  <ref role="3cqZAo" node="7nPD14Ob4B1" resolve="origin" />
-                </node>
+              <node concept="37vLTw" id="3Pxu0s8eBd$" role="37wK5m">
+                <ref role="3cqZAo" node="7nPD14Ob4B1" resolve="origin" />
               </node>
               <node concept="37vLTw" id="aZPZmIbQSG" role="37wK5m">
                 <ref role="3cqZAo" node="aZPZmI9FOv" resolve="targetRef" />
@@ -6881,16 +6922,16 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6tnA46781Cl" role="3cqZAp">
-          <node concept="37vLTI" id="6tnA46781Cn" role="3clFbG">
-            <node concept="2OqwBi" id="6tnA46784tw" role="37vLTJ">
-              <node concept="Xjq3P" id="6tnA46784K2" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6tnA46784tz" role="2OqNvi">
-                <ref role="2Oxat5" node="6tnA46781Ch" resolve="originRef" />
+        <node concept="3clFbF" id="3Pxu0s8enNa" role="3cqZAp">
+          <node concept="37vLTI" id="3Pxu0s8enNb" role="3clFbG">
+            <node concept="2OqwBi" id="3Pxu0s8enNc" role="37vLTJ">
+              <node concept="Xjq3P" id="3Pxu0s8enNd" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3Pxu0s8etYZ" role="2OqNvi">
+                <ref role="2Oxat5" node="3Pxu0s8eoj5" resolve="origin" />
               </node>
             </node>
-            <node concept="37vLTw" id="6tnA46781Cr" role="37vLTx">
-              <ref role="3cqZAo" node="6tnA4677Yt1" resolve="originRef" />
+            <node concept="37vLTw" id="3Pxu0s8enNf" role="37vLTx">
+              <ref role="3cqZAo" node="6tnA4677Yt1" resolve="origin" />
             </node>
           </node>
         </node>
@@ -7016,10 +7057,8 @@
         </node>
       </node>
       <node concept="37vLTG" id="6tnA4677Yt1" role="3clF46">
-        <property role="TrG5h" value="originRef" />
-        <node concept="3uibUv" id="6tnA4677YY9" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+        <property role="TrG5h" value="origin" />
+        <node concept="3Tqbb2" id="3Pxu0s8el7V" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="cmlg9NUuZW" role="3clF46">
         <property role="TrG5h" value="targetRef" />
@@ -7093,21 +7132,19 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="51V709l4dps" role="jymVt" />
-    <node concept="3clFb_" id="6tnA4677TsO" role="jymVt">
-      <property role="TrG5h" value="originRef" />
-      <node concept="3uibUv" id="6tnA4677TsP" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-      <node concept="3Tm1VV" id="6tnA4677TsQ" role="1B3o_S" />
-      <node concept="3clFbS" id="6tnA4677TsV" role="3clF47">
-        <node concept="3clFbF" id="6tnA46788y5" role="3cqZAp">
-          <node concept="37vLTw" id="6tnA46788y4" role="3clFbG">
-            <ref role="3cqZAo" node="6tnA46781Ch" resolve="originRef" />
+    <node concept="2tJIrI" id="3Pxu0s8eH3K" role="jymVt" />
+    <node concept="3clFb_" id="3Pxu0s8eKz4" role="jymVt">
+      <property role="TrG5h" value="origin" />
+      <node concept="3Tqbb2" id="3Pxu0s8eKz5" role="3clF45" />
+      <node concept="3Tm1VV" id="3Pxu0s8eKz6" role="1B3o_S" />
+      <node concept="3clFbS" id="3Pxu0s8eKzb" role="3clF47">
+        <node concept="3clFbF" id="3Pxu0s8eUS$" role="3cqZAp">
+          <node concept="37vLTw" id="3Pxu0s8eUSz" role="3clFbG">
+            <ref role="3cqZAo" node="3Pxu0s8eoj5" resolve="origin" />
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="6tnA4677TsW" role="2AJF6D">
+      <node concept="2AHcQZ" id="3Pxu0s8eKzc" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
@@ -7440,12 +7477,10 @@
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
       </node>
     </node>
-    <node concept="312cEg" id="6tnA46781Ch" role="jymVt">
-      <property role="TrG5h" value="originRef" />
-      <node concept="3Tm6S6" id="6tnA46781Ci" role="1B3o_S" />
-      <node concept="3uibUv" id="6tnA46781Ck" role="1tU5fm">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
+    <node concept="312cEg" id="3Pxu0s8eoj5" role="jymVt">
+      <property role="TrG5h" value="origin" />
+      <node concept="3Tm6S6" id="3Pxu0s8eoj6" role="1B3o_S" />
+      <node concept="3Tqbb2" id="3Pxu0s8eqYL" role="1tU5fm" />
     </node>
     <node concept="312cEg" id="cmlg9NR7Hz" role="jymVt">
       <property role="TrG5h" value="targetRef" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
index d2f832ce..790d3580 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
@@ -157,6 +157,7 @@
         <child id="1068580123135" name="body" index="3clF47" />
       </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" />
       </concept>
@@ -311,9 +312,6 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
-      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
-        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
-      </concept>
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
@@ -808,14 +806,17 @@
                                   <ref role="3cqZAo" node="3FGJ5nvn8o2" resolve="it" />
                                 </node>
                               </node>
-                              <node concept="liA8E" id="6tnA46794bu" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
+                              <node concept="liA8E" id="3Pxu0s8fl0p" role="2OqNvi">
+                                <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="2OqwBi" id="3FGJ5nvnADg" role="3uHU7w">
-                          <node concept="2OqwBi" id="3FGJ5nvnBh9" role="2Oq$k0">
+                        <node concept="3clFbC" id="3Pxu0s8fths" role="3uHU7w">
+                          <node concept="37vLTw" id="3Pxu0s8ftWw" role="3uHU7w">
+                            <ref role="3cqZAo" node="3FGJ5nvmG0V" resolve="testNode" />
+                          </node>
+                          <node concept="2OqwBi" id="3FGJ5nvnBh9" role="3uHU7B">
                             <node concept="0kSF2" id="3FGJ5nvnAcC" role="2Oq$k0">
                               <node concept="3uibUv" id="3FGJ5nvnAtZ" role="0kSFW">
                                 <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
@@ -824,21 +825,8 @@
                                 <ref role="3cqZAo" node="3FGJ5nvn8o2" resolve="it" />
                               </node>
                             </node>
-                            <node concept="liA8E" id="6tnA46794Iy" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="3FGJ5nvn8o0" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
-                            <node concept="2OqwBi" id="3FGJ5nvn9US" role="37wK5m">
-                              <node concept="liA8E" id="3FGJ5nvnamB" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                              </node>
-                              <node concept="2JrnkZ" id="3FGJ5nvn9UX" role="2Oq$k0">
-                                <node concept="37vLTw" id="3FGJ5nvn8o1" role="2JrQYb">
-                                  <ref role="3cqZAo" node="3FGJ5nvmG0V" resolve="testNode" />
-                                </node>
-                              </node>
+                            <node concept="liA8E" id="3Pxu0s8foMV" role="2OqNvi">
+                              <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
                             </node>
                           </node>
                         </node>