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 7a76dc03..2bfc9ef9 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
@@ -11273,18 +11273,28 @@
       <node concept="3clFbS" id="6nFpYlu02nM" role="3clF47">
         <node concept="1DcWWT" id="6nFpYlu4aqa" role="3cqZAp">
           <node concept="3clFbS" id="6nFpYlu4aqd" role="2LFqv$">
-            <node concept="3clFbF" id="6nFpYlu4aBM" role="3cqZAp">
-              <node concept="2OqwBi" id="6nFpYlu4biz" role="3clFbG">
-                <node concept="1rXfSq" id="6nFpYlu4aBL" role="2Oq$k0">
-                  <ref role="37wK5l" node="6nFpYlu3KpJ" resolve="sourcesOf" />
-                  <node concept="37vLTw" id="6nFpYlu4aFl" role="37wK5m">
-                    <ref role="3cqZAo" node="6nFpYlu4aqe" resolve="req" />
+            <node concept="3clFbJ" id="u$i61wmoJ0" role="3cqZAp">
+              <node concept="3clFbS" id="u$i61wmoJ2" role="3clFbx">
+                <node concept="3clFbF" id="6nFpYlu4aBM" role="3cqZAp">
+                  <node concept="2OqwBi" id="6nFpYlu4biz" role="3clFbG">
+                    <node concept="1rXfSq" id="6nFpYlu4aBL" role="2Oq$k0">
+                      <ref role="37wK5l" node="6nFpYlu3KpJ" resolve="sourcesOf" />
+                      <node concept="37vLTw" id="6nFpYlu4aFl" role="37wK5m">
+                        <ref role="3cqZAo" node="6nFpYlu4aqe" resolve="req" />
+                      </node>
+                    </node>
+                    <node concept="TSZUe" id="6nFpYlu4bNY" role="2OqNvi">
+                      <node concept="37vLTw" id="6nFpYlu4caT" role="25WWJ7">
+                        <ref role="3cqZAo" node="6nFpYlu02rL" resolve="source" />
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="TSZUe" id="6nFpYlu4bNY" role="2OqNvi">
-                  <node concept="37vLTw" id="6nFpYlu4caT" role="25WWJ7">
-                    <ref role="3cqZAo" node="6nFpYlu02rL" resolve="source" />
-                  </node>
+              </node>
+              <node concept="3y3z36" id="u$i61wmp85" role="3clFbw">
+                <node concept="10Nm6u" id="u$i61wmpf_" role="3uHU7w" />
+                <node concept="37vLTw" id="u$i61wmoOk" role="3uHU7B">
+                  <ref role="3cqZAo" node="6nFpYlu4aqe" resolve="req" />
                 </node>
               </node>
             </node>
@@ -11724,8 +11734,15 @@
                               <ref role="3cqZAo" node="6nFpYlu3FKa" resolve="reversedRequirements" />
                             </node>
                             <node concept="2Nt0df" id="6nFpYlu7FkT" role="2OqNvi">
-                              <node concept="37vLTw" id="6nFpYlu7FkU" role="38cxEo">
-                                <ref role="3cqZAo" node="6nFpYlu7FkV" resolve="it" />
+                              <node concept="2OqwBi" id="TwMhbMGmQX" role="38cxEo">
+                                <node concept="liA8E" id="TwMhbMGnF0" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+                                </node>
+                                <node concept="2JrnkZ" id="TwMhbMGmR2" role="2Oq$k0">
+                                  <node concept="37vLTw" id="6nFpYlu7FkU" role="2JrQYb">
+                                    <ref role="3cqZAo" node="6nFpYlu7FkV" resolve="it" />
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -11743,8 +11760,15 @@
                     <node concept="3clFbS" id="6nFpYlu7FkZ" role="1bW5cS">
                       <node concept="3clFbF" id="6nFpYlu7Fl0" role="3cqZAp">
                         <node concept="3EllGN" id="6nFpYlu7Fl1" role="3clFbG">
-                          <node concept="37vLTw" id="6nFpYlu7Fl2" role="3ElVtu">
-                            <ref role="3cqZAo" node="6nFpYlu7Fl4" resolve="it" />
+                          <node concept="2OqwBi" id="TwMhbMGogb" role="3ElVtu">
+                            <node concept="liA8E" id="TwMhbMGpQc" role="2OqNvi">
+                              <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+                            </node>
+                            <node concept="2JrnkZ" id="TwMhbMGogg" role="2Oq$k0">
+                              <node concept="37vLTw" id="6nFpYlu7Fl2" role="2JrQYb">
+                                <ref role="3cqZAo" node="6nFpYlu7Fl4" resolve="it" />
+                              </node>
+                            </node>
                           </node>
                           <node concept="37vLTw" id="6nFpYlu7Fl3" role="3ElQJh">
                             <ref role="3cqZAo" node="6nFpYlu3FKa" resolve="reversedRequirements" />
@@ -11995,6 +12019,24 @@
       </node>
       <node concept="3Tm6S6" id="6nFpYlu3N1F" role="1B3o_S" />
       <node concept="3clFbS" id="6nFpYlu3KpN" role="3clF47">
+        <node concept="3cpWs8" id="TwMhbMGqw_" role="3cqZAp">
+          <node concept="3cpWsn" id="TwMhbMGqwA" role="3cpWs9">
+            <property role="TrG5h" value="key" />
+            <node concept="3uibUv" id="TwMhbMGqwB" role="1tU5fm">
+              <ref role="3uigEE" to="mhbf:~SNodeId" resolve="SNodeId" />
+            </node>
+            <node concept="2OqwBi" id="TwMhbMGr2o" role="33vP2m">
+              <node concept="liA8E" id="TwMhbMGrq$" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+              </node>
+              <node concept="2JrnkZ" id="TwMhbMGr2t" role="2Oq$k0">
+                <node concept="37vLTw" id="TwMhbMGqCr" role="2JrQYb">
+                  <ref role="3cqZAo" node="6nFpYlu3W$E" resolve="req" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbJ" id="6nFpYlu43V5" role="3cqZAp">
           <node concept="3fqX7Q" id="6nFpYlu46uR" role="3clFbw">
             <node concept="2OqwBi" id="6nFpYlu46uT" role="3fr31v">
@@ -12002,8 +12044,8 @@
                 <ref role="3cqZAo" node="6nFpYlu3FKa" resolve="reversedRequirements" />
               </node>
               <node concept="2Nt0df" id="6nFpYlu46uV" role="2OqNvi">
-                <node concept="37vLTw" id="6nFpYlu46uW" role="38cxEo">
-                  <ref role="3cqZAo" node="6nFpYlu3W$E" resolve="req" />
+                <node concept="37vLTw" id="TwMhbMGruH" role="38cxEo">
+                  <ref role="3cqZAo" node="TwMhbMGqwA" resolve="key" />
                 </node>
               </node>
             </node>
@@ -12017,8 +12059,8 @@
                   </node>
                 </node>
                 <node concept="3EllGN" id="6nFpYlu47AA" role="37vLTJ">
-                  <node concept="37vLTw" id="6nFpYlu47Ey" role="3ElVtu">
-                    <ref role="3cqZAo" node="6nFpYlu3W$E" resolve="req" />
+                  <node concept="37vLTw" id="TwMhbMGsgQ" role="3ElVtu">
+                    <ref role="3cqZAo" node="TwMhbMGqwA" resolve="key" />
                   </node>
                   <node concept="37vLTw" id="6nFpYlu46yl" role="3ElQJh">
                     <ref role="3cqZAo" node="6nFpYlu3FKa" resolve="reversedRequirements" />
@@ -12030,8 +12072,8 @@
         </node>
         <node concept="3clFbF" id="6nFpYlu48sk" role="3cqZAp">
           <node concept="3EllGN" id="6nFpYlu48VU" role="3clFbG">
-            <node concept="37vLTw" id="6nFpYlu48YO" role="3ElVtu">
-              <ref role="3cqZAo" node="6nFpYlu3W$E" resolve="req" />
+            <node concept="37vLTw" id="TwMhbMGrSe" role="3ElVtu">
+              <ref role="3cqZAo" node="TwMhbMGqwA" resolve="key" />
             </node>
             <node concept="37vLTw" id="6nFpYlu48si" role="3ElQJh">
               <ref role="3cqZAo" node="6nFpYlu3FKa" resolve="reversedRequirements" />
@@ -12968,17 +13010,21 @@
       <property role="TrG5h" value="reversedRequirements" />
       <node concept="3Tm6S6" id="6nFpYlu3FKb" role="1B3o_S" />
       <node concept="3rvAFt" id="6nFpYlu3INu" role="1tU5fm">
-        <node concept="3Tqbb2" id="1ZiI2IC5bJ4" role="3rvQeY" />
         <node concept="2hMVRd" id="6nFpYlu3S8L" role="3rvSg0">
           <node concept="3Tqbb2" id="1ZiI2IC5di4" role="2hN53Y" />
         </node>
+        <node concept="3uibUv" id="TwMhbMGjRh" role="3rvQeY">
+          <ref role="3uigEE" to="mhbf:~SNodeId" resolve="SNodeId" />
+        </node>
       </node>
       <node concept="2ShNRf" id="6nFpYlu3KnQ" role="33vP2m">
         <node concept="3rGOSV" id="6nFpYlu3Knd" role="2ShVmc">
-          <node concept="3Tqbb2" id="1ZiI2IC5f0J" role="3rHrn6" />
           <node concept="2hMVRd" id="6nFpYlu3QAX" role="3rHtpV">
             <node concept="3Tqbb2" id="1ZiI2IC5gIq" role="2hN53Y" />
           </node>
+          <node concept="3uibUv" id="u$i61wkJLd" role="3rHrn6">
+            <ref role="3uigEE" to="mhbf:~SNodeId" resolve="SNodeId" />
+          </node>
         </node>
       </node>
     </node>