diff --git a/build.xml b/build.xml
index 0ae9cd8d..13d77044 100644
--- a/build.xml
+++ b/build.xml
@@ -2561,10 +2561,7 @@
   
   <target name="buildDependents" />
   
-  <target name="fetchDependencies">
-    <mkdir dir="${build.tmp}/deps/mpsWorkbench/mps-workbench.jar" />
-    <unzip src="${artifacts.mps}/lib/mps-workbench.jar" dest="${build.tmp}/deps/mpsWorkbench/mps-workbench.jar" />
-  </target>
+  <target name="fetchDependencies" />
   
   <target name="build" depends="assemble" />
   
@@ -2588,10 +2585,10 @@
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}">
+      <plugin path="${artifacts.mps}/lib/mps-workbench.jar" />
       <plugin path="${artifacts.mps}/plugins/mps-build" />
       <plugin path="${artifacts.mps}/plugins/mps-core" />
       <plugin path="${artifacts.mps}/plugins/mps-testing" />
-      <plugin path="${build.tmp}/deps/mpsWorkbench/mps-workbench.jar/META-INF/plugin.xml/../.." />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -2617,6 +2614,7 @@
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
@@ -4237,6 +4235,7 @@
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
@@ -4316,10 +4315,10 @@
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.libraries.path.string" refid="mps.libraries.path" />
     <path id="mps.plugins.path">
+      <pathelement location="${artifacts.mps}/lib/mps-workbench.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-build" />
       <pathelement location="${artifacts.mps}/plugins/mps-core" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing" />
-      <pathelement location="${build.tmp}/deps/mpsWorkbench/mps-workbench.jar/META-INF/plugin.xml/../.." />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.plugins.path.string" refid="mps.plugins.path" />
     <path id="mps.tests.path">
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 58b26b98..961231cd 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
@@ -14239,19 +14239,6 @@
               <node concept="3clFbS" id="oI9Ys2xiQ" role="3clF47">
                 <node concept="3clFbF" id="oI9Ys2xiR" role="3cqZAp">
                   <node concept="2OqwBi" id="oI9Ys2xiS" role="3clFbG">
-                    <node concept="2YIFZM" id="oI9Ys2xiT" role="2Oq$k0">
-                      <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
-                      <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                      <node concept="2OqwBi" id="oI9Ys2xiU" role="37wK5m">
-                        <node concept="2YIFZM" id="oI9Ys2xiV" role="2Oq$k0">
-                          <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                          <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
-                        </node>
-                        <node concept="liA8E" id="oI9Ys2xiW" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
-                        </node>
-                      </node>
-                    </node>
                     <node concept="liA8E" id="oI9Ys2xiX" role="2OqNvi">
                       <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
                       <node concept="Rm8GO" id="1FOQehwoRqu" role="37wK5m">
@@ -14325,6 +14312,25 @@
                       </node>
                     </node>
                     <node concept="raruj" id="oI9Ys2xjm" role="lGtFl" />
+                    <node concept="2OqwBi" id="oI9YrWf2v" role="2Oq$k0">
+                      <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
+                        <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                        <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
+                      </node>
+                      <node concept="liA8E" id="3GEs5q_4fTI" role="2OqNvi">
+                        <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
+                        <node concept="2YIFZM" id="3GEs5q_4fTJ" role="37wK5m">
+                          <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+                          <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
+                          <node concept="Xl_RD" id="3GEs5q_4fTK" role="37wK5m">
+                            <property role="Xl_RC" value="reporting" />
+                          </node>
+                          <node concept="3VsKOn" id="3GEs5q_4fTL" role="37wK5m">
+                            <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -14349,39 +14355,6 @@
             <node concept="3clFbS" id="oI9Ys2xjt" role="3clF47">
               <node concept="3clFbF" id="oI9Ys2xju" role="3cqZAp">
                 <node concept="2OqwBi" id="oI9Ys2xjv" role="3clFbG">
-                  <node concept="2YIFZM" id="oI9Ys2xjw" role="2Oq$k0">
-                    <ref role="37wK5l" to="9x2e:oI9YrJ1oq" resolve="application" />
-                    <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                    <node concept="37vLTw" id="oI9Ys2xjx" role="37wK5m">
-                      <ref role="3cqZAo" node="oI9Ys2xjp" resolve="session" />
-                      <node concept="1ZhdrF" id="oI9Ys2xjy" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                        <property role="2qtEX8" value="variableDeclaration" />
-                        <node concept="3$xsQk" id="oI9Ys2xjz" role="3$ytzL">
-                          <node concept="3clFbS" id="oI9Ys2xj$" role="2VODD2">
-                            <node concept="3clFbF" id="oI9Ys2xj_" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9Ys2xjA" role="3clFbG">
-                                <node concept="1iwH7S" id="oI9Ys2xjB" role="2Oq$k0" />
-                                <node concept="1iwH70" id="oI9Ys2xjC" role="2OqNvi">
-                                  <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
-                                  <node concept="2OqwBi" id="oI9Ys2xjD" role="1iwH7V">
-                                    <node concept="30H73N" id="oI9Ys2xjE" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="oI9Ys2xjF" role="2OqNvi">
-                                      <node concept="1xMEDy" id="oI9Ys2xjG" role="1xVPHs">
-                                        <node concept="chp4Y" id="oI9Ys2xjH" 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="raruj" id="oI9Ys2xk7" role="lGtFl" />
                   <node concept="liA8E" id="oI9Ys2EaM" role="2OqNvi">
                     <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
@@ -14455,6 +14428,39 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="2YIFZM" id="oI9Ys2xjw" role="2Oq$k0">
+                    <ref role="37wK5l" to="9x2e:oI9YrJ1oq" resolve="application" />
+                    <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
+                    <node concept="37vLTw" id="oI9Ys2xjx" role="37wK5m">
+                      <ref role="3cqZAo" node="oI9Ys2xjp" resolve="session" />
+                      <node concept="1ZhdrF" id="oI9Ys2xjy" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                        <property role="2qtEX8" value="variableDeclaration" />
+                        <node concept="3$xsQk" id="oI9Ys2xjz" role="3$ytzL">
+                          <node concept="3clFbS" id="oI9Ys2xj$" role="2VODD2">
+                            <node concept="3clFbF" id="oI9Ys2xj_" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9Ys2xjA" role="3clFbG">
+                                <node concept="1iwH7S" id="oI9Ys2xjB" role="2Oq$k0" />
+                                <node concept="1iwH70" id="oI9Ys2xjC" role="2OqNvi">
+                                  <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
+                                  <node concept="2OqwBi" id="oI9Ys2xjD" role="1iwH7V">
+                                    <node concept="30H73N" id="oI9Ys2xjE" role="2Oq$k0" />
+                                    <node concept="2Xjw5R" id="oI9Ys2xjF" role="2OqNvi">
+                                      <node concept="1xMEDy" id="oI9Ys2xjG" role="1xVPHs">
+                                        <node concept="chp4Y" id="oI9Ys2xjH" role="ri$Ld">
+                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
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 b8492ec4..d9477037 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
@@ -267,6 +267,9 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
@@ -504,9 +507,9 @@
     <node concept="2tJIrI" id="41ox5Vnk7ln" role="jymVt" />
     <node concept="3clFbW" id="HV6urVFjOl" role="jymVt">
       <node concept="37vLTG" id="2UGjFq4Led0" role="3clF46">
-        <property role="TrG5h" value="sessionSolver" />
-        <node concept="3uibUv" id="2UGjFq4Les6" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
+        <property role="TrG5h" value="reporting" />
+        <node concept="3uibUv" id="3GEs5q_0q_0" role="1tU5fm">
+          <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
         </node>
       </node>
       <node concept="3cqZAl" id="HV6urVFjOn" role="3clF45" />
@@ -515,7 +518,7 @@
         <node concept="1VxSAg" id="4F3SXIF5Y1f" role="3cqZAp">
           <ref role="37wK5l" node="4F3SXIF5Xa$" resolve="ProgramEvaluator" />
           <node concept="37vLTw" id="4F3SXIF5Y2w" role="37wK5m">
-            <ref role="3cqZAo" node="2UGjFq4Led0" resolve="sessionSolver" />
+            <ref role="3cqZAo" node="2UGjFq4Led0" resolve="reporting" />
           </node>
           <node concept="3clFbT" id="4F3SXIF5Y37" role="37wK5m">
             <property role="3clFbU" value="false" />
@@ -529,9 +532,9 @@
     <node concept="2tJIrI" id="4F3SXIF5Xmc" role="jymVt" />
     <node concept="3clFbW" id="4F3SXIF5Xa$" role="jymVt">
       <node concept="37vLTG" id="4F3SXIF5Xa_" role="3clF46">
-        <property role="TrG5h" value="sessionSolver" />
-        <node concept="3uibUv" id="4F3SXIF5XaA" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
+        <property role="TrG5h" value="reporting" />
+        <node concept="3uibUv" id="3GEs5q_0$SY" role="1tU5fm">
+          <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
         </node>
       </node>
       <node concept="37vLTG" id="4F3SXIF5Xx_" role="3clF46">
@@ -550,11 +553,11 @@
             <node concept="2OqwBi" id="4F3SXIF5XaG" role="37vLTJ">
               <node concept="Xjq3P" id="4F3SXIF5XaH" role="2Oq$k0" />
               <node concept="2OwXpG" id="4F3SXIF5XaI" role="2OqNvi">
-                <ref role="2Oxat5" node="2UGjFq4Lesf" resolve="sessionSolver" />
+                <ref role="2Oxat5" node="2UGjFq4Lesf" resolve="reporting" />
               </node>
             </node>
             <node concept="37vLTw" id="4F3SXIF5XaJ" role="37vLTx">
-              <ref role="3cqZAo" node="4F3SXIF5Xa_" resolve="sessionSolver" />
+              <ref role="3cqZAo" node="4F3SXIF5Xa_" resolve="reporting" />
             </node>
           </node>
         </node>
@@ -827,6 +830,44 @@
             <ref role="3cqZAo" node="4F3SXIF5XzK" resolve="profiling" />
           </node>
         </node>
+        <node concept="3clFbJ" id="3GEs5q_0Zj9" role="3cqZAp">
+          <node concept="3clFbS" id="3GEs5q_0Zjb" role="3clFbx">
+            <node concept="3clFbF" id="3GEs5q_1crQ" role="3cqZAp">
+              <node concept="37vLTI" id="3GEs5q_1iS8" role="3clFbG">
+                <node concept="2OqwBi" id="3GEs5q_1iYy" role="37vLTx">
+                  <node concept="37vLTw" id="3GEs5q_1iSL" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+                  </node>
+                  <node concept="liA8E" id="3GEs5q_1obM" role="2OqNvi">
+                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey,java.lang.Object)" resolve="withParameter" />
+                    <node concept="2YIFZM" id="3GEs5q_1ywI" 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="3GEs5q_1BA$" role="37wK5m">
+                        <property role="Xl_RC" value="reporting" />
+                      </node>
+                      <node concept="3VsKOn" id="3GEs5q_1Sd9" role="37wK5m">
+                        <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="3GEs5q_22yl" role="37wK5m">
+                      <ref role="3cqZAo" node="2UGjFq4Lesf" resolve="reporting" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="3GEs5q_1crO" role="37vLTJ">
+                  <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="3GEs5q_15kq" role="3clFbw">
+            <node concept="10Nm6u" id="3GEs5q_17l7" role="3uHU7w" />
+            <node concept="37vLTw" id="3GEs5q_11wj" role="3uHU7B">
+              <ref role="3cqZAo" node="2UGjFq4Lesf" resolve="reporting" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="3GlpCDSD2Ms" role="3cqZAp">
           <node concept="37vLTI" id="3GlpCDSD39k" role="3clFbG">
             <node concept="37vLTw" id="3GlpCDSD2Mq" role="37vLTJ">
@@ -1013,19 +1054,6 @@
                                   </node>
                                   <node concept="3clFbF" id="4jcOV4hNvFB" role="3cqZAp">
                                     <node concept="2OqwBi" id="4jcOV4hNvFC" role="3clFbG">
-                                      <node concept="2YIFZM" id="4jcOV4hNvFD" role="2Oq$k0">
-                                        <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
-                                        <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                                        <node concept="2OqwBi" id="4jcOV4hNvFE" role="37wK5m">
-                                          <node concept="2YIFZM" id="4jcOV4hNvFF" role="2Oq$k0">
-                                            <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
-                                            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                                          </node>
-                                          <node concept="liA8E" id="4jcOV4hNvFG" role="2OqNvi">
-                                            <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
-                                          </node>
-                                        </node>
-                                      </node>
                                       <node concept="liA8E" id="4jcOV4hNvFH" role="2OqNvi">
                                         <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
                                         <node concept="1rXfSq" id="4jcOV4hNTUb" role="37wK5m">
@@ -1063,6 +1091,25 @@
                                           </node>
                                         </node>
                                       </node>
+                                      <node concept="2OqwBi" id="oI9YrWf2v" role="2Oq$k0">
+                                        <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
+                                          <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                                          <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
+                                        </node>
+                                        <node concept="liA8E" id="3GEs5q_4fTI" role="2OqNvi">
+                                          <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
+                                          <node concept="2YIFZM" id="3GEs5q_4fTJ" role="37wK5m">
+                                            <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+                                            <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
+                                            <node concept="Xl_RD" id="3GEs5q_4fTK" role="37wK5m">
+                                              <property role="Xl_RC" value="reporting" />
+                                            </node>
+                                            <node concept="3VsKOn" id="3GEs5q_4fTL" role="37wK5m">
+                                              <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                   <node concept="3clFbH" id="4jcOV4hN_30" role="3cqZAp" />
@@ -1328,10 +1375,7 @@
                     <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                   </node>
                   <node concept="liA8E" id="5mr7UHcbsE5" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationResult" resolve="start" />
-                    <node concept="37vLTw" id="2UGjFq4Lf8i" role="37wK5m">
-                      <ref role="3cqZAo" node="2UGjFq4Lesf" resolve="sessionSolver" />
-                    </node>
+                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start()" resolve="start" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="1Ry9kf2vmS7" role="37vLTJ">
@@ -1827,10 +1871,10 @@
     <node concept="2tJIrI" id="4jcOV4hNGQi" role="jymVt" />
     <node concept="3Tm1VV" id="41ox5Vnk76b" role="1B3o_S" />
     <node concept="312cEg" id="2UGjFq4Lesf" role="jymVt">
-      <property role="TrG5h" value="sessionSolver" />
+      <property role="TrG5h" value="reporting" />
       <node concept="3Tm6S6" id="2UGjFq4Lesg" role="1B3o_S" />
-      <node concept="3uibUv" id="2UGjFq4Lesi" role="1tU5fm">
-        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
+      <node concept="3uibUv" id="3GEs5q_0Jus" role="1tU5fm">
+        <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
       </node>
     </node>
     <node concept="312cEg" id="4F3SXIF5XzK" role="jymVt">
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index 72895350..9aa989f7 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -52,10 +52,6 @@
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
-      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -78,9 +74,6 @@
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -96,6 +89,9 @@
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
       <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
@@ -338,24 +334,27 @@
           <node concept="3clFbS" id="oI9YrdoYk" role="3clF47">
             <node concept="3clFbF" id="oI9Yrdp0J" role="3cqZAp">
               <node concept="2OqwBi" id="oI9YrdpxT" role="3clFbG">
-                <node concept="1eOMI4" id="oI9Yrdpd1" role="2Oq$k0">
-                  <node concept="10QFUN" id="oI9YrdpcY" role="1eOMHV">
-                    <node concept="3uibUv" id="oI9YrdpgP" role="10QFUM">
-                      <ref role="3uigEE" to="tj24:7lt0LtQ_OIS" resolve="TypecheckingSessionSolver" />
-                    </node>
-                    <node concept="2OqwBi" id="oI9Yrdpd3" role="10QFUP">
-                      <node concept="2YIFZM" id="oI9Yrdpd4" role="2Oq$k0">
-                        <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                        <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
+                <node concept="2OqwBi" id="oI9Yrdpd3" role="2Oq$k0">
+                  <node concept="2YIFZM" id="oI9Yrdpd4" role="2Oq$k0">
+                    <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                    <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
+                  </node>
+                  <node concept="liA8E" id="3GEs5q_3xVx" role="2OqNvi">
+                    <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
+                    <node concept="2YIFZM" id="3GEs5q_3C7H" 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="3GEs5q_3Qp$" role="37wK5m">
+                        <property role="Xl_RC" value="reporting" />
                       </node>
-                      <node concept="liA8E" id="oI9Yrdpd5" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
+                      <node concept="3VsKOn" id="3GEs5q_3JtQ" role="37wK5m">
+                        <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
                       </node>
                     </node>
                   </node>
                 </node>
                 <node concept="liA8E" id="oI9YrdpMV" role="2OqNvi">
-                  <ref role="37wK5l" to="tj24:7lt0LtQ_SZU" resolve="assignType" />
+                  <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
                   <node concept="10Nm6u" id="oI9YrdpSj" role="37wK5m">
                     <node concept="29HgVG" id="oI9Yrdq5a" role="lGtFl">
                       <node concept="3NFfHV" id="oI9Yrdq6g" role="3NFExx">
@@ -472,19 +471,6 @@
               <node concept="3clFbS" id="oI9YrWf2p" role="3clF47">
                 <node concept="3clFbF" id="oI9YrWf2q" role="3cqZAp">
                   <node concept="2OqwBi" id="oI9YrWf2r" role="3clFbG">
-                    <node concept="2YIFZM" id="oI9YrWfNN" role="2Oq$k0">
-                      <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                      <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
-                      <node concept="2OqwBi" id="oI9YrWf2v" role="37wK5m">
-                        <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
-                          <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
-                          <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                        </node>
-                        <node concept="liA8E" id="oI9YrWf2x" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
-                        </node>
-                      </node>
-                    </node>
                     <node concept="liA8E" id="oI9YrWf2y" role="2OqNvi">
                       <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
                       <node concept="10Nm6u" id="oI9YrWf2z" role="37wK5m">
@@ -542,6 +528,25 @@
                       </node>
                     </node>
                     <node concept="raruj" id="oI9YrWf2V" role="lGtFl" />
+                    <node concept="2OqwBi" id="oI9YrWf2v" role="2Oq$k0">
+                      <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
+                        <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                        <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
+                      </node>
+                      <node concept="liA8E" id="3GEs5q_4fTI" role="2OqNvi">
+                        <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
+                        <node concept="2YIFZM" id="3GEs5q_4fTJ" role="37wK5m">
+                          <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+                          <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
+                          <node concept="Xl_RD" id="3GEs5q_4fTK" role="37wK5m">
+                            <property role="Xl_RC" value="reporting" />
+                          </node>
+                          <node concept="3VsKOn" id="3GEs5q_4fTL" role="37wK5m">
+                            <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index de169ba0..98e49ae9 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -31,6 +31,7 @@
     <import index="e0w6" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.observers(jetbrains.mps.coderules/)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
+    <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -1837,7 +1838,7 @@
                                 <ref role="37wK5l" to="hano:4F3SXIF5Xa$" resolve="ProgramEvaluator" />
                                 <node concept="3Tm1VV" id="7WKNeR9ynVB" role="1B3o_S" />
                                 <node concept="1rXfSq" id="7WKNeR9_X4s" role="37wK5m">
-                                  <ref role="37wK5l" node="23c4kVtaQus" resolve="createSessionSolver" />
+                                  <ref role="37wK5l" node="23c4kVtaQus" resolve="createReporting" />
                                 </node>
                                 <node concept="37vLTw" id="23c4kVtm7Iq" role="37wK5m">
                                   <ref role="3cqZAo" node="23c4kVtm7Il" resolve="profile" />
@@ -2443,10 +2444,10 @@
     </node>
     <node concept="2tJIrI" id="3F6vMxqjxuu" role="jymVt" />
     <node concept="3clFb_" id="23c4kVtaQus" role="jymVt">
-      <property role="TrG5h" value="createSessionSolver" />
+      <property role="TrG5h" value="createReporting" />
       <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="23c4kVtaQuv" role="3clF45">
-        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
+      <node concept="3uibUv" id="3GEs5q_2liE" role="3clF45">
+        <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
       </node>
       <node concept="3Tmbuc" id="23c4kVtaQuw" role="1B3o_S" />
       <node concept="3clFbS" id="23c4kVtaQux" role="3clF47" />
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 4526a879..fcdfd99e 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -71,7 +71,6 @@
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
@@ -332,59 +331,6 @@
       <node concept="17QB3L" id="4t7Xo7inNV0" role="1tU5fm" />
     </node>
   </node>
-  <node concept="312cEu" id="7lt0LtQ_OIS">
-    <property role="TrG5h" value="ControlflowSessionSolver" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="oI9Yrbvo_" role="jymVt" />
-    <node concept="3clFbW" id="oI9Yrbvrt" role="jymVt">
-      <node concept="3cqZAl" id="oI9Yrbvrv" role="3clF45" />
-      <node concept="3Tm1VV" id="oI9Yrbvrw" role="1B3o_S" />
-      <node concept="3clFbS" id="oI9Yrbvrx" role="3clF47">
-        <node concept="XkiVB" id="oI9Yrbvx2" role="3cqZAp">
-          <ref role="37wK5l" to="w7la:~SessionSolver.&lt;init&gt;()" resolve="SessionSolver" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7lt0LtQ_OLY" role="jymVt" />
-    <node concept="3clFb_" id="7lt0LtQ_SZU" role="jymVt">
-      <property role="TrG5h" value="assignType" />
-      <node concept="37vLTG" id="7lt0LtQ_T0C" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="7lt0LtQ_T26" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7lt0LtQ_T29" role="3clF46">
-        <property role="TrG5h" value="nodeType" />
-        <node concept="3Tqbb2" id="7lt0LtQ_T3R" role="1tU5fm" />
-      </node>
-      <node concept="10P_77" id="oI9YrbUH2" role="3clF45" />
-      <node concept="3Tm1VV" id="7lt0LtQ_SZX" role="1B3o_S" />
-      <node concept="3clFbS" id="7lt0LtQ_SZY" role="3clF47">
-        <node concept="3SKdUt" id="78H58oeu59G" role="3cqZAp">
-          <node concept="3SKdUq" id="78H58oeu59I" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME this doesn't belong here" />
-          </node>
-        </node>
-        <node concept="YS8fn" id="78H58oeu4WY" role="3cqZAp">
-          <node concept="2ShNRf" id="78H58oeu4XS" role="YScLw">
-            <node concept="1pGfFk" id="78H58oeu55k" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="oI9YrIZQO" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1FOQehvIsJr" role="jymVt" />
-    <node concept="3Tm1VV" id="7lt0LtQ_OIT" role="1B3o_S" />
-    <node concept="3uibUv" id="4jcOV4h9GqE" role="1zkMxy">
-      <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-    </node>
-    <node concept="3uibUv" id="78H58oeu4oM" role="EKbjA">
-      <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
-    </node>
-  </node>
   <node concept="312cEu" id="78H58oeu6dG">
     <property role="TrG5h" value="ControlflowStep" />
     <node concept="2tJIrI" id="78H58oeu6M4" role="jymVt" />
@@ -483,10 +429,10 @@
     </node>
     <node concept="2tJIrI" id="6Yb9hAqJRuL" role="jymVt" />
     <node concept="3clFb_" id="78H58oeu6MG" role="jymVt">
-      <property role="TrG5h" value="createSessionSolver" />
+      <property role="TrG5h" value="createReporting" />
       <property role="1EzhhJ" value="false" />
-      <node concept="3uibUv" id="78H58oeu9FS" role="3clF45">
-        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
+      <node concept="3uibUv" id="3GEs5q_2s3Z" role="3clF45">
+        <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
       </node>
       <node concept="3Tmbuc" id="78H58oeu6MI" role="1B3o_S" />
       <node concept="3clFbS" id="78H58oeu6MK" role="3clF47">
@@ -495,8 +441,8 @@
             <node concept="YeOm9" id="78H58oeuadh" role="2ShVmc">
               <node concept="1Y3b0j" id="78H58oeuadk" role="YeSDq">
                 <property role="2bfB8j" value="true" />
-                <ref role="1Y3XeK" node="7lt0LtQ_OIS" resolve="ControlflowSessionSolver" />
-                <ref role="37wK5l" node="oI9Yrbvrt" resolve="ControlflowSessionSolver" />
+                <ref role="1Y3XeK" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <node concept="3Tm1VV" id="78H58oeuadl" role="1B3o_S" />
                 <node concept="3clFb_" id="78H58oeuats" role="jymVt">
                   <property role="1EzhhJ" value="false" />
@@ -551,6 +497,37 @@
                     </node>
                   </node>
                 </node>
+                <node concept="2tJIrI" id="3GEs5q_2HLX" role="jymVt" />
+                <node concept="3clFb_" id="3GEs5q_2Fa2" role="jymVt">
+                  <property role="TrG5h" value="assignType" />
+                  <node concept="37vLTG" id="3GEs5q_2Fa3" role="3clF46">
+                    <property role="TrG5h" value="target" />
+                    <node concept="3Tqbb2" id="3GEs5q_2Fa4" role="1tU5fm" />
+                  </node>
+                  <node concept="37vLTG" id="3GEs5q_2Fa5" role="3clF46">
+                    <property role="TrG5h" value="nodeType" />
+                    <node concept="3Tqbb2" id="3GEs5q_2Fa6" role="1tU5fm" />
+                  </node>
+                  <node concept="10P_77" id="3GEs5q_2Fa7" role="3clF45" />
+                  <node concept="3Tm1VV" id="3GEs5q_2Fa8" role="1B3o_S" />
+                  <node concept="3clFbS" id="3GEs5q_2Fa9" role="3clF47">
+                    <node concept="3SKdUt" id="3GEs5q_2Faa" role="3cqZAp">
+                      <node concept="3SKdUq" id="3GEs5q_2Fab" role="3SKWNk">
+                        <property role="3SKdUp" value="FIXME this doesn't belong here" />
+                      </node>
+                    </node>
+                    <node concept="YS8fn" id="3GEs5q_2Fac" role="3cqZAp">
+                      <node concept="2ShNRf" id="3GEs5q_2Fad" role="YScLw">
+                        <node concept="1pGfFk" id="3GEs5q_2Fae" role="2ShVmc">
+                          <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="3GEs5q_2Faf" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
                 <node concept="2tJIrI" id="72RDgIN3jWs" role="jymVt" />
                 <node concept="3clFb_" id="72RDgIN3k5M" role="jymVt">
                   <property role="1EzhhJ" value="false" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index bd3ad9d0..abea9aa9 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -68,6 +68,13 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
+      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
+        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
+      </concept>
+      <concept id="1109283449304" name="jetbrains.mps.baseLanguage.structure.TypeVariableReference" flags="in" index="16syzq">
+        <reference id="1109283546497" name="typeVariableDeclaration" index="16sUi3" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -192,45 +199,9 @@
     <node concept="3clFbW" id="5jPBdK_qM0" role="jymVt">
       <node concept="3cqZAl" id="5jPBdK_qM2" role="3clF45" />
       <node concept="3Tm6S6" id="5jPBdK_rSe" role="1B3o_S" />
-      <node concept="3clFbS" id="5jPBdK_qM4" role="3clF47">
-        <node concept="3clFbF" id="5jPBdK_qYH" role="3cqZAp">
-          <node concept="37vLTI" id="5jPBdK_qYJ" role="3clFbG">
-            <node concept="2OqwBi" id="5jPBdK_qYN" role="37vLTJ">
-              <node concept="Xjq3P" id="5jPBdK_qYQ" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5jPBdK_qYM" role="2OqNvi">
-                <ref role="2Oxat5" node="5jPBdK_qYD" resolve="sessionSolver" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="5jPBdK_qYR" role="37vLTx">
-              <ref role="3cqZAo" node="5jPBdK_qV5" resolve="sessionSolver" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5jPBdK_qV5" role="3clF46">
-        <property role="TrG5h" value="sessionSolver" />
-        <node concept="3uibUv" id="5jPBdK_qV4" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-        </node>
-      </node>
+      <node concept="3clFbS" id="5jPBdK_qM4" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="5jPBdK_qFR" role="jymVt" />
-    <node concept="3clFb_" id="5jPBdK_dWA" role="jymVt">
-      <property role="TrG5h" value="sessionSolver" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3uibUv" id="5jPBdK_dWB" role="3clF45">
-        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-      </node>
-      <node concept="3Tm1VV" id="5jPBdK_dWC" role="1B3o_S" />
-      <node concept="3clFbS" id="5jPBdK_dWE" role="3clF47">
-        <node concept="3clFbF" id="5jPBdK_r6i" role="3cqZAp">
-          <node concept="37vLTw" id="5jPBdK_r6h" role="3clFbG">
-            <ref role="3cqZAo" node="5jPBdK_qYD" resolve="sessionSolver" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="60zk4o6TNz8" role="jymVt" />
     <node concept="3clFb_" id="YbzkzL3h5J" role="jymVt">
       <property role="TrG5h" value="program" />
       <node concept="3Tm1VV" id="YbzkzL3h5K" role="1B3o_S" />
@@ -362,6 +333,37 @@
         </node>
       </node>
     </node>
+    <node concept="3clFb_" id="3GEs5q_5JgU" role="jymVt">
+      <property role="TrG5h" value="parameter" />
+      <node concept="3Tm1VV" id="3GEs5q_5JgV" role="1B3o_S" />
+      <node concept="16euLQ" id="3GEs5q_5JgX" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="16syzq" id="3GEs5q_5JgY" role="3clF45">
+        <ref role="16sUi3" node="3GEs5q_5JgX" resolve="T" />
+      </node>
+      <node concept="37vLTG" id="3GEs5q_5JgZ" role="3clF46">
+        <property role="TrG5h" value="key" />
+        <node concept="3uibUv" id="3GEs5q_5Jh0" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+          <node concept="16syzq" id="3GEs5q_5Jh1" role="11_B2D">
+            <ref role="16sUi3" node="3GEs5q_5JgX" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="3GEs5q_5Jh2" role="3clF47">
+        <node concept="YS8fn" id="3GEs5q_5KK0" role="3cqZAp">
+          <node concept="2ShNRf" id="3GEs5q_5KK1" role="YScLw">
+            <node concept="1pGfFk" id="3GEs5q_5KK2" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3GEs5q_5Jh3" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="5jPBdK_dW3" role="jymVt" />
     <node concept="312cEu" id="5jPBdK_mRo" role="jymVt">
       <property role="2bfB8j" value="false" />
@@ -492,26 +494,59 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="694E_55g1vK" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="withFailureHandler" />
-        <property role="DiZV1" value="false" />
-        <property role="od$2w" value="false" />
-        <node concept="3Tm1VV" id="694E_55g1vL" role="1B3o_S" />
-        <node concept="3uibUv" id="694E_55g1vN" role="3clF45">
+      <node concept="3clFb_" id="3GEs5q_5NBC" role="jymVt">
+        <property role="TrG5h" value="withParameter" />
+        <node concept="3Tm1VV" id="3GEs5q_5NBD" role="1B3o_S" />
+        <node concept="16euLQ" id="3GEs5q_5NBF" role="16eVyc">
+          <property role="TrG5h" value="T" />
+        </node>
+        <node concept="3uibUv" id="3GEs5q_5NBG" role="3clF45">
           <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
-        <node concept="37vLTG" id="694E_55g1vO" role="3clF46">
-          <property role="TrG5h" value="handler" />
-          <node concept="3uibUv" id="694E_55g1vP" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~FailureHandler" resolve="FailureHandler" />
+        <node concept="37vLTG" id="3GEs5q_5NBH" role="3clF46">
+          <property role="TrG5h" value="key" />
+          <node concept="3uibUv" id="3GEs5q_5NBI" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+            <node concept="16syzq" id="3GEs5q_5NBJ" role="11_B2D">
+              <ref role="16sUi3" node="3GEs5q_5NBF" resolve="T" />
+            </node>
           </node>
         </node>
-        <node concept="3clFbS" id="694E_55g1vQ" role="3clF47">
-          <node concept="3clFbF" id="694E_55g1vT" role="3cqZAp">
-            <node concept="10Nm6u" id="694E_55g1vS" role="3clFbG" />
+        <node concept="37vLTG" id="3GEs5q_5NBK" role="3clF46">
+          <property role="TrG5h" value="t" />
+          <node concept="16syzq" id="3GEs5q_5NBL" role="1tU5fm">
+            <ref role="16sUi3" node="3GEs5q_5NBF" resolve="T" />
           </node>
         </node>
+        <node concept="3clFbS" id="3GEs5q_5NBM" role="3clF47">
+          <node concept="3clFbF" id="3GEs5q_5NBP" role="3cqZAp">
+            <node concept="10Nm6u" id="3GEs5q_5NBO" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3GEs5q_5NBN" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="3GEs5q_5NBQ" role="jymVt">
+        <property role="TrG5h" value="withFeedbackHandler" />
+        <node concept="3Tm1VV" id="3GEs5q_5NBR" role="1B3o_S" />
+        <node concept="3uibUv" id="3GEs5q_5NBT" role="3clF45">
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+        </node>
+        <node concept="37vLTG" id="3GEs5q_5NBU" role="3clF46">
+          <property role="TrG5h" value="handler" />
+          <node concept="3uibUv" id="3GEs5q_5NBV" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~EvaluationFeedbackHandler" resolve="EvaluationFeedbackHandler" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="3GEs5q_5NBW" role="3clF47">
+          <node concept="3clFbF" id="3GEs5q_5NBZ" role="3cqZAp">
+            <node concept="10Nm6u" id="3GEs5q_5NBY" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3GEs5q_5NBX" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
       </node>
       <node concept="3clFb_" id="YbzkzL3b6d" role="jymVt">
         <property role="TrG5h" value="start" />
@@ -520,35 +555,6 @@
           <ref role="3uigEE" to="w7la:~EvaluationResult" resolve="EvaluationResult" />
         </node>
         <node concept="3clFbS" id="YbzkzL3b6h" role="3clF47">
-          <node concept="3clFbF" id="YbzkzL3dXd" role="3cqZAp">
-            <node concept="1rXfSq" id="YbzkzL3dXc" role="3clFbG">
-              <ref role="37wK5l" node="2UGjFq4L4SC" resolve="start" />
-              <node concept="2ShNRf" id="YbzkzL3e$d" role="37wK5m">
-                <node concept="1pGfFk" id="YbzkzL3e$e" role="2ShVmc">
-                  <ref role="37wK5l" to="w7la:~SessionSolver.&lt;init&gt;()" resolve="SessionSolver" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="YbzkzL3b6i" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="2UGjFq4L4SC" role="jymVt">
-        <property role="TrG5h" value="start" />
-        <property role="1EzhhJ" value="false" />
-        <node concept="37vLTG" id="2UGjFq4L4SD" role="3clF46">
-          <property role="TrG5h" value="sessionSolver" />
-          <node concept="3uibUv" id="2UGjFq4L4SE" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="da2PmlMQg_" role="3clF45">
-          <ref role="3uigEE" to="w7la:~EvaluationResult" resolve="EvaluationResult" />
-        </node>
-        <node concept="3Tm1VV" id="2UGjFq4L4SG" role="1B3o_S" />
-        <node concept="3clFbS" id="2UGjFq4L4SI" role="3clF47">
           <node concept="3clFbF" id="5jPBdK_p5i" role="3cqZAp">
             <node concept="37vLTI" id="5jPBdK_p7U" role="3clFbG">
               <node concept="37vLTw" id="5jPBdK_p5h" role="37vLTJ">
@@ -557,9 +563,6 @@
               <node concept="2ShNRf" id="5jPBdK_pxU" role="37vLTx">
                 <node concept="1pGfFk" id="5jPBdK_qS9" role="2ShVmc">
                   <ref role="37wK5l" node="5jPBdK_qM0" resolve="TestingEvaluationSession" />
-                  <node concept="37vLTw" id="YbzkzL3fWc" role="37wK5m">
-                    <ref role="3cqZAo" node="2UGjFq4L4SD" resolve="sessionSolver" />
-                  </node>
                 </node>
               </node>
             </node>
@@ -568,6 +571,9 @@
             <node concept="10Nm6u" id="da2PmlMQij" role="3clFbG" />
           </node>
         </node>
+        <node concept="2AHcQZ" id="YbzkzL3b6i" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
       </node>
       <node concept="312cEg" id="5jPBdK_qdB" role="jymVt">
         <property role="TrG5h" value="predicateSymbols" />
@@ -651,13 +657,6 @@
     <node concept="3uibUv" id="5jPBdK_dJd" role="1zkMxy">
       <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
     </node>
-    <node concept="312cEg" id="5jPBdK_qYD" role="jymVt">
-      <property role="TrG5h" value="sessionSolver" />
-      <node concept="3Tm6S6" id="5jPBdK_qYE" role="1B3o_S" />
-      <node concept="3uibUv" id="5jPBdK_qYG" role="1tU5fm">
-        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="6yEjedm5WkE">
     <property role="2bfB8j" value="false" />
diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
index 6d49abd9..a6eb6f8a 100644
--- a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
+++ b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
@@ -189,62 +189,6 @@
   <node concept="312cEu" id="oI9YrIZTG">
     <property role="TrG5h" value="ReportingFrom" />
     <node concept="2tJIrI" id="oI9YrIZUi" role="jymVt" />
-    <node concept="2YIFZL" id="oI9YrIZUA" role="jymVt">
-      <property role="TrG5h" value="solver" />
-      <node concept="37vLTG" id="oI9YrIZVw" role="3clF46">
-        <property role="TrG5h" value="sessionSolver" />
-        <node concept="3uibUv" id="oI9YrIZWj" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="oI9YrIZV1" role="3clF45">
-        <ref role="3uigEE" node="oI9YrIZeS" resolve="Reporting" />
-      </node>
-      <node concept="3Tm1VV" id="oI9YrIZUD" role="1B3o_S" />
-      <node concept="3clFbS" id="oI9YrIZUE" role="3clF47">
-        <node concept="3SKdUt" id="oI9YrJ1AH" role="3cqZAp">
-          <node concept="3SKdUq" id="oI9YrJ1AJ" role="3SKWNk">
-            <property role="3SKdUp" value="TODO: pluggable components" />
-          </node>
-        </node>
-        <node concept="3clFbJ" id="oI9YrIZWS" role="3cqZAp">
-          <node concept="2ZW3vV" id="oI9YrJ0$6" role="3clFbw">
-            <node concept="3uibUv" id="oI9YrJ1rT" role="2ZW6by">
-              <ref role="3uigEE" node="oI9YrIZeS" resolve="Reporting" />
-            </node>
-            <node concept="37vLTw" id="oI9YrIZX$" role="2ZW6bz">
-              <ref role="3cqZAo" node="oI9YrIZVw" resolve="sessionSolver" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="oI9YrIZWU" role="3clFbx">
-            <node concept="3cpWs6" id="oI9YrJ0ER" role="3cqZAp">
-              <node concept="1eOMI4" id="oI9YrJ0FP" role="3cqZAk">
-                <node concept="10QFUN" id="oI9YrJ0FM" role="1eOMHV">
-                  <node concept="3uibUv" id="oI9YrJ1tE" role="10QFUM">
-                    <ref role="3uigEE" node="oI9YrIZeS" resolve="Reporting" />
-                  </node>
-                  <node concept="37vLTw" id="oI9YrJ0FS" role="10QFUP">
-                    <ref role="3cqZAo" node="oI9YrIZVw" resolve="sessionSolver" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="oI9YrJ0HG" role="3cqZAp" />
-        <node concept="YS8fn" id="oI9YrJ0LG" role="3cqZAp">
-          <node concept="2ShNRf" id="oI9YrJ0NY" role="YScLw">
-            <node concept="1pGfFk" id="oI9YrJ0WL" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-              <node concept="Xl_RD" id="oI9YrJ0X1" role="37wK5m">
-                <property role="Xl_RC" value="reporting not available" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="oI9YrJ1mF" role="jymVt" />
     <node concept="2YIFZL" id="oI9YrJ1oq" role="jymVt">
       <property role="TrG5h" value="application" />
       <node concept="37vLTG" id="oI9YrJ1qv" role="3clF46">
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index 75cbd149..361a6935 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -42,6 +42,7 @@
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="z9ve" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core.internal(jetbrains.mps.logic.reactor/)" />
+    <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -1044,6 +1045,118 @@
                 </node>
               </node>
               <node concept="3clFbH" id="oI9Yrxmcl" role="3cqZAp" />
+              <node concept="3cpWs8" id="3GEs5q_3o$J" role="3cqZAp">
+                <node concept="3cpWsn" id="3GEs5q_3o$K" role="3cpWs9">
+                  <property role="TrG5h" value="reporting" />
+                  <node concept="3uibUv" id="3GEs5q_3o$I" role="1tU5fm">
+                    <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                  </node>
+                  <node concept="2ShNRf" id="3GEs5q_3o$L" role="33vP2m">
+                    <node concept="YeOm9" id="3GEs5q_3o$M" role="2ShVmc">
+                      <node concept="1Y3b0j" id="3GEs5q_3o$N" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <ref role="1Y3XeK" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                        <node concept="3Tm1VV" id="3GEs5q_3o$O" role="1B3o_S" />
+                        <node concept="3clFb_" id="3GEs5q_3o$P" role="jymVt">
+                          <property role="TrG5h" value="assignType" />
+                          <property role="1EzhhJ" value="false" />
+                          <node concept="37vLTG" id="3GEs5q_3o$Q" role="3clF46">
+                            <property role="TrG5h" value="target" />
+                            <node concept="3Tqbb2" id="3GEs5q_3o$R" role="1tU5fm" />
+                          </node>
+                          <node concept="37vLTG" id="3GEs5q_3o$S" role="3clF46">
+                            <property role="TrG5h" value="type" />
+                            <node concept="3Tqbb2" id="3GEs5q_3o$T" role="1tU5fm" />
+                          </node>
+                          <node concept="10P_77" id="3GEs5q_3o$U" role="3clF45" />
+                          <node concept="3Tm1VV" id="3GEs5q_3o$V" role="1B3o_S" />
+                          <node concept="3clFbS" id="3GEs5q_3o$W" role="3clF47">
+                            <node concept="3clFbF" id="3GEs5q_3o$X" role="3cqZAp">
+                              <node concept="37vLTI" id="3GEs5q_3o$Y" role="3clFbG">
+                                <node concept="37vLTw" id="3GEs5q_3o$Z" role="37vLTx">
+                                  <ref role="3cqZAo" node="3GEs5q_3o$S" resolve="type" />
+                                </node>
+                                <node concept="3EllGN" id="3GEs5q_3o_0" role="37vLTJ">
+                                  <node concept="2OqwBi" id="3GEs5q_3o_1" role="3ElVtu">
+                                    <node concept="2JrnkZ" id="3GEs5q_3o_2" role="2Oq$k0">
+                                      <node concept="37vLTw" id="3GEs5q_3o_3" role="2JrQYb">
+                                        <ref role="3cqZAo" node="3GEs5q_3o$Q" resolve="target" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="3GEs5q_3o_4" role="2OqNvi">
+                                      <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                    </node>
+                                  </node>
+                                  <node concept="37vLTw" id="3GEs5q_3o_5" role="3ElQJh">
+                                    <ref role="3cqZAo" node="oI9YrxmUa" resolve="types" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbF" id="3GEs5q_3o_6" role="3cqZAp">
+                              <node concept="3clFbT" id="3GEs5q_3o_7" role="3clFbG">
+                                <property role="3clFbU" value="true" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="3GEs5q_3o_8" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                          </node>
+                        </node>
+                        <node concept="2tJIrI" id="3GEs5q_3o_9" role="jymVt" />
+                        <node concept="3clFb_" id="3GEs5q_3o_a" role="jymVt">
+                          <property role="1EzhhJ" value="false" />
+                          <property role="TrG5h" value="contextRepository" />
+                          <node concept="3uibUv" id="3GEs5q_3o_b" role="3clF45">
+                            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                          </node>
+                          <node concept="3Tm1VV" id="3GEs5q_3o_c" role="1B3o_S" />
+                          <node concept="3clFbS" id="3GEs5q_3o_d" role="3clF47">
+                            <node concept="3clFbF" id="3GEs5q_3o_e" role="3cqZAp">
+                              <node concept="37vLTw" id="3GEs5q_3o_f" role="3clFbG">
+                                <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="3GEs5q_3o_g" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                          </node>
+                        </node>
+                        <node concept="3clFb_" id="3GEs5q_3o_h" role="jymVt">
+                          <property role="1EzhhJ" value="false" />
+                          <property role="TrG5h" value="report" />
+                          <node concept="37vLTG" id="3GEs5q_3o_i" role="3clF46">
+                            <property role="TrG5h" value="kind" />
+                            <node concept="3uibUv" id="3GEs5q_3o_j" role="1tU5fm">
+                              <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                            </node>
+                          </node>
+                          <node concept="37vLTG" id="3GEs5q_3o_k" role="3clF46">
+                            <property role="TrG5h" value="target" />
+                            <node concept="2sp9CU" id="3GEs5q_3o_l" role="1tU5fm" />
+                          </node>
+                          <node concept="37vLTG" id="3GEs5q_3o_m" role="3clF46">
+                            <property role="TrG5h" value="text" />
+                            <node concept="17QB3L" id="3GEs5q_3o_n" role="1tU5fm" />
+                          </node>
+                          <node concept="10P_77" id="3GEs5q_3o_o" role="3clF45" />
+                          <node concept="3Tm1VV" id="3GEs5q_3o_p" role="1B3o_S" />
+                          <node concept="3clFbS" id="3GEs5q_3o_q" role="3clF47">
+                            <node concept="3clFbF" id="3GEs5q_3o_r" role="3cqZAp">
+                              <node concept="3clFbT" id="3GEs5q_3o_s" role="3clFbG" />
+                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="3GEs5q_3o_t" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="3GEs5q_3sbK" role="3cqZAp" />
               <node concept="3cpWs8" id="6QH_LDtbV5P" role="3cqZAp">
                 <node concept="3cpWsn" id="6QH_LDtbV5Q" role="3cpWs9">
                   <property role="TrG5h" value="evaluator" />
@@ -1053,108 +1166,8 @@
                   <node concept="2ShNRf" id="6QH_LDtbV5S" role="33vP2m">
                     <node concept="1pGfFk" id="6QH_LDtbV5T" role="2ShVmc">
                       <ref role="37wK5l" to="hano:HV6urVFjOl" resolve="ProgramEvaluator" />
-                      <node concept="2ShNRf" id="6QH_LDtbV5U" role="37wK5m">
-                        <node concept="YeOm9" id="oI9Yrxd3H" role="2ShVmc">
-                          <node concept="1Y3b0j" id="oI9Yrxd3K" role="YeSDq">
-                            <property role="2bfB8j" value="true" />
-                            <ref role="1Y3XeK" to="tj24:7lt0LtQ_OIS" resolve="TypecheckingSessionSolver" />
-                            <ref role="37wK5l" to="tj24:oI9Yrbvrt" resolve="TypecheckingSessionSolver" />
-                            <node concept="3Tm1VV" id="oI9Yrxd3L" role="1B3o_S" />
-                            <node concept="3clFb_" id="oI9YrxdGV" role="jymVt">
-                              <property role="TrG5h" value="assignType" />
-                              <property role="1EzhhJ" value="false" />
-                              <node concept="37vLTG" id="oI9YrxdGW" role="3clF46">
-                                <property role="TrG5h" value="target" />
-                                <node concept="3Tqbb2" id="oI9YrxdGX" role="1tU5fm" />
-                              </node>
-                              <node concept="37vLTG" id="oI9YrxdGY" role="3clF46">
-                                <property role="TrG5h" value="type" />
-                                <node concept="3Tqbb2" id="oI9YrxdGZ" role="1tU5fm" />
-                              </node>
-                              <node concept="10P_77" id="oI9YrxdH0" role="3clF45" />
-                              <node concept="3Tm1VV" id="oI9YrxdH1" role="1B3o_S" />
-                              <node concept="3clFbS" id="oI9YrxdH6" role="3clF47">
-                                <node concept="3clFbF" id="oI9YrxpWz" role="3cqZAp">
-                                  <node concept="37vLTI" id="oI9Yrxtbz" role="3clFbG">
-                                    <node concept="37vLTw" id="oI9Yrxtek" role="37vLTx">
-                                      <ref role="3cqZAo" node="oI9YrxdGY" resolve="type" />
-                                    </node>
-                                    <node concept="3EllGN" id="oI9Yrxqsn" role="37vLTJ">
-                                      <node concept="2OqwBi" id="oI9YrxrVf" role="3ElVtu">
-                                        <node concept="2JrnkZ" id="oI9YrxrKZ" role="2Oq$k0">
-                                          <node concept="37vLTw" id="oI9YrxroB" role="2JrQYb">
-                                            <ref role="3cqZAo" node="oI9YrxdGW" resolve="target" />
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="oI9Yrxt0v" role="2OqNvi">
-                                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="oI9YrxpWx" role="3ElQJh">
-                                        <ref role="3cqZAo" node="oI9YrxmUa" resolve="types" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbF" id="oI9Yrxesq" role="3cqZAp">
-                                  <node concept="3clFbT" id="oI9Yrxesp" role="3clFbG">
-                                    <property role="3clFbU" value="true" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="2AHcQZ" id="oI9YrxdH7" role="2AJF6D">
-                                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                              </node>
-                            </node>
-                            <node concept="2tJIrI" id="72RDgIN3Ptd" role="jymVt" />
-                            <node concept="3clFb_" id="72RDgIN3POE" role="jymVt">
-                              <property role="1EzhhJ" value="false" />
-                              <property role="TrG5h" value="contextRepository" />
-                              <node concept="3uibUv" id="72RDgIN3POF" role="3clF45">
-                                <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-                              </node>
-                              <node concept="3Tm1VV" id="72RDgIN3POG" role="1B3o_S" />
-                              <node concept="3clFbS" id="72RDgIN3POM" role="3clF47">
-                                <node concept="3clFbF" id="72RDgIN3Ti5" role="3cqZAp">
-                                  <node concept="37vLTw" id="72RDgIN3Ti4" role="3clFbG">
-                                    <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="2AHcQZ" id="72RDgIN3PON" role="2AJF6D">
-                                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                              </node>
-                            </node>
-                            <node concept="3clFb_" id="1FOQehvP35a" role="jymVt">
-                              <property role="1EzhhJ" value="false" />
-                              <property role="TrG5h" value="report" />
-                              <node concept="37vLTG" id="1FOQehvP35d" role="3clF46">
-                                <property role="TrG5h" value="kind" />
-                                <node concept="3uibUv" id="1FOQehwpwXb" role="1tU5fm">
-                                  <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                                </node>
-                              </node>
-                              <node concept="37vLTG" id="1FOQehvP35b" role="3clF46">
-                                <property role="TrG5h" value="target" />
-                                <node concept="2sp9CU" id="1FOQehwMiYP" role="1tU5fm" />
-                              </node>
-                              <node concept="37vLTG" id="1FOQehvP35f" role="3clF46">
-                                <property role="TrG5h" value="text" />
-                                <node concept="17QB3L" id="1FOQehvP35g" role="1tU5fm" />
-                              </node>
-                              <node concept="10P_77" id="1FOQehvP35h" role="3clF45" />
-                              <node concept="3Tm1VV" id="1FOQehvP35i" role="1B3o_S" />
-                              <node concept="3clFbS" id="1FOQehvP35o" role="3clF47">
-                                <node concept="3clFbF" id="1FOQehvP35r" role="3cqZAp">
-                                  <node concept="3clFbT" id="1FOQehvP35q" role="3clFbG" />
-                                </node>
-                              </node>
-                              <node concept="2AHcQZ" id="1FOQehvP35p" role="2AJF6D">
-                                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
+                      <node concept="37vLTw" id="3GEs5q_3o_u" role="37wK5m">
+                        <ref role="3cqZAo" node="3GEs5q_3o$K" resolve="reporting" />
                       </node>
                     </node>
                   </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
index 9a245424..dbc34b66 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -137,7 +137,6 @@
       </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
@@ -2628,11 +2627,11 @@
     </node>
     <node concept="2tJIrI" id="78H58of4wGy" role="jymVt" />
     <node concept="3clFb_" id="NKt6yn82MX" role="jymVt">
-      <property role="TrG5h" value="createSessionSolver" />
+      <property role="TrG5h" value="createReporting" />
       <property role="1EzhhJ" value="false" />
       <property role="DiZV1" value="true" />
-      <node concept="3uibUv" id="NKt6yn82MY" role="3clF45">
-        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
+      <node concept="3uibUv" id="3GEs5q_2V0K" role="3clF45">
+        <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
       </node>
       <node concept="3Tmbuc" id="NKt6yn82MZ" role="1B3o_S" />
       <node concept="3clFbS" id="NKt6yn82NT" role="3clF47">
@@ -2641,8 +2640,8 @@
             <node concept="YeOm9" id="oI9YrbAuF" role="2ShVmc">
               <node concept="1Y3b0j" id="oI9YrbAuI" role="YeSDq">
                 <property role="2bfB8j" value="true" />
-                <ref role="1Y3XeK" node="7lt0LtQ_OIS" resolve="TypecheckingSessionSolver" />
-                <ref role="37wK5l" node="oI9Yrbvrt" resolve="TypecheckingSessionSolver" />
+                <ref role="1Y3XeK" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <node concept="3Tm1VV" id="oI9YrbAuJ" role="1B3o_S" />
                 <node concept="3clFb_" id="oI9YrbA_u" role="jymVt">
                   <property role="TrG5h" value="assignType" />
@@ -5045,51 +5044,5 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="7lt0LtQ_OIS">
-    <property role="TrG5h" value="TypecheckingSessionSolver" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="oI9Yrbvo_" role="jymVt" />
-    <node concept="3clFbW" id="oI9Yrbvrt" role="jymVt">
-      <node concept="3cqZAl" id="oI9Yrbvrv" role="3clF45" />
-      <node concept="3Tm1VV" id="oI9Yrbvrw" role="1B3o_S" />
-      <node concept="3clFbS" id="oI9Yrbvrx" role="3clF47">
-        <node concept="XkiVB" id="oI9Yrbvx2" role="3cqZAp">
-          <ref role="37wK5l" to="w7la:~SessionSolver.&lt;init&gt;()" resolve="SessionSolver" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7lt0LtQ_OLY" role="jymVt" />
-    <node concept="3clFb_" id="7lt0LtQ_SZU" role="jymVt">
-      <property role="TrG5h" value="assignType" />
-      <node concept="37vLTG" id="7lt0LtQ_T0C" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="7lt0LtQ_T26" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7lt0LtQ_T29" role="3clF46">
-        <property role="TrG5h" value="nodeType" />
-        <node concept="3Tqbb2" id="7lt0LtQ_T3R" role="1tU5fm" />
-      </node>
-      <node concept="10P_77" id="oI9YrbUH2" role="3clF45" />
-      <node concept="3Tm1VV" id="7lt0LtQ_SZX" role="1B3o_S" />
-      <node concept="3clFbS" id="7lt0LtQ_SZY" role="3clF47">
-        <node concept="3clFbF" id="oI9YrbVyx" role="3cqZAp">
-          <node concept="3clFbT" id="oI9YrbVyw" role="3clFbG">
-            <property role="3clFbU" value="false" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="oI9YrIZQO" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7lt0LtQ_OM3" role="jymVt" />
-    <node concept="3Tm1VV" id="7lt0LtQ_OIT" role="1B3o_S" />
-    <node concept="3uibUv" id="4jcOV4h9TLE" role="1zkMxy">
-      <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-    </node>
-    <node concept="3uibUv" id="oI9YrIZn4" role="EKbjA">
-      <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
-    </node>
-  </node>
 </model>
 
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 845e45ff..38904ed2 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -283,6 +283,9 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
@@ -6774,19 +6777,6 @@
                 <node concept="3I6s7M" id="6EY0p2x_g$4" role="3I6sU7">
                   <node concept="3wWvb2" id="6EY0p2x_g$5" role="3I6s78">
                     <node concept="2OqwBi" id="6EY0p2x_g$6" role="3wWo3s">
-                      <node concept="2YIFZM" id="6EY0p2x_g$7" role="2Oq$k0">
-                        <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                        <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
-                        <node concept="2OqwBi" id="6EY0p2x_g$8" role="37wK5m">
-                          <node concept="2YIFZM" id="6EY0p2x_g$9" role="2Oq$k0">
-                            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                            <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
-                          </node>
-                          <node concept="liA8E" id="6EY0p2x_g$a" role="2OqNvi">
-                            <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
-                          </node>
-                        </node>
-                      </node>
                       <node concept="liA8E" id="6EY0p2x_g$b" role="2OqNvi">
                         <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
                         <node concept="Rm8GO" id="6EY0p2x_g$c" role="37wK5m">
@@ -6808,6 +6798,25 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="2OqwBi" id="oI9YrWf2v" role="2Oq$k0">
+                        <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
+                          <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                          <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
+                        </node>
+                        <node concept="liA8E" id="3GEs5q_4fTI" role="2OqNvi">
+                          <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
+                          <node concept="2YIFZM" id="3GEs5q_4fTJ" role="37wK5m">
+                            <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+                            <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
+                            <node concept="Xl_RD" id="3GEs5q_4fTK" role="37wK5m">
+                              <property role="Xl_RC" value="reporting" />
+                            </node>
+                            <node concept="3VsKOn" id="3GEs5q_4fTL" role="37wK5m">
+                              <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -10066,19 +10075,6 @@
                 <node concept="3I6s7M" id="3MG3BxoG1ob" role="3I6sU7">
                   <node concept="3wWvb2" id="3MG3BxoG1oa" role="3I6s78">
                     <node concept="2OqwBi" id="3MG3BxoG52$" role="3wWo3s">
-                      <node concept="2YIFZM" id="3MG3BxoG4Ea" role="2Oq$k0">
-                        <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
-                        <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                        <node concept="2OqwBi" id="3MG3BxoG4Ri" role="37wK5m">
-                          <node concept="2YIFZM" id="3MG3BxoG4Ep" role="2Oq$k0">
-                            <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
-                            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                          </node>
-                          <node concept="liA8E" id="3MG3BxoG4WL" role="2OqNvi">
-                            <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
-                          </node>
-                        </node>
-                      </node>
                       <node concept="liA8E" id="3MG3BxoG59l" role="2OqNvi">
                         <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
                         <node concept="Rm8GO" id="3MG3BxoG5d6" role="37wK5m">
@@ -10100,6 +10096,25 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="2OqwBi" id="3GEs5q_4KZ0" role="2Oq$k0">
+                        <node concept="2YIFZM" id="3GEs5q_4KZ1" role="2Oq$k0">
+                          <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                          <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
+                        </node>
+                        <node concept="liA8E" id="3GEs5q_4KZ2" role="2OqNvi">
+                          <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
+                          <node concept="2YIFZM" id="3GEs5q_4KZ3" role="37wK5m">
+                            <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+                            <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
+                            <node concept="Xl_RD" id="3GEs5q_4KZ4" role="37wK5m">
+                              <property role="Xl_RC" value="reporting" />
+                            </node>
+                            <node concept="3VsKOn" id="3GEs5q_4KZ5" role="37wK5m">
+                              <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -27516,19 +27531,6 @@
                       <node concept="3Aqczg" id="7XRk2O3zftP" role="3cqZAp">
                         <node concept="3wWvb2" id="7XRk2O3zftR" role="3Aqpz8">
                           <node concept="2OqwBi" id="7XRk2O3zft3" role="3wWo3s">
-                            <node concept="2YIFZM" id="7XRk2O3zft5" role="2Oq$k0">
-                              <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                              <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
-                              <node concept="2OqwBi" id="7XRk2O3zft7" role="37wK5m">
-                                <node concept="2YIFZM" id="7XRk2O3zft9" role="2Oq$k0">
-                                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
-                                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                                </node>
-                                <node concept="liA8E" id="7XRk2O3zftb" role="2OqNvi">
-                                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
-                                </node>
-                              </node>
-                            </node>
                             <node concept="liA8E" id="7XRk2O3zftd" role="2OqNvi">
                               <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
                               <node concept="Rm8GO" id="7XRk2O3zftf" role="37wK5m">
@@ -27542,6 +27544,25 @@
                                 <property role="Xl_RC" value="mismatched type arguments number" />
                               </node>
                             </node>
+                            <node concept="2OqwBi" id="3GEs5q_4NcH" role="2Oq$k0">
+                              <node concept="2YIFZM" id="3GEs5q_4NcI" role="2Oq$k0">
+                                <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                                <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
+                              </node>
+                              <node concept="liA8E" id="3GEs5q_4NcJ" role="2OqNvi">
+                                <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
+                                <node concept="2YIFZM" id="3GEs5q_4NcK" role="37wK5m">
+                                  <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
+                                  <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
+                                  <node concept="Xl_RD" id="3GEs5q_4NcL" role="37wK5m">
+                                    <property role="Xl_RC" value="reporting" />
+                                  </node>
+                                  <node concept="3VsKOn" id="3GEs5q_4NcM" role="37wK5m">
+                                    <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>