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 d9477037..1b939261 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
@@ -765,9 +765,16 @@
                 <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
               </node>
               <node concept="liA8E" id="3GlpCDSC7E3" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
-                <node concept="Xl_RD" id="3GlpCDSC7E4" role="37wK5m">
-                  <property role="Xl_RC" value="main" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey,java.lang.Object)" resolve="withParameter" />
+                <node concept="2YIFZM" id="4OmcgRwjQME" role="37wK5m">
+                  <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+                  <node concept="Xl_RD" id="4OmcgRwjTBh" role="37wK5m">
+                    <property role="Xl_RC" value="main" />
+                  </node>
+                  <node concept="3VsKOn" id="4OmcgRwk4WE" role="37wK5m">
+                    <ref role="3VsUkX" to="av0y:~Constraint" resolve="Constraint" />
+                  </node>
                 </node>
                 <node concept="2OqwBi" id="3GlpCDSC7E5" role="37wK5m">
                   <node concept="2ShNRf" id="3GlpCDSC7E6" role="2Oq$k0">
@@ -811,9 +818,16 @@
                     <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                   </node>
                   <node concept="liA8E" id="3F6vMxqqwSs" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
-                    <node concept="Xl_RD" id="3F6vMxqqzhz" role="37wK5m">
-                      <property role="Xl_RC" value="profiling.data" />
+                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey,java.lang.Object)" resolve="withParameter" />
+                    <node concept="2YIFZM" id="4OmcgRwkj$x" role="37wK5m">
+                      <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
+                      <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+                      <node concept="Xl_RD" id="3F6vMxqqzhz" role="37wK5m">
+                        <property role="Xl_RC" value="profiling.data" />
+                      </node>
+                      <node concept="3VsKOn" id="4OmcgRwktYn" role="37wK5m">
+                        <ref role="3VsUkX" to="33ny:~Map" resolve="Map" />
+                      </node>
                     </node>
                     <node concept="37vLTw" id="3F6vMxqqAtS" role="37wK5m">
                       <ref role="3cqZAo" node="3GlpCDSBZo0" resolve="profilingData" />
@@ -1308,9 +1322,14 @@
                     <ref role="3cqZAo" node="24Vro6cQKgF" resolve="tracer" />
                   </node>
                   <node concept="liA8E" id="3GlpCDSFxxb" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationTrace.failure(jetbrains.mps.logic.reactor.evaluation.EvaluationFailureException):void" resolve="failure" />
-                    <node concept="37vLTw" id="3GlpCDSFxz0" role="37wK5m">
-                      <ref role="3cqZAo" node="3GlpCDSFvLb" resolve="f" />
+                    <ref role="37wK5l" to="w7la:~EvaluationTrace.failure(jetbrains.mps.logic.reactor.evaluation.EvaluationFailure)" resolve="failure" />
+                    <node concept="2ShNRf" id="4OmcgRwmQGK" role="37wK5m">
+                      <node concept="1pGfFk" id="4OmcgRwmZFA" role="2ShVmc">
+                        <ref role="37wK5l" to="w7la:~EvaluationFailure.&lt;init&gt;(jetbrains.mps.logic.reactor.evaluation.EvaluationFailureException)" resolve="EvaluationFailure" />
+                        <node concept="37vLTw" id="4OmcgRwn1BD" role="37wK5m">
+                          <ref role="3cqZAo" node="3GlpCDSFvLb" resolve="f" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -7832,22 +7851,6 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
-      <node concept="3clFb_" id="7vxJ_H4tnOC" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="failure" />
-        <node concept="37vLTG" id="7vxJ_H4tnOD" role="3clF46">
-          <property role="TrG5h" value="fail" />
-          <node concept="3uibUv" id="7vxJ_H4tnOE" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="7vxJ_H4tnOF" role="3clF45" />
-        <node concept="3Tm1VV" id="7vxJ_H4tnOG" role="1B3o_S" />
-        <node concept="3clFbS" id="7vxJ_H4tnOK" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeVI3" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
       <node concept="3clFb_" id="8odmgCdh$k" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="failure" />
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 94587a90..e7a291e6 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
@@ -567,91 +567,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4MqhgXURXJo" role="jymVt" />
-    <node concept="3clFb_" id="78CwJJcXhUF" role="jymVt">
-      <property role="TrG5h" value="constraintArgumentTypes" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="37vLTG" id="78CwJJcXhUG" role="3clF46">
-        <property role="TrG5h" value="constraintSymbol" />
-        <node concept="3uibUv" id="78CwJJcXhUH" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="78CwJJcXhUI" role="3clF45">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="78CwJJcXhUJ" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="3qTvmN" id="78CwJJcXhUK" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="78CwJJcXhUL" role="1B3o_S" />
-      <node concept="3clFbS" id="78CwJJcXhUN" role="3clF47">
-        <node concept="3clFbF" id="78CwJJcXjXI" role="3cqZAp">
-          <node concept="2OqwBi" id="78CwJJcXk1o" role="3clFbG">
-            <node concept="37vLTw" id="78CwJJcXjXH" role="2Oq$k0">
-              <ref role="3cqZAo" node="5rhZO$TZnaE" resolve="registry" />
-            </node>
-            <node concept="liA8E" id="78CwJJcXq47" role="2OqNvi">
-              <ref role="37wK5l" node="78CwJJcXcEs" resolve="constraintArgTypes" />
-              <node concept="37vLTw" id="78CwJJcXq6w" role="37wK5m">
-                <ref role="3cqZAo" node="78CwJJcXhUG" resolve="constraintSymbol" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="78CwJJcWPAF" role="jymVt" />
-    <node concept="3clFb_" id="78CwJJcTorQ" role="jymVt">
-      <property role="TrG5h" value="constraintSymbols" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3uibUv" id="78CwJJcTorR" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="78CwJJcTorS" role="11_B2D">
-          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="78CwJJcTorT" role="1B3o_S" />
-      <node concept="3clFbS" id="78CwJJcTorV" role="3clF47">
-        <node concept="3clFbF" id="78CwJJcWNUm" role="3cqZAp">
-          <node concept="2OqwBi" id="78CwJJcWNVb" role="3clFbG">
-            <node concept="37vLTw" id="78CwJJcWNUl" role="2Oq$k0">
-              <ref role="3cqZAo" node="5rhZO$TZnaE" resolve="registry" />
-            </node>
-            <node concept="liA8E" id="78CwJJcWNY_" role="2OqNvi">
-              <ref role="37wK5l" node="78CwJJcXKoo" resolve="constraintSymbols" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="78CwJJcWS94" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="78CwJJcWRd_" role="jymVt" />
-    <node concept="3clFb_" id="78CwJJcTos7" role="jymVt">
-      <property role="TrG5h" value="predicateSymbols" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3uibUv" id="78CwJJcTos8" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="78CwJJcTos9" role="11_B2D">
-          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="78CwJJcTosa" role="1B3o_S" />
-      <node concept="3clFbS" id="78CwJJcTosc" role="3clF47">
-        <node concept="3clFbF" id="78CwJJcXJZt" role="3cqZAp">
-          <node concept="2OqwBi" id="78CwJJcXRZo" role="3clFbG">
-            <node concept="37vLTw" id="78CwJJcXJZs" role="2Oq$k0">
-              <ref role="3cqZAo" node="5rhZO$TZnaE" resolve="registry" />
-            </node>
-            <node concept="liA8E" id="78CwJJcXS0z" role="2OqNvi">
-              <ref role="37wK5l" node="ZqZbw4RIlL" resolve="predicateSymbols" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="16gGH0VyPQh" role="jymVt" />
     <node concept="3clFb_" id="16gGH0Vz2Uo" role="jymVt">
       <property role="TrG5h" value="name" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index b7379ca3..238e10e0 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -6177,23 +6177,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="YGS68MEg4A" role="jymVt" />
-    <node concept="3clFb_" id="7vxJ_H4trdI" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="failure" />
-      <node concept="37vLTG" id="7vxJ_H4trdJ" role="3clF46">
-        <property role="TrG5h" value="fail" />
-        <node concept="3uibUv" id="7vxJ_H4trdK" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7vxJ_H4trdL" role="3clF45" />
-      <node concept="3Tm1VV" id="7vxJ_H4trdM" role="1B3o_S" />
-      <node concept="3clFbS" id="7vxJ_H4trdP" role="3clF47" />
-      <node concept="2AHcQZ" id="7vxJ_H4trEC" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="7vxJ_H4trvc" role="jymVt" />
     <node concept="3clFb_" id="8odmgCdhBu" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -29542,65 +29525,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="YGS68MEWtC" role="jymVt" />
-    <node concept="3clFb_" id="7vxJ_H4ttZ$" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="failure" />
-      <node concept="37vLTG" id="7vxJ_H4ttZ_" role="3clF46">
-        <property role="TrG5h" value="fail" />
-        <node concept="3uibUv" id="7vxJ_H4ttZA" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7vxJ_H4ttZB" role="3clF45" />
-      <node concept="3Tm1VV" id="7vxJ_H4ttZC" role="1B3o_S" />
-      <node concept="2AHcQZ" id="7vxJ_H4ttZE" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="3clFbS" id="7vxJ_H4ttZF" role="3clF47">
-        <node concept="3clFbF" id="7vxJ_H4mpT6" role="3cqZAp">
-          <node concept="1rXfSq" id="7vxJ_H4mpT7" role="3clFbG">
-            <ref role="37wK5l" node="YGS68MDG_7" resolve="recordActivationEvent" />
-            <node concept="Rm8GO" id="7vxJ_H4mq2X" role="37wK5m">
-              <ref role="Rm8GQ" node="7vxJ_H4mnTR" resolve="FAILURE" />
-              <ref role="1Px2BO" node="5X6ji59xezw" resolve="ActivationEvent" />
-            </node>
-            <node concept="1bVj0M" id="7vxJ_H4mpT9" role="37wK5m">
-              <node concept="37vLTG" id="7vxJ_H4mpTa" role="1bW2Oz">
-                <property role="TrG5h" value="id" />
-                <node concept="10Oyi0" id="7vxJ_H4mpTb" role="1tU5fm" />
-              </node>
-              <node concept="3clFbS" id="7vxJ_H4mpTc" role="1bW5cS">
-                <node concept="3clFbF" id="7vxJ_H4mpTd" role="3cqZAp">
-                  <node concept="2OqwBi" id="7vxJ_H4mpTe" role="3clFbG">
-                    <node concept="37vLTw" id="7vxJ_H4mpTf" role="2Oq$k0">
-                      <ref role="3cqZAo" node="YGS68MDFfZ" resolve="activationModelBuilder" />
-                    </node>
-                    <node concept="liA8E" id="7vxJ_H4mpTg" role="2OqNvi">
-                      <ref role="37wK5l" node="7vxJ_H4mqbm" resolve="failure" />
-                      <node concept="37vLTw" id="7vxJ_H4mpTh" role="37wK5m">
-                        <ref role="3cqZAo" node="7vxJ_H4mpTa" resolve="id" />
-                      </node>
-                      <node concept="2OqwBi" id="7vxJ_H4tz_p" role="37wK5m">
-                        <node concept="37vLTw" id="7vxJ_H4tzeP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7vxJ_H4ttZ_" resolve="fail" />
-                        </node>
-                        <node concept="liA8E" id="7vxJ_H4tzTz" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="7vxJ_H4tzVP" role="37wK5m">
-                        <ref role="3cqZAo" node="7vxJ_H4ttZ_" resolve="fail" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="7vxJ_H4twbw" role="jymVt" />
     <node concept="3clFb_" id="8odmgCdik5" role="jymVt">
       <property role="1EzhhJ" value="false" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 98e49ae9..fb808184 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -3203,65 +3203,6 @@
         </node>
       </node>
     </node>
-    <node concept="3clFb_" id="7vxJ_H4tBm6" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="failure" />
-      <node concept="37vLTG" id="7vxJ_H4tBm7" role="3clF46">
-        <property role="TrG5h" value="fail" />
-        <node concept="3uibUv" id="7vxJ_H4tBm8" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7vxJ_H4tBm9" role="3clF45" />
-      <node concept="3Tm1VV" id="7vxJ_H4tBma" role="1B3o_S" />
-      <node concept="3clFbS" id="7vxJ_H4tBmd" role="3clF47">
-        <node concept="1Dw8fO" id="5mg4ZgLdlMS" role="3cqZAp">
-          <node concept="3clFbS" id="5mg4ZgLdlMT" role="2LFqv$">
-            <node concept="3clFbF" id="5mg4ZgLdlMU" role="3cqZAp">
-              <node concept="2OqwBi" id="5mg4ZgLdlMV" role="3clFbG">
-                <node concept="AH0OO" id="5mg4ZgLdlMW" role="2Oq$k0">
-                  <node concept="37vLTw" id="5mg4ZgLdlMX" role="AHEQo">
-                    <ref role="3cqZAo" node="5mg4ZgLdlN2" resolve="i" />
-                  </node>
-                  <node concept="37vLTw" id="5mg4ZgLdlMY" role="AHHXb">
-                    <ref role="3cqZAo" node="7nPD14NbJdt" resolve="traces" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="5mg4ZgLdlMZ" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.failure(jetbrains.mps.logic.reactor.evaluation.EvaluationFailureException):void" resolve="failure" />
-                  <node concept="37vLTw" id="5mg4ZgLdoxM" role="37wK5m">
-                    <ref role="3cqZAo" node="7vxJ_H4tBm7" resolve="fail" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="5mg4ZgLdlN2" role="1Duv9x">
-            <property role="TrG5h" value="i" />
-            <node concept="10Oyi0" id="5mg4ZgLdlN3" role="1tU5fm" />
-            <node concept="3cmrfG" id="5mg4ZgLdlN4" role="33vP2m">
-              <property role="3cmrfH" value="0" />
-            </node>
-          </node>
-          <node concept="3eOVzh" id="5mg4ZgLdlN5" role="1Dwp0S">
-            <node concept="2OqwBi" id="5mg4ZgLdlN6" role="3uHU7w">
-              <node concept="37vLTw" id="5mg4ZgLdlN7" role="2Oq$k0">
-                <ref role="3cqZAo" node="7nPD14NbJdt" resolve="traces" />
-              </node>
-              <node concept="1Rwk04" id="5mg4ZgLdlN8" role="2OqNvi" />
-            </node>
-            <node concept="37vLTw" id="5mg4ZgLdlN9" role="3uHU7B">
-              <ref role="3cqZAo" node="5mg4ZgLdlN2" resolve="i" />
-            </node>
-          </node>
-          <node concept="3uNrnE" id="5mg4ZgLdlNa" role="1Dwrff">
-            <node concept="37vLTw" id="5mg4ZgLdlNb" role="2$L3a6">
-              <ref role="3cqZAo" node="5mg4ZgLdlN2" resolve="i" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3clFb_" id="8odmgCdE5K" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="failure" />