diff --git a/build.xml b/build.xml
index b7685739..f3f33679 100644
--- a/build.xml
+++ b/build.xml
@@ -2760,6 +2760,12 @@
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.reporting.runtime" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.1.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -3362,6 +3368,12 @@
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.reporting.runtime" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.1.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -3401,6 +3413,12 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.reporting.runtime" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.1.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index 6e185d2f..92910d64 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -16,6 +16,7 @@
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -127,6 +128,11 @@
         <child id="8182547171709752112" name="expression" index="36biLW" />
       </concept>
     </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
+        <reference id="7256306938026143658" name="target" index="2aWVGs" />
+      </concept>
+    </language>
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
       <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
         <child id="1185788644032" name="normalType" index="mwGJk" />
@@ -188,10 +194,16 @@
         <child id="1803469493727536396" name="concept" index="hTh3Z" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
+        <child id="7400021826774799510" name="ref" index="2tJFKM" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
@@ -208,9 +220,6 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
-        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
-      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
@@ -370,15 +379,24 @@
                 <node concept="3clFbS" id="1zN1RIlro2W" role="1bW5cS">
                   <node concept="3clFbF" id="1zN1RIlro2X" role="3cqZAp">
                     <node concept="3clFbC" id="1zN1RIlro2Y" role="3clFbG">
-                      <node concept="3B5_sB" id="1zN1RIlro2Z" role="3uHU7w">
-                        <ref role="3B5MYn" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
-                      </node>
-                      <node concept="2OqwBi" id="1zN1RIlro30" role="3uHU7B">
-                        <node concept="37vLTw" id="1zN1RIlro31" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1zN1RIlro33" resolve="annInst" />
+                      <node concept="2OqwBi" id="4cvvxaYhCI5" role="3uHU7B">
+                        <node concept="2JrnkZ" id="4cvvxaYhCfO" role="2Oq$k0">
+                          <node concept="2OqwBi" id="1zN1RIlro30" role="2JrQYb">
+                            <node concept="37vLTw" id="1zN1RIlro31" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1zN1RIlro33" resolve="annInst" />
+                            </node>
+                            <node concept="3TrEf2" id="1zN1RIlro32" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:hiAI5P0" resolve="annotation" />
+                            </node>
+                          </node>
                         </node>
-                        <node concept="3TrEf2" id="1zN1RIlro32" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tpee:hiAI5P0" resolve="annotation" />
+                        <node concept="liA8E" id="4cvvxaYhDrT" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                        </node>
+                      </node>
+                      <node concept="2tJFMh" id="4cvvxaYhE4e" role="3uHU7w">
+                        <node concept="ZC_QK" id="4cvvxaYhE4f" role="2tJFKM">
+                          <ref role="2aWVGs" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
                         </node>
                       </node>
                     </node>
@@ -505,16 +523,25 @@
                         <node concept="3clFbS" id="1zN1RIlsblV" role="1bW5cS">
                           <node concept="3clFbF" id="1zN1RIlsblW" role="3cqZAp">
                             <node concept="3clFbC" id="1zN1RIlsblX" role="3clFbG">
-                              <node concept="2OqwBi" id="1zN1RIlsblY" role="3uHU7B">
-                                <node concept="37vLTw" id="1zN1RIlsblZ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1zN1RIlsbm2" resolve="ai" />
+                              <node concept="2OqwBi" id="4cvvxaYh$zL" role="3uHU7B">
+                                <node concept="2JrnkZ" id="4cvvxaYh$3h" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="1zN1RIlsblY" role="2JrQYb">
+                                    <node concept="37vLTw" id="1zN1RIlsblZ" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="1zN1RIlsbm2" resolve="ai" />
+                                    </node>
+                                    <node concept="3TrEf2" id="1zN1RIlsbm0" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:hiAI5P0" resolve="annotation" />
+                                    </node>
+                                  </node>
                                 </node>
-                                <node concept="3TrEf2" id="1zN1RIlsbm0" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:hiAI5P0" resolve="annotation" />
+                                <node concept="liA8E" id="4cvvxaYh_7T" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
                                 </node>
                               </node>
-                              <node concept="3B5_sB" id="1zN1RIlsbm1" role="3uHU7w">
-                                <ref role="3B5MYn" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+                              <node concept="2tJFMh" id="4cvvxaYhA_C" role="3uHU7w">
+                                <node concept="ZC_QK" id="4cvvxaYhAWD" role="2tJFKM">
+                                  <ref role="2aWVGs" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+                                </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 a39a0c89..0273cc91 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
@@ -361,11 +361,10 @@
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
-        <property id="1167228628751" name="hasException" index="34fQS0" />
-        <property id="1167245565795" name="severity" index="35gtTG" />
-        <child id="1167227463056" name="logExpression" index="34bqiv" />
-        <child id="1167227561449" name="exception" index="34bMjA" />
+      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
+        <property id="2034914114981261751" name="severity" index="RRSoG" />
+        <child id="2034914114981261755" name="throwable" index="RRSow" />
+        <child id="2034914114981261753" name="message" index="RRSoy" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -1115,13 +1114,12 @@
               </node>
             </node>
             <node concept="3clFbS" id="7rf49NgqSon" role="TDEfX">
-              <node concept="34ab3g" id="7rf49NgqUfa" role="3cqZAp">
-                <property role="35gtTG" value="warn" />
-                <property role="34fQS0" value="true" />
-                <node concept="Xl_RD" id="7rf49NgqUfc" role="34bqiv">
+              <node concept="RRSsy" id="4cvvxaYhrSr" role="3cqZAp">
+                <property role="RRSoG" value="warn" />
+                <node concept="Xl_RD" id="7rf49NgqUfc" role="RRSoy">
                   <property role="Xl_RC" value="error evaluating program" />
                 </node>
-                <node concept="37vLTw" id="7rf49NgqUfe" role="34bMjA">
+                <node concept="37vLTw" id="7rf49NgqUfe" role="RRSow">
                   <ref role="3cqZAo" node="7rf49NgqSol" resolve="vmerr" />
                 </node>
               </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 731b4ae6..1dee3965 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -89,6 +89,9 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -111,6 +114,11 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -149,9 +157,6 @@
         <child id="1163670677455" name="concept" index="3Kbmr1" />
         <child id="1163670683720" name="body" index="3Kbo56" />
       </concept>
-      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
-        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
-      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
@@ -278,8 +283,15 @@
             </node>
             <node concept="3clFbS" id="6Sag3KsyiIx" role="3Kbo56">
               <node concept="3cpWs6" id="6Sag3KsyiJ4" role="3cqZAp">
-                <node concept="3B5_sB" id="6Sag3Ksyj85" role="3cqZAk">
-                  <ref role="3B5MYn" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                <node concept="2OqwBi" id="4cvvxaYheve" role="3cqZAk">
+                  <node concept="2c44tf" id="4cvvxaYhe6r" role="2Oq$k0">
+                    <node concept="3uibUv" id="4cvvxaYhegq" role="2c44tc">
+                      <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="4cvvxaYheXY" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -290,16 +302,30 @@
             </node>
             <node concept="3clFbS" id="6Sag3KsyjtO" role="3Kbo56">
               <node concept="3cpWs6" id="6Sag3KsyjNN" role="3cqZAp">
-                <node concept="3B5_sB" id="6Sag3KsyjNO" role="3cqZAk">
-                  <ref role="3B5MYn" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                <node concept="2OqwBi" id="4cvvxaYhfL9" role="3cqZAk">
+                  <node concept="2c44tf" id="4cvvxaYhfdx" role="2Oq$k0">
+                    <node concept="3uibUv" id="4cvvxaYhfwe" role="2c44tc">
+                      <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="4cvvxaYhgi0" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
         <node concept="3clFbF" id="6Sag3KsyjWy" role="3cqZAp">
-          <node concept="3B5_sB" id="7MlQDeOyUrC" role="3clFbG">
-            <ref role="3B5MYn" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <node concept="2OqwBi" id="4cvvxaYhgKJ" role="3clFbG">
+            <node concept="2c44tf" id="4cvvxaYhgp3" role="2Oq$k0">
+              <node concept="3uibUv" id="4cvvxaYhgzP" role="2c44tc">
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="4cvvxaYhhd_" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+            </node>
           </node>
         </node>
       </node>
@@ -352,9 +378,16 @@
       <ref role="13i0hy" node="7FFmDVAL6VY" resolve="runtimeType" />
       <node concept="3Tm1VV" id="7FFmDVAL6Y6" role="1B3o_S" />
       <node concept="3clFbS" id="7FFmDVAL6Yd" role="3clF47">
-        <node concept="3clFbF" id="7FFmDVALaxd" role="3cqZAp">
-          <node concept="3B5_sB" id="7FFmDVALaxc" role="3clFbG">
-            <ref role="3B5MYn" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+        <node concept="3clFbF" id="4cvvxaYhc6j" role="3cqZAp">
+          <node concept="2OqwBi" id="4cvvxaYhcn$" role="3clFbG">
+            <node concept="2c44tf" id="4cvvxaYhc6f" role="2Oq$k0">
+              <node concept="3uibUv" id="4cvvxaYhcaI" role="2c44tc">
+                <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="4cvvxaYhcOo" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+            </node>
           </node>
         </node>
       </node>
@@ -376,9 +409,16 @@
       <ref role="13i0hy" node="7FFmDVAL6VY" resolve="runtimeType" />
       <node concept="3Tm1VV" id="7FFmDVAL754" role="1B3o_S" />
       <node concept="3clFbS" id="7FFmDVAL75b" role="3clF47">
-        <node concept="3clFbF" id="7FFmDVALaK9" role="3cqZAp">
-          <node concept="3B5_sB" id="7FFmDVALaK8" role="3clFbG">
-            <ref role="3B5MYn" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+        <node concept="3clFbF" id="4cvvxaYhcUm" role="3cqZAp">
+          <node concept="2OqwBi" id="4cvvxaYhdbA" role="3clFbG">
+            <node concept="2c44tf" id="4cvvxaYhcUi" role="2Oq$k0">
+              <node concept="3uibUv" id="4cvvxaYhcYL" role="2c44tc">
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="4cvvxaYhdYJ" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+            </node>
           </node>
         </node>
       </node>
@@ -400,9 +440,11 @@
       <ref role="13i0hy" node="7FFmDVAL6VY" resolve="runtimeType" />
       <node concept="3Tm1VV" id="7FFmDVAL79m" role="1B3o_S" />
       <node concept="3clFbS" id="7FFmDVAL79t" role="3clF47">
-        <node concept="3clFbF" id="7FFmDVALaDE" role="3cqZAp">
-          <node concept="3B5_sB" id="7FFmDVALaDD" role="3clFbG">
-            <ref role="3B5MYn" to="6exd:3OPtF03lco4" resolve="ListNode" />
+        <node concept="3clFbF" id="4cvvxaYhhl2" role="3cqZAp">
+          <node concept="2c44tf" id="4cvvxaYhhkY" role="3clFbG">
+            <node concept="3uibUv" id="4cvvxaYhhpt" role="2c44tc">
+              <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+            </node>
           </node>
         </node>
       </node>
@@ -422,9 +464,16 @@
       <property role="TrG5h" value="runtimeType" />
       <node concept="3Tm1VV" id="7FFmDVAL6VZ" role="1B3o_S" />
       <node concept="3clFbS" id="7FFmDVAL6W0" role="3clF47">
-        <node concept="3clFbF" id="7FFmDVALaOi" role="3cqZAp">
-          <node concept="3B5_sB" id="7FFmDVALaOh" role="3clFbG">
-            <ref role="3B5MYn" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <node concept="3clFbF" id="4cvvxaYhhvP" role="3cqZAp">
+          <node concept="2OqwBi" id="4cvvxaYhhL5" role="3clFbG">
+            <node concept="2c44tf" id="4cvvxaYhhvL" role="2Oq$k0">
+              <node concept="3uibUv" id="4cvvxaYhh$g" role="2c44tc">
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="4cvvxaYhidS" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+            </node>
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
index c4b2b723..8e1c5247 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
@@ -2404,9 +2404,6 @@
     <node concept="2tJIrI" id="7HUwyZb7clq" role="jymVt" />
     <node concept="2YIFZL" id="7HUwyZb7chj" role="jymVt">
       <property role="TrG5h" value="asVariable" />
-      <node concept="16euLQ" id="4TCblo5YIpd" role="16eVyc">
-        <property role="TrG5h" value="T" />
-      </node>
       <node concept="37vLTG" id="7HUwyZb7chk" role="3clF46">
         <property role="TrG5h" value="metaLogical" />
         <node concept="3uibUv" id="7HUwyZb7chm" role="1tU5fm">
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 58eed6e1..13b7d1a4 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -22,7 +22,6 @@
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -30,30 +29,22 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <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>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -68,19 +59,14 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <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">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -88,10 +74,6 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
@@ -147,12 +129,6 @@
         <child id="2455719244613924416" name="logical" index="1Tms7$" />
       </concept>
     </language>
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
-        <property id="1167245565795" name="severity" index="35gtTG" />
-        <child id="1167227463056" name="logExpression" index="34bqiv" />
-      </concept>
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -811,33 +787,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="7mB3viLc$Nn">
-    <property role="TrG5h" value="Util" />
-    <node concept="2tJIrI" id="7mB3viLc$NF" role="jymVt" />
-    <node concept="2YIFZL" id="7mB3viLc$NQ" role="jymVt">
-      <property role="TrG5h" value="log" />
-      <node concept="37vLTG" id="7mB3viLc$Os" role="3clF46">
-        <property role="TrG5h" value="msg" />
-        <node concept="17QB3L" id="7mB3viLc$OJ" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="7mB3viLc$NS" role="3clF45" />
-      <node concept="3Tm1VV" id="7mB3viLc$NT" role="1B3o_S" />
-      <node concept="3clFbS" id="7mB3viLc$NU" role="3clF47">
-        <node concept="34ab3g" id="7mB3viLc$Pj" role="3cqZAp">
-          <property role="35gtTG" value="error" />
-          <node concept="3cpWs3" id="7mB3viLc_7T" role="34bqiv">
-            <node concept="37vLTw" id="7mB3viLc_8d" role="3uHU7w">
-              <ref role="3cqZAo" node="7mB3viLc$Os" resolve="msg" />
-            </node>
-            <node concept="Xl_RD" id="7mB3viLc$Pl" role="3uHU7B">
-              <property role="Xl_RC" value="*** " />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="7mB3viLc$No" role="1B3o_S" />
-  </node>
   <node concept="0oKg$" id="7mB3viLcERs">
     <property role="TrG5h" value="Macros" />
     <node concept="0oKvU" id="7mB3viLcERt" role="0oKgB">
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
index 14ffbf5f..3de19f08 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
@@ -12,7 +12,7 @@
     <dependency reexport="false">f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 2bfdf24a..cd3902f5 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -324,11 +324,10 @@
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
-        <property id="1167228628751" name="hasException" index="34fQS0" />
-        <property id="1167245565795" name="severity" index="35gtTG" />
-        <child id="1167227463056" name="logExpression" index="34bqiv" />
-        <child id="1167227561449" name="exception" index="34bMjA" />
+      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
+        <property id="2034914114981261751" name="severity" index="RRSoG" />
+        <child id="2034914114981261755" name="throwable" index="RRSow" />
+        <child id="2034914114981261753" name="message" index="RRSoy" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -3943,10 +3942,9 @@
                         </node>
                       </node>
                       <node concept="3clFbS" id="Hg6EncPqlL" role="3clF47">
-                        <node concept="34ab3g" id="Hg6EncPEF2" role="3cqZAp">
-                          <property role="35gtTG" value="warn" />
-                          <property role="34fQS0" value="true" />
-                          <node concept="2OqwBi" id="Hg6EncPFSZ" role="34bqiv">
+                        <node concept="RRSsy" id="4cvvxaYhU$1" role="3cqZAp">
+                          <property role="RRSoG" value="warn" />
+                          <node concept="2OqwBi" id="Hg6EncPFSZ" role="RRSoy">
                             <node concept="37vLTw" id="Hg6EncPFaf" role="2Oq$k0">
                               <ref role="3cqZAo" node="Hg6EncPqlI" resolve="thr" />
                             </node>
@@ -3954,7 +3952,7 @@
                               <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
                             </node>
                           </node>
-                          <node concept="37vLTw" id="Hg6EncPGXS" role="34bMjA">
+                          <node concept="37vLTw" id="Hg6EncPGXS" role="RRSow">
                             <ref role="3cqZAo" node="Hg6EncPqlI" resolve="thr" />
                           </node>
                         </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
index f7c017c7..0093c2c6 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
@@ -12,6 +12,7 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)</dependency>
+    <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
index 8141ddfa..3a9baa9a 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
@@ -1995,9 +1995,6 @@
           </node>
         </node>
       </node>
-      <node concept="16euLQ" id="7nPD14NOHEv" role="16eVyc">
-        <property role="TrG5h" value="V" />
-      </node>
     </node>
     <node concept="2tJIrI" id="7nPD14NOHIY" role="jymVt" />
     <node concept="2YIFZL" id="7nPD14NOI_T" role="jymVt">
@@ -2039,9 +2036,6 @@
           </node>
         </node>
       </node>
-      <node concept="16euLQ" id="7nPD14NOIA7" role="16eVyc">
-        <property role="TrG5h" value="V" />
-      </node>
     </node>
     <node concept="2tJIrI" id="7nPD14NOIs7" role="jymVt" />
     <node concept="2YIFZL" id="7nPD14NOHGU" role="jymVt">
@@ -2069,9 +2063,6 @@
           </node>
         </node>
       </node>
-      <node concept="16euLQ" id="7nPD14NOHH8" role="16eVyc">
-        <property role="TrG5h" value="V" />
-      </node>
     </node>
     <node concept="2tJIrI" id="7nPD14O1iIK" role="jymVt" />
     <node concept="3Tm1VV" id="7nPD14NOCSb" role="1B3o_S" />
@@ -2569,7 +2560,7 @@
             <node concept="YS8fn" id="1N8$BG_2PoZ" role="3cqZAp">
               <node concept="2ShNRf" id="1N8$BG_2Ppr" role="YScLw">
                 <node concept="1pGfFk" id="1N8$BG_2QBw" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;()" resolve="IllegalStateException" />
+                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
                   <node concept="3cpWs3" id="1N8$BG_2RYk" role="37wK5m">
                     <node concept="Xl_RD" id="1N8$BG_2RYW" role="3uHU7w">
                       <property role="Xl_RC" value="'" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
index 48571fef..89991804 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
+++ b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
@@ -14,7 +14,7 @@
   </stubModelEntries>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 663ce579..3b5f07be 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -650,7 +650,7 @@
         </node>
         <node concept="1SiIV0" id="7Ant4WkHLpn" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLpo" role="1SiIV1">
-            <property role="3bR36h" value="false" />
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
@@ -1862,6 +1862,12 @@
             <ref role="3bR37D" node="oI9YrJ7Rx" resolve="jetbrains.mps.reporting.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4cvvxaYkWvj" role="3bR37C">
+          <node concept="3bR9La" id="4cvvxaYkWvk" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2110,7 +2116,7 @@
         </node>
         <node concept="1SiIV0" id="6Yb9hAqE1Ea" role="3bR37C">
           <node concept="3bR9La" id="6Yb9hAqE1Eb" role="1SiIV1">
-            <property role="3bR36h" value="false" />
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
index 41a53e55..24cf9b09 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
@@ -198,6 +198,11 @@
       </concept>
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
+        <property id="2034914114981261751" name="severity" index="RRSoG" />
+        <child id="2034914114981261755" name="throwable" index="RRSow" />
+        <child id="2034914114981261753" name="message" index="RRSoy" />
+      </concept>
       <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
         <property id="1167228628751" name="hasException" index="34fQS0" />
         <property id="1167245565795" name="severity" index="35gtTG" />
@@ -1164,13 +1169,12 @@
               </node>
             </node>
             <node concept="3clFbS" id="2BZXJed2Jz5" role="TDEfX">
-              <node concept="34ab3g" id="2BZXJed2VqA" role="3cqZAp">
-                <property role="35gtTG" value="warn" />
-                <property role="34fQS0" value="true" />
-                <node concept="Xl_RD" id="2BZXJed2VqB" role="34bqiv">
+              <node concept="RRSsy" id="4cvvxaYh9pT" role="3cqZAp">
+                <property role="RRSoG" value="warn" />
+                <node concept="Xl_RD" id="2BZXJed2VqB" role="RRSoy">
                   <property role="Xl_RC" value="error evaluating rules" />
                 </node>
-                <node concept="37vLTw" id="2BZXJed2VqC" role="34bMjA">
+                <node concept="37vLTw" id="2BZXJed2VqC" role="RRSow">
                   <ref role="3cqZAo" node="2BZXJed2Jz1" resolve="ignore" />
                 </node>
               </node>
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 a48b2efb..ab1e0f2c 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
@@ -505,9 +505,6 @@
         <child id="1163670677455" name="concept" index="3Kbmr1" />
         <child id="1163670683720" name="body" index="3Kbo56" />
       </concept>
-      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
-        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
-      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -2623,11 +2620,20 @@
         <node concept="3clFbS" id="2jjvHNv9zFG" role="16YjZG">
           <node concept="3clFbF" id="2jjvHNv9zLe" role="3cqZAp">
             <node concept="3clFbC" id="2jjvHNv9zR1" role="3clFbG">
-              <node concept="3B5_sB" id="2jjvHNv9Jsy" role="3uHU7w">
-                <ref role="3B5MYn" to="wyt6:~Boolean" resolve="Boolean" />
+              <node concept="2OqwBi" id="4cvvxaYi8Yg" role="3uHU7B">
+                <node concept="2JrnkZ" id="4cvvxaYi7Rd" role="2Oq$k0">
+                  <node concept="3A2sRY" id="2jjvHNv9zLd" role="2JrQYb">
+                    <ref role="3A2yKK" node="2jjvHNv9zxF" resolve="cls" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="4cvvxaYia8i" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                </node>
               </node>
-              <node concept="3A2sRY" id="2jjvHNv9zLd" role="3uHU7B">
-                <ref role="3A2yKK" node="2jjvHNv9zxF" resolve="cls" />
+              <node concept="2tJFMh" id="4cvvxaYiedp" role="3uHU7w">
+                <node concept="ZC_QK" id="4cvvxaYifes" role="2tJFKM">
+                  <ref role="2aWVGs" to="wyt6:~Boolean" resolve="Boolean" />
+                </node>
               </node>
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index 8bd0f7eb..1c644371 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -213,6 +213,11 @@
         <child id="1205770614681" name="actualArgument" index="2XxRq1" />
       </concept>
     </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
+        <reference id="7256306938026143658" name="target" index="2aWVGs" />
+      </concept>
+    </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
       <concept id="1171931690126" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethod" flags="ig" index="3s$Bmu">
         <property id="1171931690128" name="methodName" index="3s$Bm0" />
@@ -268,14 +273,22 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
+        <child id="7400021826774799510" name="ref" index="2tJFKM" />
+      </concept>
+      <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
+        <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
-      <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
-      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
-        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
+      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
+      <concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
+      <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -810,8 +823,27 @@
             <node concept="2YIFZM" id="2shrukTBZPV" role="33vP2m">
               <ref role="37wK5l" to="kqnc:5H6hZahiCgu" resolve="allSubtypePathsTo" />
               <ref role="1Pybhc" to="kqnc:tIwzd2cJHD" resolve="SubclassingUtil" />
-              <node concept="3B5_sB" id="2shrukTBZPW" role="37wK5m">
-                <ref role="3B5MYn" to="wyt6:~String" resolve="String" />
+              <node concept="2OqwBi" id="4cvvxaYgObv" role="37wK5m">
+                <node concept="2tJFMh" id="4cvvxaYgM9x" role="2Oq$k0">
+                  <node concept="ZC_QK" id="4cvvxaYgN$8" role="2tJFKM">
+                    <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
+                  </node>
+                </node>
+                <node concept="Vyspw" id="4cvvxaYgP1B" role="2OqNvi">
+                  <node concept="2OqwBi" id="4cvvxaYgVNw" role="Vysub">
+                    <node concept="2JrnkZ" id="4cvvxaYgVky" role="2Oq$k0">
+                      <node concept="2OqwBi" id="4cvvxaYgR3E" role="2JrQYb">
+                        <node concept="3xONca" id="4cvvxaYgQq8" role="2Oq$k0">
+                          <ref role="3xOPvv" node="7t5VLKGB12r" resolve="A" />
+                        </node>
+                        <node concept="I4A8Y" id="4cvvxaYgT1r" role="2OqNvi" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="4cvvxaYgWs1" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>