diff --git a/build.xml b/build.xml
index 793b173f..604ba758 100644
--- a/build.xml
+++ b/build.xml
@@ -242,7 +242,7 @@
         <uses />
         <library jar="lib/collection-0.7.jar" />
         <library jar="lib/trove4j-3.0.3.jar" />
-        <library jar="lib/conreactor-core-0.9.11.jar" />
+        <library jar="lib/conreactor-core-0.9.12.jar" />
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -408,6 +408,7 @@
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
+          <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
@@ -2345,7 +2346,7 @@
         <uses />
         <library jar="../lib/collection-0.7.jar" />
         <library jar="../../../deploy/lib/trove4j-3.0.3.jar" />
-        <library jar="../lib/conreactor-core-0.9.11.jar" />
+        <library jar="../lib/conreactor-core-0.9.12.jar" />
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -2447,6 +2448,7 @@
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
+          <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
@@ -4191,7 +4193,7 @@
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -4242,7 +4244,7 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -4303,7 +4305,7 @@
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -4353,7 +4355,7 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.jar" />
@@ -4402,7 +4404,7 @@
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -4463,7 +4465,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -4544,7 +4546,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -4617,7 +4619,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.jar" />
         <fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
@@ -4801,7 +4803,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -4921,7 +4923,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -5052,7 +5054,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
@@ -5118,7 +5120,7 @@
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -5170,7 +5172,7 @@
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -5243,7 +5245,7 @@
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -5314,7 +5316,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -5374,7 +5376,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -5428,7 +5430,7 @@
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -5497,7 +5499,7 @@
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -5550,7 +5552,7 @@
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -5598,7 +5600,7 @@
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -5644,7 +5646,7 @@
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -5703,7 +5705,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -5763,7 +5765,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -5808,7 +5810,7 @@
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -5868,7 +5870,7 @@
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <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/conreactor-core-0.9.11.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.12.jar" />
         <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
         <fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.jar" />
         <fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index e91dfd1f..a5305dc0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -842,6 +842,11 @@
       <ref role="2rTdP9" to="wq2x:6OXbTD$dU7b" resolve="Query" />
       <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
     </node>
+    <node concept="2rT7sh" id="1laj_RSs33U" role="2rTMjI">
+      <property role="TrG5h" value="origin_variable" />
+      <ref role="2rTdP9" to="wq2x:1laj_RSpLVV" resolve="OriginSpec" />
+      <ref role="2rZz_L" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
+    </node>
     <node concept="3lhOvk" id="4MqhgXUaA0d" role="3lj3bC">
       <ref role="30HIoZ" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
       <ref role="3lhOvi" node="4MqhgXU9Ebr" resolve="RulesListTemplateImpl" />
@@ -1484,6 +1489,92 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="1laj_RSrXv0" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:1laj_RSpLVV" resolve="OriginSpec" />
+      <node concept="1Koe21" id="1laj_RSrYW6" role="1lVwrX">
+        <node concept="9aQIb" id="1laj_RSrYWc" role="1Koe22">
+          <node concept="3clFbS" id="1laj_RSrYWd" role="9aQI4">
+            <node concept="9aQIb" id="1laj_RSrYWg" role="3cqZAp">
+              <node concept="3clFbS" id="1laj_RSrYWh" role="9aQI4">
+                <node concept="3cpWs8" id="1laj_RSrYWv" role="3cqZAp">
+                  <node concept="3cpWsn" id="1laj_RSrYWy" role="3cpWs9">
+                    <property role="TrG5h" value="origin" />
+                    <node concept="3Tqbb2" id="1laj_RSrYWt" role="1tU5fm" />
+                    <node concept="10Nm6u" id="1laj_RSs2Yd" role="33vP2m">
+                      <node concept="29HgVG" id="1laj_RSs2Yu" role="lGtFl">
+                        <node concept="3NFfHV" id="1laj_RSs2Yv" role="3NFExx">
+                          <node concept="3clFbS" id="1laj_RSs2Yw" role="2VODD2">
+                            <node concept="3clFbF" id="1laj_RSs2YA" role="3cqZAp">
+                              <node concept="2OqwBi" id="1laj_RSs2Yx" role="3clFbG">
+                                <node concept="3TrEf2" id="1laj_RSs2Y$" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:1laj_RSpMKx" resolve="origin" />
+                                </node>
+                                <node concept="30H73N" id="1laj_RSs2Y_" role="2Oq$k0" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2ZBi8u" id="1laj_RSs4oS" role="lGtFl">
+                      <ref role="2rW$FS" node="1laj_RSs33U" resolve="origin_variable" />
+                    </node>
+                    <node concept="17Uvod" id="1laj_RStXsv" role="lGtFl">
+                      <property role="2qtEX9" value="name" />
+                      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                      <node concept="3zFVjK" id="1laj_RStXsw" role="3zH0cK">
+                        <node concept="3clFbS" id="1laj_RStXsx" role="2VODD2">
+                          <node concept="3clFbF" id="1laj_RStXxJ" role="3cqZAp">
+                            <node concept="2OqwBi" id="1laj_RStXH6" role="3clFbG">
+                              <node concept="1iwH7S" id="1laj_RStXxI" role="2Oq$k0" />
+                              <node concept="2piZGk" id="1laj_RStXWh" role="2OqNvi">
+                                <node concept="3zGtF$" id="1laj_RStY1a" role="2piZGb" />
+                                <node concept="2OqwBi" id="1laj_RStYlt" role="2pr8EU">
+                                  <node concept="30H73N" id="1laj_RStYam" role="2Oq$k0" />
+                                  <node concept="2Xjw5R" id="1laj_RStYCo" role="2OqNvi">
+                                    <node concept="1xMEDy" id="1laj_RStYCq" role="1xVPHs">
+                                      <node concept="chp4Y" id="1laj_RStYDs" 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="3clFbH" id="1laj_RSs0Am" role="3cqZAp">
+                  <node concept="2b32R4" id="1laj_RSs0Av" role="lGtFl">
+                    <node concept="3JmXsc" id="1laj_RSs0Aw" role="2P8S$">
+                      <node concept="3clFbS" id="1laj_RSs0Ax" role="2VODD2">
+                        <node concept="3clFbF" id="1laj_RSs0GW" role="3cqZAp">
+                          <node concept="2OqwBi" id="1laj_RSs1Jj" role="3clFbG">
+                            <node concept="2OqwBi" id="1laj_RSs0W3" role="2Oq$k0">
+                              <node concept="30H73N" id="1laj_RSs0GV" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="1laj_RSs1aK" role="2OqNvi">
+                                <ref role="3Tt5mk" to="tpee:fK9aQHS" resolve="statements" />
+                              </node>
+                            </node>
+                            <node concept="3Tsc0h" id="1laj_RSs29G" role="2OqNvi">
+                              <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="1laj_RSrYX2" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1puMqW" id="4vbeH84AAvf" role="1puA0r">
       <ref role="1puQsG" node="4vbeH84AvBw" resolve="init_tracking" />
     </node>
@@ -14054,103 +14145,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="2ShNRf" id="36tQV5AxhQc" role="37wK5m">
-                                <node concept="1pGfFk" id="36tQV5AxhQd" role="2ShVmc">
-                                  <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
-                                  <node concept="2OqwBi" id="36tQV5Ay4nB" role="37wK5m">
-                                    <node concept="1rXfSq" id="36tQV5Ay3Lk" role="2Oq$k0">
-                                      <ref role="37wK5l" node="36tQV5AvM3Y" resolve="token" />
-                                      <node concept="1ZhdrF" id="36tQV5Ay3Ll" role="lGtFl">
-                                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                                        <property role="2qtEX8" value="baseMethodDeclaration" />
-                                        <node concept="3$xsQk" id="36tQV5Ay3Lm" role="3$ytzL">
-                                          <node concept="3clFbS" id="36tQV5Ay3Ln" role="2VODD2">
-                                            <node concept="3clFbF" id="36tQV5Ay3Lo" role="3cqZAp">
-                                              <node concept="2OqwBi" id="36tQV5Ay3Lp" role="3clFbG">
-                                                <node concept="1iwH7S" id="36tQV5Ay3Lq" role="2Oq$k0" />
-                                                <node concept="1iwH70" id="36tQV5Ay3Lr" role="2OqNvi">
-                                                  <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
-                                                  <node concept="2OqwBi" id="36tQV5Ay3Ls" role="1iwH7V">
-                                                    <node concept="30H73N" id="36tQV5Ay3Lt" role="2Oq$k0" />
-                                                    <node concept="2Xjw5R" id="36tQV5Ay3Lu" role="2OqNvi">
-                                                      <node concept="1xMEDy" id="36tQV5Ay3Lv" role="1xVPHs">
-                                                        <node concept="chp4Y" id="6OXbTDyY0kv" role="ri$Ld">
-                                                          <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="2OwXpG" id="36tQV5Ay6d1" role="2OqNvi">
-                                      <ref role="2Oxat5" node="36tQV5AoEVr" resolve="input" />
-                                      <node concept="1ZhdrF" id="7lt0LtPN5D5" role="lGtFl">
-                                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
-                                        <property role="2qtEX8" value="fieldDeclaration" />
-                                        <node concept="3$xsQk" id="7lt0LtPN5D6" role="3$ytzL">
-                                          <node concept="3clFbS" id="7lt0LtPN5D7" role="2VODD2">
-                                            <node concept="3clFbF" id="7lt0LtPN6oH" role="3cqZAp">
-                                              <node concept="2OqwBi" id="7lt0LtPN6_w" role="3clFbG">
-                                                <node concept="1iwH7S" id="7lt0LtPN6oG" role="2Oq$k0" />
-                                                <node concept="1iwH70" id="7lt0LtPN7ju" role="2OqNvi">
-                                                  <ref role="1iwH77" node="36tQV5Au3A_" resolve="ruletemplate_token_input" />
-                                                  <node concept="2OqwBi" id="7lt0LtPN7Rb" role="1iwH7V">
-                                                    <node concept="30H73N" id="7lt0LtPN7$8" role="2Oq$k0" />
-                                                    <node concept="2Xjw5R" id="7lt0LtPN8ao" role="2OqNvi">
-                                                      <node concept="1xMEDy" id="7lt0LtPN8aq" role="1xVPHs">
-                                                        <node concept="chp4Y" id="7lt0LtPN8c_" role="ri$Ld">
-                                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="1W57fq" id="36tQV5AxhQr" role="lGtFl">
-                                  <node concept="3IZrLx" id="36tQV5AxhQs" role="3IZSJc">
-                                    <node concept="3clFbS" id="36tQV5AxhQt" role="2VODD2">
-                                      <node concept="3clFbF" id="36tQV5AxhQu" role="3cqZAp">
-                                        <node concept="2OqwBi" id="36tQV5AxhQv" role="3clFbG">
-                                          <node concept="2OqwBi" id="36tQV5AxhQw" role="2Oq$k0">
-                                            <node concept="2OqwBi" id="36tQV5AxhQx" role="2Oq$k0">
-                                              <node concept="2OqwBi" id="36tQV5AxBNf" role="2Oq$k0">
-                                                <node concept="30H73N" id="36tQV5AxhQy" role="2Oq$k0" />
-                                                <node concept="2Xjw5R" id="36tQV5AxCmT" role="2OqNvi">
-                                                  <node concept="1xMEDy" id="36tQV5AxCmV" role="1xVPHs">
-                                                    <node concept="chp4Y" id="36tQV5AxCDP" role="ri$Ld">
-                                                      <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                              <node concept="3TrEf2" id="36tQV5AxDg5" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
-                                              </node>
-                                            </node>
-                                            <node concept="3TrEf2" id="36tQV5AxhQ$" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" resolve="input" />
-                                            </node>
-                                          </node>
-                                          <node concept="3x8VRR" id="36tQV5AxhQ_" role="2OqNvi" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="gft3U" id="36tQV5AxhQA" role="UU_$l">
-                                    <node concept="10Nm6u" id="36tQV5AxhQB" role="gfFT$" />
-                                  </node>
+                              <node concept="10Nm6u" id="1laj_RSpv0h" role="37wK5m">
+                                <node concept="1sPUBX" id="1laj_RSpvwz" role="lGtFl">
+                                  <ref role="v9R2y" node="1laj_RSpsVh" resolve="Origin_variable" />
                                 </node>
                               </node>
                             </node>
@@ -16331,5 +16328,185 @@
       </node>
     </node>
   </node>
+  <node concept="jVnub" id="1laj_RSpsVh">
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="Origin_variable" />
+    <node concept="3aamgX" id="1laj_RStZlp" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+      <node concept="1Koe21" id="1laj_RSu0Zy" role="1lVwrX">
+        <node concept="9aQIb" id="1laj_RSu10e" role="1Koe22">
+          <node concept="3clFbS" id="1laj_RSu10f" role="9aQI4">
+            <node concept="3cpWs8" id="1laj_RSu10y" role="3cqZAp">
+              <node concept="3cpWsn" id="1laj_RSu10_" role="3cpWs9">
+                <property role="TrG5h" value="origin" />
+                <node concept="3Tqbb2" id="1laj_RSu10w" role="1tU5fm" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="1laj_RSu10R" role="3cqZAp">
+              <node concept="2ShNRf" id="1laj_RSu10N" role="3clFbG">
+                <node concept="1pGfFk" id="1laj_RSu2wo" role="2ShVmc">
+                  <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
+                  <node concept="37vLTw" id="1laj_RSu2_5" role="37wK5m">
+                    <ref role="3cqZAo" node="1laj_RSu10_" resolve="origin" />
+                    <node concept="1ZhdrF" id="1laj_RSu2BH" role="lGtFl">
+                      <property role="2qtEX8" value="variableDeclaration" />
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                      <node concept="3$xsQk" id="1laj_RSu2BI" role="3$ytzL">
+                        <node concept="3clFbS" id="1laj_RSu2BJ" role="2VODD2">
+                          <node concept="3clFbF" id="1laj_RSu2GX" role="3cqZAp">
+                            <node concept="2OqwBi" id="1laj_RSu2Rv" role="3clFbG">
+                              <node concept="1iwH7S" id="1laj_RSu2GW" role="2Oq$k0" />
+                              <node concept="1iwH70" id="1laj_RSu2Xc" role="2OqNvi">
+                                <ref role="1iwH77" node="1laj_RSs33U" resolve="origin_variable" />
+                                <node concept="2OqwBi" id="1laj_RSu3gW" role="1iwH7V">
+                                  <node concept="30H73N" id="1laj_RSu359" role="2Oq$k0" />
+                                  <node concept="2Xjw5R" id="1laj_RSu3se" role="2OqNvi">
+                                    <node concept="1xMEDy" id="1laj_RSu3sg" role="1xVPHs">
+                                      <node concept="chp4Y" id="1laj_RSu3w4" role="ri$Ld">
+                                        <ref role="cht4Q" to="wq2x:1laj_RSpLVV" resolve="OriginSpec" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="raruj" id="1laj_RSu2Bx" role="lGtFl" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="1laj_RStZQ$" role="30HLyM">
+        <node concept="3clFbS" id="1laj_RStZQ_" role="2VODD2">
+          <node concept="3clFbF" id="1laj_RStZU$" role="3cqZAp">
+            <node concept="2OqwBi" id="1laj_RSu0Br" role="3clFbG">
+              <node concept="2OqwBi" id="1laj_RSu08O" role="2Oq$k0">
+                <node concept="30H73N" id="1laj_RStZUz" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="1laj_RSu0j6" role="2OqNvi">
+                  <node concept="1xMEDy" id="1laj_RSu0j8" role="1xVPHs">
+                    <node concept="chp4Y" id="1laj_RSu0lt" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:1laj_RSpLVV" resolve="OriginSpec" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3x8VRR" id="1laj_RSu0Qv" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1laj_RSpsXX" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+      <node concept="1Koe21" id="1laj_RSptA4" role="1lVwrX">
+        <node concept="2ShNRf" id="1laj_RSptNK" role="1Koe22">
+          <node concept="1pGfFk" id="1laj_RSptNL" role="2ShVmc">
+            <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
+            <node concept="2OqwBi" id="1laj_RSptNM" role="37wK5m">
+              <node concept="1rXfSq" id="1laj_RSptNN" role="2Oq$k0">
+                <ref role="37wK5l" node="36tQV5AvM3Y" resolve="token" />
+                <node concept="1ZhdrF" id="1laj_RSptNO" role="lGtFl">
+                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                  <property role="2qtEX8" value="baseMethodDeclaration" />
+                  <node concept="3$xsQk" id="1laj_RSptNP" role="3$ytzL">
+                    <node concept="3clFbS" id="1laj_RSptNQ" role="2VODD2">
+                      <node concept="3clFbF" id="1laj_RSptNR" role="3cqZAp">
+                        <node concept="2OqwBi" id="1laj_RSptNS" role="3clFbG">
+                          <node concept="1iwH7S" id="1laj_RSptNT" role="2Oq$k0" />
+                          <node concept="1iwH70" id="1laj_RSptNU" role="2OqNvi">
+                            <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
+                            <node concept="2OqwBi" id="1laj_RSptNV" role="1iwH7V">
+                              <node concept="30H73N" id="1laj_RSptNW" role="2Oq$k0" />
+                              <node concept="2Xjw5R" id="1laj_RSptNX" role="2OqNvi">
+                                <node concept="1xMEDy" id="1laj_RSptNY" role="1xVPHs">
+                                  <node concept="chp4Y" id="1laj_RSptNZ" role="ri$Ld">
+                                    <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OwXpG" id="1laj_RSptO0" role="2OqNvi">
+                <ref role="2Oxat5" node="36tQV5AoEVr" resolve="input" />
+                <node concept="1ZhdrF" id="1laj_RSptO1" role="lGtFl">
+                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
+                  <property role="2qtEX8" value="fieldDeclaration" />
+                  <node concept="3$xsQk" id="1laj_RSptO2" role="3$ytzL">
+                    <node concept="3clFbS" id="1laj_RSptO3" role="2VODD2">
+                      <node concept="3clFbF" id="1laj_RSptO4" role="3cqZAp">
+                        <node concept="2OqwBi" id="1laj_RSptO5" role="3clFbG">
+                          <node concept="1iwH7S" id="1laj_RSptO6" role="2Oq$k0" />
+                          <node concept="1iwH70" id="1laj_RSptO7" role="2OqNvi">
+                            <ref role="1iwH77" node="36tQV5Au3A_" resolve="ruletemplate_token_input" />
+                            <node concept="2OqwBi" id="1laj_RSptO8" role="1iwH7V">
+                              <node concept="30H73N" id="1laj_RSptO9" role="2Oq$k0" />
+                              <node concept="2Xjw5R" id="1laj_RSptOa" role="2OqNvi">
+                                <node concept="1xMEDy" id="1laj_RSptOb" role="1xVPHs">
+                                  <node concept="chp4Y" id="1laj_RSptOc" role="ri$Ld">
+                                    <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="raruj" id="1laj_RSpumJ" role="lGtFl" />
+        </node>
+      </node>
+      <node concept="30G5F_" id="1laj_RSpt9e" role="30HLyM">
+        <node concept="3clFbS" id="1laj_RSpt9f" role="2VODD2">
+          <node concept="3clFbF" id="1laj_RSptgN" role="3cqZAp">
+            <node concept="2OqwBi" id="1laj_RSptgO" role="3clFbG">
+              <node concept="2OqwBi" id="1laj_RSptgP" role="2Oq$k0">
+                <node concept="2OqwBi" id="1laj_RSptgQ" role="2Oq$k0">
+                  <node concept="2OqwBi" id="1laj_RSptgR" role="2Oq$k0">
+                    <node concept="30H73N" id="1laj_RSptgS" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="1laj_RSptgT" role="2OqNvi">
+                      <node concept="1xMEDy" id="1laj_RSptgU" role="1xVPHs">
+                        <node concept="chp4Y" id="1laj_RSptgV" role="ri$Ld">
+                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="1laj_RSptgW" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="1laj_RSptgX" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" resolve="input" />
+                </node>
+              </node>
+              <node concept="3x8VRR" id="1laj_RSptgY" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="gft3U" id="1laj_RSpt95" role="jxRDz">
+      <node concept="10Nm6u" id="1laj_RSpt99" role="gfFT$" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index 68a03cd7..a49af51e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -94,6 +94,7 @@
     <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
     <dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
+    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 761727e0..66feb88f 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -19,9 +19,9 @@
     <import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="qgy9" ref="r:5195f849-566d-46a3-bb0a-7ae9911e2652(jetbrains.mps.logic.editor)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -5087,5 +5087,49 @@
       <node concept="l2Vlx" id="4jcOV4hEDuS" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="1laj_RSpMac">
+    <property role="3GE5qa" value="rule" />
+    <ref role="1XX52x" to="wq2x:1laj_RSpLVV" resolve="OriginSpec" />
+    <node concept="3EZMnI" id="1laj_RSpMau" role="2wV5jI">
+      <node concept="PMmxH" id="1laj_RSqwV$" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+      </node>
+      <node concept="3F0ifn" id="1laj_RSpMaF" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F1sOY" id="1laj_RSpMKz" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:1laj_RSpMKx" resolve="origin" />
+      </node>
+      <node concept="3F0ifn" id="1laj_RSpMaN" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="l2Vlx" id="1laj_RSpMax" role="2iSdaV" />
+      <node concept="3F0ifn" id="gDD6fsv" role="3EZMnx">
+        <property role="3F0ifm" value="{" />
+        <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
+        <ref role="1ERwB7" to="tpen:5qguV_rZzBJ" resolve="Delete_BlockStatement" />
+        <node concept="ljvvj" id="i0uUGyn" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F1sOY" id="giqZ3UM" role="3EZMnx">
+        <ref role="1NtTu8" to="tpee:fK9aQHS" resolve="statements" />
+        <node concept="lj46D" id="i0uUH4k" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="ljvvj" id="i0uUHXH" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="giqZ4oP" role="3EZMnx">
+        <property role="3F0ifm" value="}" />
+        <ref role="1ERwB7" to="tpen:5qguV_rZzBJ" resolve="Delete_BlockStatement" />
+        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index f35872f7..6c0ece89 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1418,5 +1418,19 @@
       <ref role="2wpffI" node="4jcOV4hu0n_" />
     </node>
   </node>
+  <node concept="1TIwiD" id="1laj_RSpLVV">
+    <property role="EcuMT" value="1534124788579507963" />
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="OriginSpec" />
+    <property role="34LRSv" value="origin" />
+    <ref role="1TJDcQ" to="tpee:fK9aQHR" resolve="BlockStatement" />
+    <node concept="1TJgyj" id="1laj_RSpMKx" role="1TKVEi">
+      <property role="IQ2ns" value="1534124788579511329" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="origin" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index f2984741..c398e240 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -1559,5 +1559,34 @@
       <ref role="1YaFvo" to="wq2x:72RDgINeSQJ" resolve="ContextRepositoryExpression" />
     </node>
   </node>
+  <node concept="1YbPZF" id="1laj_RSrNoT">
+    <property role="TrG5h" value="typeof_OriginSpec" />
+    <property role="3GE5qa" value="rule" />
+    <node concept="3clFbS" id="1laj_RSrNoU" role="18ibNy">
+      <node concept="1ZobV4" id="1laj_RSrO1L" role="3cqZAp">
+        <node concept="mw_s8" id="1laj_RSrO2w" role="1ZfhKB">
+          <node concept="2c44tf" id="1laj_RSrO2s" role="mwGJk">
+            <node concept="3Tqbb2" id="1laj_RSrO2Q" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="1laj_RSrO1O" role="1ZfhK$">
+          <node concept="1Z2H0r" id="1laj_RSrNp0" role="mwGJk">
+            <node concept="2OqwBi" id="1laj_RSrN_C" role="1Z2MuG">
+              <node concept="1YBJjd" id="1laj_RSrNqO" role="2Oq$k0">
+                <ref role="1YBMHb" node="1laj_RSrNoW" resolve="originSpec" />
+              </node>
+              <node concept="3TrEf2" id="1laj_RSrNPc" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:1laj_RSpMKx" resolve="origin" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="1laj_RSrNoW" role="1YuTPh">
+      <property role="TrG5h" value="originSpec" />
+      <ref role="1YaFvo" to="wq2x:1laj_RSpLVV" resolve="OriginSpec" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 508f6323..9ee3c2d4 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -1649,6 +1649,11 @@
             <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1laj_RSvZGh" role="3bR37C">
+          <node concept="3bR9La" id="1laj_RSvZGi" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUx9d" role="2G$12L">
         <property role="BnDLt" value="true" />