diff --git a/build.xml b/build.xml
index 13c4c53e..e4118adc 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,7 @@
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
+  <property name="mps.generator.skipUnmodifiedModels" value="false" />
   
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
@@ -2391,7 +2392,7 @@
   
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
-    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}">
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -2490,7 +2491,6 @@
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
-      <library file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
       <chunk>
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" />
@@ -2726,6 +2726,7 @@
         <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.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" />
         <fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -3307,7 +3308,6 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang.sandbox" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
@@ -3318,6 +3318,7 @@
         <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="${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" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -4017,8 +4018,6 @@
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
       <pathelement location="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
       <pathelement location="${artifacts.mps}/lib/mps-behavior-api.jar" />
       <pathelement location="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -4037,7 +4036,6 @@
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
-      <pathelement location="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.coderules.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
@@ -4065,14 +4063,17 @@
       <pathelement location="${build.layout}/deploy/jetbrains.mps.typechecking.testlang.sandbox.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.tests.path.string" refid="mps.tests.path" />
+    <patternset id="plugin.deployed.jars">
+      <include name="lib/**/*.jar" />
+      <include name="languages/**/*.jar" />
+      <exclude name="**/*-src.jar" />
+    </patternset>
     <path id="long.class.path">
       <fileset dir="${artifacts.mps}/plugins/mps-core/META-INF/plugin.xml/../..">
-        <include name="lib/**/*.jar" />
-        <include name="languages/**/*.jar" />
+        <patternset refid="plugin.deployed.jars" />
       </fileset>
       <fileset dir="${artifacts.mps}/plugins/mps-testing">
-        <include name="lib/**/*.jar" />
-        <include name="languages/**/*.jar" />
+        <patternset refid="plugin.deployed.jars" />
       </fileset>
       <fileset dir="${artifacts.mps}/lib">
         <include name="**/*.jar" />
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 40bf7db6..b78bce86 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -148,7 +148,7 @@
     </language>
     <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern">
       <concept id="1136720037777" name="jetbrains.mps.lang.pattern.structure.PatternExpression" flags="in" index="2DMOqp">
-        <child id="1136720037778" name="patternNode" index="2DMOqq" />
+        <child id="9046399079000773837" name="pattern" index="HM535" />
       </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
@@ -270,6 +270,11 @@
       </concept>
       <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
     </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="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
       <concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
       <concept id="1178870617262" name="jetbrains.mps.lang.typesystem.structure.CoerceExpression" flags="nn" index="1UaxmW">
@@ -1381,20 +1386,22 @@
           <node concept="3clFbF" id="2S_ORi36b$8" role="3cqZAp">
             <node concept="2OqwBi" id="2S_ORi36b$9" role="3clFbG">
               <node concept="1UaxmW" id="7HUwyZb7b4d" role="2Oq$k0">
-                <node concept="1Yb3XT" id="7HUwyZb7b4e" role="1Ub_4A">
-                  <property role="TrG5h" value="dummy" />
-                  <node concept="2DMOqp" id="7HUwyZb7b4f" role="1YbcFS">
-                    <node concept="3uibUv" id="7HUwyZb7b4g" role="2DMOqq">
-                      <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
-                    </node>
-                  </node>
-                </node>
                 <node concept="2OqwBi" id="kTK1BflA_K" role="1Ub_4B">
                   <node concept="1iwH7S" id="kTK1BflAbH" role="2Oq$k0" />
                   <node concept="3cR$yn" id="kTK1BflANQ" role="2OqNvi">
                     <ref role="3cRzXn" node="kTK1Bfl$Pa" resolve="expressionType" />
                   </node>
                 </node>
+                <node concept="1Yb3XT" id="5yj19qb1tOP" role="1Ub_4A">
+                  <property role="TrG5h" value="dummy" />
+                  <node concept="2DMOqp" id="5yj19qb1tOR" role="1YbcFS">
+                    <node concept="2c44tf" id="5yj19qb1tOT" role="HM535">
+                      <node concept="3uibUv" id="5yj19qb1tPi" role="2c44tc">
+                        <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
               <node concept="3x8VRR" id="2S_ORi36b$k" role="2OqNvi" />
             </node>
@@ -1433,20 +1440,22 @@
           <node concept="3clFbF" id="2S_ORi36mS8" role="3cqZAp">
             <node concept="2OqwBi" id="2S_ORi36mS9" role="3clFbG">
               <node concept="1UaxmW" id="7HUwyZb7bxO" role="2Oq$k0">
-                <node concept="1Yb3XT" id="7HUwyZb7bxQ" role="1Ub_4A">
-                  <property role="TrG5h" value="dummy" />
-                  <node concept="2DMOqp" id="7HUwyZb7bxR" role="1YbcFS">
-                    <node concept="3uibUv" id="7HUwyZb7bxS" role="2DMOqq">
-                      <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                    </node>
-                  </node>
-                </node>
                 <node concept="2OqwBi" id="kTK1BflBaN" role="1Ub_4B">
                   <node concept="1iwH7S" id="kTK1BflBaO" role="2Oq$k0" />
                   <node concept="3cR$yn" id="kTK1BflBaP" role="2OqNvi">
                     <ref role="3cRzXn" node="kTK1Bfl$Pa" resolve="expressionType" />
                   </node>
                 </node>
+                <node concept="1Yb3XT" id="5yj19qb1umA" role="1Ub_4A">
+                  <property role="TrG5h" value="dummy" />
+                  <node concept="2DMOqp" id="5yj19qb1umC" role="1YbcFS">
+                    <node concept="2c44tf" id="5yj19qb1umE" role="HM535">
+                      <node concept="3uibUv" id="5yj19qb1umU" role="2c44tc">
+                        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
               <node concept="3x8VRR" id="2S_ORi36mSj" role="2OqNvi" />
             </node>
@@ -1462,20 +1471,22 @@
           <node concept="3clFbF" id="514BAS_YAHk" role="3cqZAp">
             <node concept="2OqwBi" id="514BAS_YAHl" role="3clFbG">
               <node concept="1UaxmW" id="514BAS_YAHm" role="2Oq$k0">
-                <node concept="1Yb3XT" id="514BAS_YAHo" role="1Ub_4A">
-                  <property role="TrG5h" value="dummy" />
-                  <node concept="2DMOqp" id="514BAS_YAHp" role="1YbcFS">
-                    <node concept="3uibUv" id="3mz2_dYrgHu" role="2DMOqq">
-                      <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
-                    </node>
-                  </node>
-                </node>
                 <node concept="2OqwBi" id="kTK1BflBuu" role="1Ub_4B">
                   <node concept="1iwH7S" id="kTK1BflBuv" role="2Oq$k0" />
                   <node concept="3cR$yn" id="kTK1BflBuw" role="2OqNvi">
                     <ref role="3cRzXn" node="kTK1Bfl$Pa" resolve="expressionType" />
                   </node>
                 </node>
+                <node concept="1Yb3XT" id="5yj19qb1uuv" role="1Ub_4A">
+                  <property role="TrG5h" value="dummy" />
+                  <node concept="2DMOqp" id="5yj19qb1uux" role="1YbcFS">
+                    <node concept="2c44tf" id="5yj19qb1uuz" role="HM535">
+                      <node concept="3uibUv" id="5yj19qb1uuN" role="2c44tc">
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
               <node concept="3x8VRR" id="514BAS_YAHr" role="2OqNvi" />
             </node>
@@ -1514,20 +1525,22 @@
           <node concept="3clFbF" id="kTK1BflD2$" role="3cqZAp">
             <node concept="2OqwBi" id="kTK1BflD2A" role="3clFbG">
               <node concept="1UaxmW" id="kTK1BflD2B" role="2Oq$k0">
-                <node concept="1Yb3XT" id="kTK1BflD2C" role="1Ub_4A">
-                  <property role="TrG5h" value="dummy" />
-                  <node concept="2DMOqp" id="kTK1BflD2D" role="1YbcFS">
-                    <node concept="3uibUv" id="kTK1BflD2E" role="2DMOqq">
-                      <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
-                    </node>
-                  </node>
-                </node>
                 <node concept="2OqwBi" id="kTK1BflD2F" role="1Ub_4B">
                   <node concept="1iwH7S" id="kTK1BflD2G" role="2Oq$k0" />
                   <node concept="3cR$yn" id="kTK1BflD2H" role="2OqNvi">
                     <ref role="3cRzXn" node="kTK1Bfl$Pa" resolve="expressionType" />
                   </node>
                 </node>
+                <node concept="1Yb3XT" id="5yj19qb1uFR" role="1Ub_4A">
+                  <property role="TrG5h" value="dummy" />
+                  <node concept="2DMOqp" id="5yj19qb1uFT" role="1YbcFS">
+                    <node concept="2c44tf" id="5yj19qb1uFV" role="HM535">
+                      <node concept="3uibUv" id="5yj19qb1uGh" role="2c44tc">
+                        <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
               <node concept="3x8VRR" id="kTK1BflD2I" role="2OqNvi" />
             </node>
@@ -1556,20 +1569,22 @@
           <node concept="3clFbF" id="kTK1BflDgS" role="3cqZAp">
             <node concept="2OqwBi" id="kTK1BflDgT" role="3clFbG">
               <node concept="1UaxmW" id="kTK1BflDgU" role="2Oq$k0">
-                <node concept="1Yb3XT" id="kTK1BflDgV" role="1Ub_4A">
-                  <property role="TrG5h" value="dummy" />
-                  <node concept="2DMOqp" id="kTK1BflDgW" role="1YbcFS">
-                    <node concept="3uibUv" id="kTK1BflDAp" role="2DMOqq">
-                      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
-                    </node>
-                  </node>
-                </node>
                 <node concept="2OqwBi" id="kTK1BflDgY" role="1Ub_4B">
                   <node concept="1iwH7S" id="kTK1BflDgZ" role="2Oq$k0" />
                   <node concept="3cR$yn" id="kTK1BflDh0" role="2OqNvi">
                     <ref role="3cRzXn" node="kTK1Bfl$Pa" resolve="expressionType" />
                   </node>
                 </node>
+                <node concept="1Yb3XT" id="5yj19qb1uVi" role="1Ub_4A">
+                  <property role="TrG5h" value="dummy" />
+                  <node concept="2DMOqp" id="5yj19qb1uVk" role="1YbcFS">
+                    <node concept="2c44tf" id="5yj19qb1uVm" role="HM535">
+                      <node concept="3uibUv" id="5yj19qb1uVG" role="2c44tc">
+                        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
               <node concept="3x8VRR" id="kTK1BflDh1" role="2OqNvi" />
             </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 1ec5dc5b..cf891cf0 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -316,6 +316,7 @@
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
@@ -377,12 +378,6 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
-      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
@@ -421,10 +416,6 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="5253134957341697434" name="jetbrains.mps.lang.smodel.structure.LinkNameRefExpression" flags="nn" index="prKvN">
-        <reference id="5253134957341833005" name="conceptDeclaration" index="prhl4" />
-        <reference id="5253134957341833006" name="linkDeclaration" index="prhl7" />
-      </concept>
       <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
         <child id="1138662048170" name="value" index="tz02z" />
       </concept>
@@ -441,6 +432,13 @@
       <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
         <reference id="3562215692195600259" name="link" index="13MTZf" />
       </concept>
+      <concept id="2644386474301421077" name="jetbrains.mps.lang.smodel.structure.LinkIdRefExpression" flags="nn" index="359W_D">
+        <reference id="2644386474301421078" name="conceptDeclaration" index="359W_E" />
+        <reference id="2644386474301421079" name="linkDeclaration" index="359W_F" />
+      </concept>
+      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
+        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
+      </concept>
       <concept id="5168775467716640652" name="jetbrains.mps.lang.smodel.structure.OperationParm_LinkQualifier" flags="ng" index="1aIX9F">
         <child id="5168775467716640653" name="linkQualifier" index="1aIX9E" />
       </concept>
@@ -471,9 +469,6 @@
       <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
-      <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
-        <reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -2979,30 +2974,26 @@
       <node concept="3Tqbb2" id="4hPXq9Jmeum" role="2ZBHrp" />
       <node concept="2$S_p_" id="4hPXq9Jmeun" role="2$S_pT">
         <node concept="3clFbS" id="4hPXq9Jmeuo" role="2VODD2">
-          <node concept="3SKdUt" id="4hPXq9Jmeup" role="3cqZAp">
-            <node concept="3SKdUq" id="4hPXq9Jmeuq" role="3SKWNk">
-              <property role="3SKdUp" value="see ChildSubstituteActionsHelper" />
-            </node>
-          </node>
-          <node concept="3cpWs8" id="4hPXq9Jmeur" role="3cqZAp">
-            <node concept="3cpWsn" id="4hPXq9Jmeus" role="3cpWs9">
-              <property role="TrG5h" value="srd" />
-              <node concept="3uibUv" id="4hPXq9Jmeut" role="1tU5fm">
+          <node concept="3cpWs8" id="5yj19qaZwIU" role="3cqZAp">
+            <node concept="3cpWsn" id="5yj19qaZwIV" role="3cpWs9">
+              <property role="TrG5h" value="rd" />
+              <node concept="3uibUv" id="5yj19qaZwIS" role="1tU5fm">
                 <ref role="3uigEE" to="ykok:~ReferenceDescriptor" resolve="ReferenceDescriptor" />
               </node>
-              <node concept="2YIFZM" id="4hPXq9Jmeuu" role="33vP2m">
-                <ref role="37wK5l" to="ykok:~ModelConstraints.getSmartReferenceDescriptor(org.jetbrains.mps.openapi.model.SNode,java.lang.String,int,org.jetbrains.mps.openapi.model.SNode):jetbrains.mps.smodel.constraints.ReferenceDescriptor" resolve="getSmartReferenceDescriptor" />
+              <node concept="2YIFZM" id="5yj19qaZwIW" role="33vP2m">
                 <ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
-                <node concept="3bvxqY" id="4hPXq9JmeuH" role="37wK5m" />
-                <node concept="prKvN" id="4hPXq9Jmeuw" role="37wK5m">
-                  <ref role="prhl4" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
-                  <ref role="prhl7" to="5j4j:7E86$tK_PaH" resolve="declaration" />
-                </node>
-                <node concept="3cmrfG" id="4hPXq9Jmeux" role="37wK5m">
+                <ref role="37wK5l" to="ykok:~ModelConstraints.getReferenceDescriptor(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SContainmentLink,int,org.jetbrains.mps.openapi.language.SReferenceLink,org.jetbrains.mps.openapi.language.SAbstractConcept):jetbrains.mps.smodel.constraints.ReferenceDescriptor" resolve="getReferenceDescriptor" />
+                <node concept="3bvxqY" id="5yj19qaZwIX" role="37wK5m" />
+                <node concept="10Nm6u" id="5yj19qaZKuw" role="37wK5m" />
+                <node concept="3cmrfG" id="5yj19qaZwIZ" role="37wK5m">
                   <property role="3cmrfH" value="-1" />
                 </node>
-                <node concept="3TUQnm" id="4hPXq9Jmeuy" role="37wK5m">
-                  <ref role="3TV0OU" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+                <node concept="359W_D" id="5yj19qaZKt6" role="37wK5m">
+                  <ref role="359W_E" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+                  <ref role="359W_F" to="5j4j:7E86$tK_PaH" resolve="declaration" />
+                </node>
+                <node concept="35c_gC" id="5yj19qaZKuV" role="37wK5m">
+                  <ref role="35c_gD" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                 </node>
               </node>
             </node>
@@ -3014,8 +3005,8 @@
               </node>
               <node concept="2OqwBi" id="4hPXq9JmeuB" role="10QFUP">
                 <node concept="2OqwBi" id="4hPXq9JmeuC" role="2Oq$k0">
-                  <node concept="37vLTw" id="4hPXq9JmeuD" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4hPXq9Jmeus" resolve="srd" />
+                  <node concept="37vLTw" id="5yj19qaZwUP" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5yj19qaZwIV" resolve="rd" />
                   </node>
                   <node concept="liA8E" id="4hPXq9JmeuE" role="2OqNvi">
                     <ref role="37wK5l" to="ykok:~ReferenceDescriptor.getScope():jetbrains.mps.scope.Scope" resolve="getScope" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index 42a16adc..0f7a9314 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -88,7 +88,7 @@
     </language>
     <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern">
       <concept id="1136720037777" name="jetbrains.mps.lang.pattern.structure.PatternExpression" flags="in" index="2DMOqp">
-        <child id="1136720037778" name="patternNode" index="2DMOqq" />
+        <child id="9046399079000773837" name="pattern" index="HM535" />
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
@@ -622,47 +622,6 @@
       <ref role="1YaFvo" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
     </node>
   </node>
-  <node concept="35pCF_" id="dfChU1jsd3">
-    <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="LogicalPattern_subtypeOf_logical" />
-    <node concept="3clFbS" id="dfChU1jsd4" role="2sgrp5">
-      <node concept="3SKdUt" id="dfChU1jzdK" role="3cqZAp">
-        <node concept="3SKdUq" id="dfChU1jzqi" role="3SKWNk">
-          <property role="3SKdUp" value="yes" />
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="dfChU1jtEQ" role="35pZ6h">
-      <property role="TrG5h" value="logicalType" />
-      <ref role="1YaFvo" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
-    </node>
-    <node concept="1YaCAy" id="dfChU1jtEr" role="1YuTPh">
-      <property role="TrG5h" value="ct" />
-      <ref role="1YaFvo" to="tpee:g7uibYu" resolve="ClassifierType" />
-    </node>
-    <node concept="1xSnZT" id="dfChU1jtFt" role="1xSnZW">
-      <node concept="3clFbS" id="dfChU1jtFu" role="2VODD2">
-        <node concept="3clFbF" id="dfChU1jx6v" role="3cqZAp">
-          <node concept="2OqwBi" id="dfChU1jylg" role="3clFbG">
-            <node concept="1UaxmW" id="dfChU1jx6s" role="2Oq$k0">
-              <node concept="1YBJjd" id="dfChU1jxh4" role="1Ub_4B">
-                <ref role="1YBMHb" node="dfChU1jtEr" resolve="ct" />
-              </node>
-              <node concept="1Yb3XT" id="2S_ORi36mSg" role="1Ub_4A">
-                <property role="TrG5h" value="il" />
-                <node concept="2DMOqp" id="2S_ORi36mSh" role="1YbcFS">
-                  <node concept="3uibUv" id="7HUwyZb3e5O" role="2DMOqq">
-                    <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3x8VRR" id="dfChU1jz0$" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1YbPZF" id="2c3nq4GQw_E">
     <property role="TrG5h" value="typeof_LogicalVariableReference" />
     <property role="3GE5qa" value="logical.variable" />
@@ -1347,5 +1306,48 @@
       <ref role="1YaFvo" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
     </node>
   </node>
+  <node concept="35pCF_" id="dfChU1jsd3">
+    <property role="3GE5qa" value="logical" />
+    <property role="TrG5h" value="LogicalPattern_subtypeOf_logical" />
+    <node concept="3clFbS" id="dfChU1jsd4" role="2sgrp5">
+      <node concept="3SKdUt" id="dfChU1jzdK" role="3cqZAp">
+        <node concept="3SKdUq" id="dfChU1jzqi" role="3SKWNk">
+          <property role="3SKdUp" value="yes" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="dfChU1jtEQ" role="35pZ6h">
+      <property role="TrG5h" value="logicalType" />
+      <ref role="1YaFvo" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
+    </node>
+    <node concept="1YaCAy" id="dfChU1jtEr" role="1YuTPh">
+      <property role="TrG5h" value="ct" />
+      <ref role="1YaFvo" to="tpee:g7uibYu" resolve="ClassifierType" />
+    </node>
+    <node concept="1xSnZT" id="dfChU1jtFt" role="1xSnZW">
+      <node concept="3clFbS" id="dfChU1jtFu" role="2VODD2">
+        <node concept="3clFbF" id="dfChU1jx6v" role="3cqZAp">
+          <node concept="2OqwBi" id="dfChU1jylg" role="3clFbG">
+            <node concept="1UaxmW" id="dfChU1jx6s" role="2Oq$k0">
+              <node concept="1YBJjd" id="5yj19qb1sQP" role="1Ub_4B">
+                <ref role="1YBMHb" node="dfChU1jtEr" resolve="ct" />
+              </node>
+              <node concept="1Yb3XT" id="5yj19qb1t54" role="1Ub_4A">
+                <property role="TrG5h" value="ml" />
+                <node concept="2DMOqp" id="5yj19qb1t56" role="1YbcFS">
+                  <node concept="2c44tf" id="5yj19qb1t58" role="HM535">
+                    <node concept="3uibUv" id="5yj19qb1t5o" role="2c44tc">
+                      <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3x8VRR" id="dfChU1jz0$" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index e21862c0..cda6bcc7 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -10616,7 +10616,7 @@
                           <ref role="1Pybhc" to="al1t:~MessagePool" resolve="MessagePool" />
                         </node>
                         <node concept="liA8E" id="19wqdqO101N" role="2OqNvi">
-                          <ref role="37wK5l" to="al1t:~MessagePool.addIdeFatalMessage(com.intellij.openapi.diagnostic.IdeaLoggingEvent):com.intellij.diagnostic.LogMessage" resolve="addIdeFatalMessage" />
+                          <ref role="37wK5l" to="al1t:~MessagePool.addIdeFatalMessage(com.intellij.openapi.diagnostic.IdeaLoggingEvent):void" resolve="addIdeFatalMessage" />
                           <node concept="2ShNRf" id="19wqdqO101O" role="37wK5m">
                             <node concept="1pGfFk" id="19wqdqO101P" role="2ShVmc">
                               <ref role="37wK5l" to="uzhr:~IdeaLoggingEvent.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="IdeaLoggingEvent" />
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index 1ee0c567..e9356d7b 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -20,6 +20,7 @@
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
+  <property name="mps.generator.skipUnmodifiedModels" value="false" />
   
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
@@ -45,7 +46,7 @@
   
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
-    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}">
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index 37c800d9..da8c51fe 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -20,6 +20,7 @@
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
+  <property name="mps.generator.skipUnmodifiedModels" value="false" />
   
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
@@ -55,7 +56,7 @@
   
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
-    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}">
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index 72140ce2..3437a008 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -21,6 +21,7 @@
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
+  <property name="mps.generator.skipUnmodifiedModels" value="false" />
   
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
@@ -188,7 +189,7 @@
   
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
-    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}">
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.controlflow.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
@@ -261,8 +262,6 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
       <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
       <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
       <library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -282,7 +281,6 @@
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
-      <library file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
       <chunk>
         <module file="${basedir}/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
         <module file="${basedir}/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" />
@@ -394,8 +392,8 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.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" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -454,8 +452,8 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.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" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -564,8 +562,6 @@
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
       <pathelement location="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
       <pathelement location="${artifacts.mps}/lib/mps-behavior-api.jar" />
       <pathelement location="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -584,7 +580,6 @@
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
-      <pathelement location="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.libraries.path.string" refid="mps.libraries.path" />
     <path id="mps.plugins.path">
@@ -598,14 +593,17 @@
       <pathelement location="${build.layout}/deploy/typechecking.samples.baseLanguage.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.tests.path.string" refid="mps.tests.path" />
+    <patternset id="plugin.deployed.jars">
+      <include name="lib/**/*.jar" />
+      <include name="languages/**/*.jar" />
+      <exclude name="**/*-src.jar" />
+    </patternset>
     <path id="long.class.path">
       <fileset dir="${artifacts.mps}/plugins/mps-core/META-INF/plugin.xml/../..">
-        <include name="lib/**/*.jar" />
-        <include name="languages/**/*.jar" />
+        <patternset refid="plugin.deployed.jars" />
       </fileset>
       <fileset dir="${artifacts.mps}/plugins/mps-testing">
-        <include name="lib/**/*.jar" />
-        <include name="languages/**/*.jar" />
+        <patternset refid="plugin.deployed.jars" />
       </fileset>
       <fileset dir="${artifacts.mps}/lib">
         <include name="**/*.jar" />