diff --git a/typechecking/solutions/jetbrains.mps.typechecking.reporting/models/jetbrains.mps.lang.typesystem2.reporting.mps b/typechecking/solutions/jetbrains.mps.typechecking.reporting/models/jetbrains.mps.lang.typesystem2.reporting.mps
index b8016e5e..94d46fd2 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.reporting/models/jetbrains.mps.lang.typesystem2.reporting.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.reporting/models/jetbrains.mps.lang.typesystem2.reporting.mps
@@ -40,6 +40,7 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -115,6 +116,28 @@
       <node concept="3Tm1VV" id="oI9YrIZnX" role="1B3o_S" />
       <node concept="3clFbS" id="oI9YrIZnY" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="oI9Ys2yoC" role="jymVt" />
+    <node concept="3clFb_" id="oI9Ys2ypk" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="report" />
+      <node concept="37vLTG" id="oI9Ys2yue" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="oI9Ys2yvH" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="oI9Ys2y$v" role="3clF46">
+        <property role="TrG5h" value="kind" />
+        <node concept="3uibUv" id="oI9Ys2yAc" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="oI9Ys2yxf" role="3clF46">
+        <property role="TrG5h" value="text" />
+        <node concept="17QB3L" id="oI9Ys2yyP" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="oI9Ys2yr2" role="3clF45" />
+      <node concept="3Tm1VV" id="oI9Ys2ypn" role="1B3o_S" />
+      <node concept="3clFbS" id="oI9Ys2ypo" role="3clF47" />
+    </node>
     <node concept="2tJIrI" id="oI9YrIZfj" role="jymVt" />
     <node concept="3Tm1VV" id="oI9YrIZeT" role="1B3o_S" />
   </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
index 1a3e4b8e..4aa1788d 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -3770,6 +3770,79 @@
                     <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
+                <node concept="2tJIrI" id="oI9YsbqmV" role="jymVt" />
+                <node concept="3clFb_" id="oI9YsbqwE" role="jymVt">
+                  <property role="1EzhhJ" value="false" />
+                  <property role="TrG5h" value="report" />
+                  <node concept="37vLTG" id="oI9YsbqwF" role="3clF46">
+                    <property role="TrG5h" value="target" />
+                    <node concept="3Tqbb2" id="oI9YsbqwG" role="1tU5fm" />
+                  </node>
+                  <node concept="37vLTG" id="oI9YsbqwH" role="3clF46">
+                    <property role="TrG5h" value="kind" />
+                    <node concept="3uibUv" id="oI9YsbqwI" role="1tU5fm">
+                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="oI9YsbqwJ" role="3clF46">
+                    <property role="TrG5h" value="text" />
+                    <node concept="17QB3L" id="oI9YsbqwK" role="1tU5fm" />
+                  </node>
+                  <node concept="10P_77" id="oI9YsbqwL" role="3clF45" />
+                  <node concept="3Tm1VV" id="oI9YsbqwM" role="1B3o_S" />
+                  <node concept="2AHcQZ" id="oI9YsbqwQ" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                  <node concept="3clFbS" id="oI9YsbqwS" role="3clF47">
+                    <node concept="3clFbJ" id="oI9Ysbre7" role="3cqZAp">
+                      <node concept="2OqwBi" id="oI9YsbrVU" role="3clFbw">
+                        <node concept="Xl_RD" id="oI9Ysbruj" role="2Oq$k0">
+                          <property role="Xl_RC" value="error" />
+                        </node>
+                        <node concept="liA8E" id="oI9Ysbsor" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                          <node concept="37vLTw" id="oI9YsbsD8" role="37wK5m">
+                            <ref role="3cqZAo" node="oI9YsbqwH" resolve="kind" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="oI9Ysbre9" role="3clFbx">
+                        <node concept="3clFbF" id="oI9Ysbt3k" role="3cqZAp">
+                          <node concept="37vLTI" id="oI9YsbvTv" role="3clFbG">
+                            <node concept="37vLTw" id="oI9YsbwpJ" role="37vLTx">
+                              <ref role="3cqZAo" node="oI9YsbqwJ" resolve="text" />
+                            </node>
+                            <node concept="3EllGN" id="oI9YsbtHt" role="37vLTJ">
+                              <node concept="2OqwBi" id="oI9YsbuMb" role="3ElVtu">
+                                <node concept="2JrnkZ" id="oI9YsbuyC" role="2Oq$k0">
+                                  <node concept="37vLTw" id="oI9Ysbu8v" role="2JrQYb">
+                                    <ref role="3cqZAo" node="oI9YsbqwF" resolve="target" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="oI9Ysbv9O" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="oI9Ysbt3j" role="3ElQJh">
+                                <ref role="3cqZAo" node="7lt0LtQ_XxI" resolve="errors" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3cpWs6" id="oI9YsbwWO" role="3cqZAp">
+                          <node concept="3clFbT" id="oI9Ysbxg1" role="3cqZAk">
+                            <property role="3clFbU" value="true" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs6" id="oI9Ysby3S" role="3cqZAp">
+                      <node concept="3clFbT" id="oI9Ysbyzu" role="3cqZAk">
+                        <property role="3clFbU" value="false" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index d34690f0..106ff0c7 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -20772,7 +20772,6 @@
               <node concept="3clFbF" id="oI9YrWgo$" role="3cqZAp">
                 <node concept="2OqwBi" id="oI9YrWhEN" role="3clFbG">
                   <node concept="2OqwBi" id="oI9YrWgB7" role="2Oq$k0">
-                    <node concept="30H73N" id="oI9YrWgoz" role="2Oq$k0" />
                     <node concept="2Xjw5R" id="oI9YrWh21" role="2OqNvi">
                       <node concept="3gmYPX" id="oI9YrWhba" role="1xVPHs">
                         <node concept="3gn64h" id="oI9YrWhnj" role="3gmYPZ">
@@ -20780,6 +20779,12 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="2OqwBi" id="oI9Ys7DNw" role="2Oq$k0">
+                      <node concept="1iwH7S" id="oI9Ys7DNx" role="2Oq$k0" />
+                      <node concept="12$id9" id="oI9Ys7DNy" role="2OqNvi">
+                        <node concept="30H73N" id="oI9Ys7DNz" role="12$y8L" />
+                      </node>
+                    </node>
                   </node>
                   <node concept="3x8VRR" id="oI9YrWi3M" role="2OqNvi" />
                 </node>
@@ -21000,6 +21005,286 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="oI9Ys2xi_" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="14YyZ8" id="oI9Ys2xiA" role="1lVwrX">
+        <node concept="14ZrTv" id="oI9Ys2xiB" role="14ZwWg">
+          <node concept="30G5F_" id="oI9Ys2xiC" role="150hEN">
+            <node concept="3clFbS" id="oI9Ys2xiD" role="2VODD2">
+              <node concept="3clFbF" id="oI9Ys2xiE" role="3cqZAp">
+                <node concept="2OqwBi" id="oI9Ys2xiF" role="3clFbG">
+                  <node concept="2OqwBi" id="oI9Ys2xiG" role="2Oq$k0">
+                    <node concept="2Xjw5R" id="oI9Ys2xiI" role="2OqNvi">
+                      <node concept="3gmYPX" id="oI9Ys2xiJ" role="1xVPHs">
+                        <node concept="3gn64h" id="oI9Ys2xiK" role="3gmYPZ">
+                          <ref role="3gnhBz" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="oI9Ys7D7Z" role="2Oq$k0">
+                      <node concept="1iwH7S" id="oI9Ys7CS8" role="2Oq$k0" />
+                      <node concept="12$id9" id="oI9Ys7DpK" role="2OqNvi">
+                        <node concept="30H73N" id="oI9Ys7Dzd" role="12$y8L" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="oI9Ys2xiL" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Koe21" id="oI9Ys2xiM" role="150oIE">
+            <node concept="3clFb_" id="oI9Ys2xiN" role="1Koe22">
+              <property role="TrG5h" value="context" />
+              <node concept="3Tm6S6" id="oI9Ys2xiO" role="1B3o_S" />
+              <node concept="3cqZAl" id="oI9Ys2xiP" role="3clF45" />
+              <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="10Nm6u" id="oI9Ys2xiY" role="37wK5m">
+                        <node concept="29HgVG" id="oI9Ys2xiZ" role="lGtFl">
+                          <node concept="3NFfHV" id="oI9Ys2xj0" role="3NFExx">
+                            <node concept="3clFbS" id="oI9Ys2xj1" role="2VODD2">
+                              <node concept="3clFbF" id="oI9Ys2xj2" role="3cqZAp">
+                                <node concept="2OqwBi" id="oI9Ys2xj6" role="3clFbG">
+                                  <node concept="30H73N" id="oI9Ys2xj7" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="oI9Ys2xj8" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="oI9Ys2Cw5" role="37wK5m">
+                        <property role="Xl_RC" value="" />
+                        <node concept="17Uvod" id="oI9Ys2CHr" role="lGtFl">
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <property role="2qtEX9" value="value" />
+                          <node concept="3zFVjK" id="oI9Ys2CHs" role="3zH0cK">
+                            <node concept="3clFbS" id="oI9Ys2CHt" role="2VODD2">
+                              <node concept="3clFbF" id="oI9Ys2CRv" role="3cqZAp">
+                                <node concept="2OqwBi" id="oI9Ys2Biv" role="3clFbG">
+                                  <node concept="1PxgMI" id="oI9Ys2AX7" role="2Oq$k0">
+                                    <property role="1BlNFB" value="true" />
+                                    <node concept="chp4Y" id="oI9Ys2B3k" role="3oSUPX">
+                                      <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
+                                    </node>
+                                    <node concept="2OqwBi" id="oI9Ys2_2a" role="1m5AlR">
+                                      <node concept="30H73N" id="oI9Ys2$QF" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="oI9Ys2An6" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3TrcHB" id="oI9Ys2B$c" role="2OqNvi">
+                                    <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="10Nm6u" id="oI9Ys2xja" role="37wK5m">
+                        <node concept="29HgVG" id="oI9Ys2xjb" role="lGtFl">
+                          <node concept="3NFfHV" id="oI9Ys2xjc" role="3NFExx">
+                            <node concept="3clFbS" id="oI9Ys2xjd" role="2VODD2">
+                              <node concept="3clFbF" id="oI9Ys2xje" role="3cqZAp">
+                                <node concept="2OqwBi" id="oI9Ys2xjf" role="3clFbG">
+                                  <node concept="1PxgMI" id="oI9Ys2xjg" role="2Oq$k0">
+                                    <node concept="chp4Y" id="oI9Ys2Dme" role="3oSUPX">
+                                      <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
+                                    </node>
+                                    <node concept="2OqwBi" id="oI9Ys2xji" role="1m5AlR">
+                                      <node concept="30H73N" id="oI9Ys2xjj" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="oI9Ys2xjk" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="oI9Ys2DJH" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:oI9Ys1lF8" resolve="text" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="raruj" id="oI9Ys2xjm" role="lGtFl" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Koe21" id="oI9Ys2xjn" role="14YRTM">
+          <node concept="3clFb_" id="oI9Ys2xjo" role="1Koe22">
+            <property role="TrG5h" value="context" />
+            <node concept="37vLTG" id="oI9Ys2xjp" role="3clF46">
+              <property role="TrG5h" value="session" />
+              <node concept="3uibUv" id="oI9Ys2xjq" role="1tU5fm">
+                <ref role="3uigEE" to="psr6:18kNIl1vDPZ" resolve="AbstractMacroProcessing" />
+              </node>
+            </node>
+            <node concept="3Tm6S6" id="oI9Ys2xjr" role="1B3o_S" />
+            <node concept="3cqZAl" id="oI9Ys2xjs" role="3clF45" />
+            <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" />
+                    <node concept="10Nm6u" id="oI9Ys2EaN" role="37wK5m">
+                      <node concept="29HgVG" id="oI9Ys2EaO" role="lGtFl">
+                        <node concept="3NFfHV" id="oI9Ys2EaP" role="3NFExx">
+                          <node concept="3clFbS" id="oI9Ys2EaQ" role="2VODD2">
+                            <node concept="3clFbF" id="oI9Ys2EaR" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9Ys2EaS" role="3clFbG">
+                                <node concept="30H73N" id="oI9Ys2EaT" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="oI9Ys2EaU" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Xl_RD" id="oI9Ys2EaV" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                      <node concept="17Uvod" id="oI9Ys2EaW" role="lGtFl">
+                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                        <property role="2qtEX9" value="value" />
+                        <node concept="3zFVjK" id="oI9Ys2EaX" role="3zH0cK">
+                          <node concept="3clFbS" id="oI9Ys2EaY" role="2VODD2">
+                            <node concept="3clFbF" id="oI9Ys2EaZ" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9Ys2Eb0" role="3clFbG">
+                                <node concept="1PxgMI" id="oI9Ys2Eb1" role="2Oq$k0">
+                                  <property role="1BlNFB" value="true" />
+                                  <node concept="chp4Y" id="oI9Ys2Eb2" role="3oSUPX">
+                                    <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
+                                  </node>
+                                  <node concept="2OqwBi" id="oI9Ys2Eb3" role="1m5AlR">
+                                    <node concept="30H73N" id="oI9Ys2Eb4" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="oI9Ys2Eb5" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3TrcHB" id="oI9Ys2Eb6" role="2OqNvi">
+                                  <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="10Nm6u" id="oI9Ys2Eb7" role="37wK5m">
+                      <node concept="29HgVG" id="oI9Ys2Eb8" role="lGtFl">
+                        <node concept="3NFfHV" id="oI9Ys2Eb9" role="3NFExx">
+                          <node concept="3clFbS" id="oI9Ys2Eba" role="2VODD2">
+                            <node concept="3clFbF" id="oI9Ys2Ebb" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9Ys2Ebc" role="3clFbG">
+                                <node concept="1PxgMI" id="oI9Ys2Ebd" role="2Oq$k0">
+                                  <node concept="chp4Y" id="oI9Ys2Ebe" role="3oSUPX">
+                                    <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
+                                  </node>
+                                  <node concept="2OqwBi" id="oI9Ys2Ebf" role="1m5AlR">
+                                    <node concept="30H73N" id="oI9Ys2Ebg" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="oI9Ys2Ebh" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3TrEf2" id="oI9Ys2Ebi" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:oI9Ys1lF8" resolve="text" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="oI9Ys2xk8" role="30HLyM">
+        <node concept="3clFbS" id="oI9Ys2xk9" role="2VODD2">
+          <node concept="3clFbF" id="oI9Ys2xka" role="3cqZAp">
+            <node concept="2OqwBi" id="oI9Ys2xkb" role="3clFbG">
+              <node concept="2OqwBi" id="oI9Ys2xkc" role="2Oq$k0">
+                <node concept="30H73N" id="oI9Ys2xkd" role="2Oq$k0" />
+                <node concept="3TrEf2" id="oI9Ys2xke" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="oI9Ys2xkf" role="2OqNvi">
+                <node concept="chp4Y" id="oI9Ys2y7P" role="cj9EA">
+                  <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index 0028fb0c..9e7e6840 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -2580,5 +2580,28 @@
       <node concept="10P_77" id="oI9Yrc9Fz" role="3clF45" />
     </node>
   </node>
+  <node concept="13h7C7" id="oI9Ys1Qb1">
+    <ref role="13h7C2" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
+    <node concept="13hLZK" id="oI9Ys1Qb2" role="13h7CW">
+      <node concept="3clFbS" id="oI9Ys1Qb3" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="oI9Ys1Qbc" role="13h7CS">
+      <property role="2Ki8OM" value="true" />
+      <property role="13i0is" value="false" />
+      <property role="TrG5h" value="applicableToNode" />
+      <property role="13i0it" value="false" />
+      <property role="13i0iv" value="false" />
+      <ref role="13i0hy" to="tpeu:1653mnvAgrs" resolve="applicableToNode" />
+      <node concept="3Tm1VV" id="oI9Ys1Qbd" role="1B3o_S" />
+      <node concept="3clFbS" id="oI9Ys1Qbi" role="3clF47">
+        <node concept="3clFbF" id="oI9Ys1Qik" role="3cqZAp">
+          <node concept="3clFbT" id="oI9Ys1Qij" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="10P_77" id="oI9Ys1Qbj" role="3clF45" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index e97abdce..437cb92d 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -7593,5 +7593,28 @@
       <node concept="l2Vlx" id="oI9Yrc9BM" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="oI9Ys1lFq">
+    <ref role="1XX52x" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
+    <node concept="3EZMnI" id="oI9Ys1lGg" role="2wV5jI">
+      <node concept="PMmxH" id="oI9Ys1lGh" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3F0A7n" id="oI9Ys1lGM" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:oI9Ys1lGD" resolve="kind" />
+      </node>
+      <node concept="3F0ifn" id="oI9Ys1lGi" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F1sOY" id="oI9Ys1lGj" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:oI9Ys1lF8" resolve="text" />
+      </node>
+      <node concept="3F0ifn" id="oI9Ys1lGk" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="l2Vlx" id="oI9Ys1lGl" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 0ee79439..497e3fe6 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -21,6 +21,14 @@
       <concept id="6054523464627964745" name="jetbrains.mps.lang.structure.structure.AttributeInfo_AttributedConcept" flags="ng" index="trNpa">
         <reference id="6054523464627965081" name="concept" index="trN6q" />
       </concept>
+      <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration" flags="ng" index="AxPO7">
+        <reference id="1083171729157" name="memberDataType" index="M4eZT" />
+        <child id="1083172003582" name="member" index="M5hS2" />
+      </concept>
+      <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ig" index="M4N5e">
+        <property id="1083923523172" name="externalValue" index="1uS6qo" />
+        <property id="1083923523171" name="internalValue" index="1uS6qv" />
+      </concept>
       <concept id="2992811758677295509" name="jetbrains.mps.lang.structure.structure.AttributeInfo" flags="ng" index="M6xJ_">
         <property id="7588428831955550663" name="role" index="Hh88m" />
         <child id="7588428831947959310" name="attributed" index="EQaZv" />
@@ -1505,5 +1513,39 @@
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
+  <node concept="1TIwiD" id="oI9Ys1jH2">
+    <property role="EcuMT" value="6958395097955138" />
+    <property role="TrG5h" value="SNodeReportOperation" />
+    <property role="34LRSv" value="report" />
+    <ref role="1TJDcQ" to="tp25:g$eCIIG" resolve="SNodeOperation" />
+    <node concept="1TJgyi" id="oI9Ys1lGD" role="1TKVEl">
+      <property role="IQ2nx" value="6958395097963305" />
+      <property role="TrG5h" value="kind" />
+      <ref role="AX2Wp" node="oI9Ys1lFh" resolve="ReportKind" />
+    </node>
+    <node concept="1TJgyj" id="oI9Ys1lF8" role="1TKVEi">
+      <property role="IQ2ns" value="6958395097963208" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="text" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
+  <node concept="AxPO7" id="oI9Ys1lFh">
+    <property role="TrG5h" value="ReportKind" />
+    <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
+    <node concept="M4N5e" id="oI9Ys1lFi" role="M5hS2">
+      <property role="1uS6qo" value="info" />
+      <property role="1uS6qv" value="info" />
+    </node>
+    <node concept="M4N5e" id="oI9Ys1lFj" role="M5hS2">
+      <property role="1uS6qo" value="warning" />
+      <property role="1uS6qv" value="warning" />
+    </node>
+    <node concept="M4N5e" id="oI9Ys1lFm" role="M5hS2">
+      <property role="1uS6qo" value="error" />
+      <property role="1uS6qv" value="error" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
index db0a7742..a7dce588 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
@@ -11623,6 +11623,34 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQ_OM3" role="jymVt" />
+    <node concept="3clFb_" id="oI9Ys2yFM" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="report" />
+      <node concept="37vLTG" id="oI9Ys2yFN" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="oI9Ys2yFO" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="oI9Ys2yFP" role="3clF46">
+        <property role="TrG5h" value="kind" />
+        <node concept="3uibUv" id="oI9Ys2yFQ" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="oI9Ys2yFR" role="3clF46">
+        <property role="TrG5h" value="text" />
+        <node concept="17QB3L" id="oI9Ys2yFS" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="oI9Ys2yFT" role="3clF45" />
+      <node concept="3Tm1VV" id="oI9Ys2yFU" role="1B3o_S" />
+      <node concept="3clFbS" id="oI9Ys2yFX" role="3clF47">
+        <node concept="3clFbF" id="oI9Ys2yG0" role="3cqZAp">
+          <node concept="3clFbT" id="oI9Ys2yFZ" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="oI9Ys2yFY" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="7lt0LtQ_OIT" role="1B3o_S" />
     <node concept="3uibUv" id="7lt0LtQ_OLT" role="1zkMxy">
       <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps
index 03ea1829..84bb93e4 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps
@@ -48,6 +48,9 @@
       </concept>
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
+        <child id="1164991057263" name="throwable" index="YScLw" />
+      </concept>
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
@@ -96,7 +99,6 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
@@ -763,14 +765,51 @@
       <node concept="10P_77" id="oI9YrJ4SZ" role="3clF45" />
       <node concept="3Tm1VV" id="oI9YrJ4T0" role="1B3o_S" />
       <node concept="3clFbS" id="oI9YrJ4T2" role="3clF47">
-        <node concept="3clFbF" id="oI9YrJ4T5" role="3cqZAp">
-          <node concept="3clFbT" id="oI9YrJ4T4" role="3clFbG" />
+        <node concept="YS8fn" id="oI9Ys3nmw" role="3cqZAp">
+          <node concept="2ShNRf" id="oI9Ys3nnI" role="YScLw">
+            <node concept="1pGfFk" id="oI9Ys3ny4" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2AHcQZ" id="oI9YrJ4T3" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="oI9Ys3mLR" role="jymVt" />
+    <node concept="3clFb_" id="oI9Ys3m9o" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="report" />
+      <node concept="37vLTG" id="oI9Ys3m9p" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="oI9Ys3m9q" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="oI9Ys3m9r" role="3clF46">
+        <property role="TrG5h" value="kind" />
+        <node concept="3uibUv" id="oI9Ys3m9s" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="oI9Ys3m9t" role="3clF46">
+        <property role="TrG5h" value="text" />
+        <node concept="17QB3L" id="oI9Ys3m9u" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="oI9Ys3m9v" role="3clF45" />
+      <node concept="3Tm1VV" id="oI9Ys3m9w" role="1B3o_S" />
+      <node concept="3clFbS" id="oI9Ys3m9y" role="3clF47">
+        <node concept="YS8fn" id="oI9Ys3n$U" role="3cqZAp">
+          <node concept="2ShNRf" id="oI9Ys3n$V" role="YScLw">
+            <node concept="1pGfFk" id="oI9Ys3n$W" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="oI9Ys3m9z" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="oI9YrJ5uv" role="jymVt" />
     <node concept="3clFb_" id="7DvO2M9IiMh" role="jymVt">
       <property role="TrG5h" value="putParameter" />