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 db631531..d4e4d66c 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
@@ -7157,76 +7157,92 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="5gVsyvEQ4iV" role="3cqZAp">
-          <node concept="3cpWsn" id="5gVsyvEQ4iW" role="3cpWs9">
-            <property role="TrG5h" value="sessionToken" />
-            <node concept="3uibUv" id="5gVsyvEQ4iX" role="1tU5fm">
-              <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
-            </node>
-            <node concept="2OqwBi" id="5gVsyvEQ4iY" role="33vP2m">
-              <node concept="37vLTw" id="5gVsyvEQ4iZ" role="2Oq$k0">
-                <ref role="3cqZAo" node="5gVsyvEQ4ir" resolve="effect" />
-              </node>
-              <node concept="liA8E" id="5gVsyvEQ4j0" role="2OqNvi">
-                <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                <node concept="10M0yZ" id="5gVsyvEQ4j1" role="37wK5m">
-                  <ref role="3cqZAo" to="1yqb:2daneBP_Jiy" resolve="SESSION_TOKEN" />
-                  <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+        <node concept="3clFbJ" id="68BWwmZjQnt" role="3cqZAp">
+          <node concept="3clFbS" id="68BWwmZjQo4" role="3clFbx">
+            <node concept="3cpWs8" id="5gVsyvEQ4iV" role="3cqZAp">
+              <node concept="3cpWsn" id="5gVsyvEQ4iW" role="3cpWs9">
+                <property role="TrG5h" value="sessionToken" />
+                <node concept="3uibUv" id="5gVsyvEQ4iX" role="1tU5fm">
+                  <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
                 </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="5gVsyvEQ4j2" role="3cqZAp">
-          <node concept="3clFbS" id="5gVsyvEQ4j3" role="3clFbx">
-            <node concept="3clFbF" id="5gVsyvEQMF3" role="3cqZAp">
-              <node concept="2OqwBi" id="5gVsyvEQPi3" role="3clFbG">
-                <node concept="2YIFZM" id="5gVsyvEQN8q" role="2Oq$k0">
-                  <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
-                  <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                  <node concept="37vLTw" id="5gVsyvEQNo5" role="37wK5m">
-                    <ref role="3cqZAo" node="5gVsyvEQkQ5" resolve="repository" />
+                <node concept="2OqwBi" id="5gVsyvEQ4iY" role="33vP2m">
+                  <node concept="37vLTw" id="5gVsyvEQ4iZ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5gVsyvEQ4ir" resolve="effect" />
                   </node>
-                </node>
-                <node concept="liA8E" id="5gVsyvEQRdM" role="2OqNvi">
-                  <ref role="37wK5l" node="51a$_pPNS8S" resolve="setSessionToken" />
-                  <node concept="37vLTw" id="5gVsyvEQRmV" role="37wK5m">
-                    <ref role="3cqZAo" node="5gVsyvEQu19" resolve="unit" />
-                  </node>
-                  <node concept="37vLTw" id="5gVsyvEQT6C" role="37wK5m">
-                    <ref role="3cqZAo" node="5gVsyvEQ4iW" resolve="sessionToken" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="5gVsyvEQTic" role="3cqZAp" />
-          </node>
-          <node concept="3y3z36" id="5gVsyvEQ4j4" role="3clFbw">
-            <node concept="10Nm6u" id="5gVsyvEQ4j5" role="3uHU7w" />
-            <node concept="37vLTw" id="5gVsyvEQ4j6" role="3uHU7B">
-              <ref role="3cqZAo" node="5gVsyvEQ4iW" resolve="sessionToken" />
-            </node>
-          </node>
-          <node concept="9aQIb" id="5gVsyvEQTfR" role="9aQIa">
-            <node concept="3clFbS" id="5gVsyvEQTfS" role="9aQI4">
-              <node concept="3clFbF" id="5gVsyvEQTpy" role="3cqZAp">
-                <node concept="2OqwBi" id="5gVsyvEQTpz" role="3clFbG">
-                  <node concept="2YIFZM" id="5gVsyvEQTp$" role="2Oq$k0">
-                    <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
-                    <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                    <node concept="37vLTw" id="5gVsyvEQTp_" role="37wK5m">
-                      <ref role="3cqZAo" node="5gVsyvEQkQ5" resolve="repository" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="5gVsyvEQTpA" role="2OqNvi">
-                    <ref role="37wK5l" node="7wSJS_gAr4b" resolve="clearSessionToken" />
-                    <node concept="37vLTw" id="5gVsyvEQTpB" role="37wK5m">
-                      <ref role="3cqZAo" node="5gVsyvEQu19" resolve="unit" />
+                  <node concept="liA8E" id="5gVsyvEQ4j0" role="2OqNvi">
+                    <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                    <node concept="10M0yZ" id="5gVsyvEQ4j1" role="37wK5m">
+                      <ref role="3cqZAo" to="1yqb:2daneBP_Jiy" resolve="SESSION_TOKEN" />
+                      <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3clFbJ" id="5gVsyvEQ4j2" role="3cqZAp">
+              <node concept="3clFbS" id="5gVsyvEQ4j3" role="3clFbx">
+                <node concept="3clFbF" id="5gVsyvEQMF3" role="3cqZAp">
+                  <node concept="2OqwBi" id="5gVsyvEQPi3" role="3clFbG">
+                    <node concept="2YIFZM" id="5gVsyvEQN8q" role="2Oq$k0">
+                      <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
+                      <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingCache" />
+                      <node concept="37vLTw" id="5gVsyvEQNo5" role="37wK5m">
+                        <ref role="3cqZAo" node="5gVsyvEQkQ5" resolve="repository" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="5gVsyvEQRdM" role="2OqNvi">
+                      <ref role="37wK5l" node="51a$_pPNS8S" resolve="setSessionToken" />
+                      <node concept="37vLTw" id="5gVsyvEQRmV" role="37wK5m">
+                        <ref role="3cqZAo" node="5gVsyvEQu19" resolve="unit" />
+                      </node>
+                      <node concept="37vLTw" id="5gVsyvEQT6C" role="37wK5m">
+                        <ref role="3cqZAo" node="5gVsyvEQ4iW" resolve="sessionToken" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="5gVsyvEQTic" role="3cqZAp" />
+              </node>
+              <node concept="3y3z36" id="5gVsyvEQ4j4" role="3clFbw">
+                <node concept="10Nm6u" id="5gVsyvEQ4j5" role="3uHU7w" />
+                <node concept="37vLTw" id="5gVsyvEQ4j6" role="3uHU7B">
+                  <ref role="3cqZAo" node="5gVsyvEQ4iW" resolve="sessionToken" />
+                </node>
+              </node>
+              <node concept="9aQIb" id="5gVsyvEQTfR" role="9aQIa">
+                <node concept="3clFbS" id="5gVsyvEQTfS" role="9aQI4">
+                  <node concept="3clFbF" id="5gVsyvEQTpy" role="3cqZAp">
+                    <node concept="2OqwBi" id="5gVsyvEQTpz" role="3clFbG">
+                      <node concept="2YIFZM" id="5gVsyvEQTp$" role="2Oq$k0">
+                        <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
+                        <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingCache" />
+                        <node concept="37vLTw" id="5gVsyvEQTp_" role="37wK5m">
+                          <ref role="3cqZAo" node="5gVsyvEQkQ5" resolve="repository" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="5gVsyvEQTpA" role="2OqNvi">
+                        <ref role="37wK5l" node="7wSJS_gAr4b" resolve="clearSessionToken" />
+                        <node concept="37vLTw" id="5gVsyvEQTpB" role="37wK5m">
+                          <ref role="3cqZAo" node="5gVsyvEQu19" resolve="unit" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="68BWwmZjOe_" role="3clFbw">
+            <node concept="37vLTw" id="68BWwmZjNY_" role="2Oq$k0">
+              <ref role="3cqZAo" node="5gVsyvEQ4ir" resolve="effect" />
+            </node>
+            <node concept="liA8E" id="68BWwmZjQ7D" role="2OqNvi">
+              <ref role="37wK5l" to="1yqb:2daneBOX9Mp" resolve="hasValue" />
+              <node concept="10M0yZ" id="68BWwmZjQ94" role="37wK5m">
+                <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                <ref role="3cqZAo" to="1yqb:2daneBP_Jiy" resolve="SESSION_TOKEN" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -9133,7 +9149,7 @@
                     <node concept="3clFbH" id="68BWwmZetKq" role="3cqZAp" />
                     <node concept="3cpWs6" id="740EMdM1vvY" role="3cqZAp">
                       <node concept="37vLTw" id="740EMdM1vvZ" role="3cqZAk">
-                        <ref role="3cqZAo" node="7Mte5SKjzL_" />
+                        <ref role="3cqZAo" node="7Mte5SKjzL_" resolve="holder" />
                       </node>
                     </node>
                   </node>