diff --git a/.mps/modules.xml b/.mps/modules.xml
index 312999c4..cd8c0554 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -45,6 +45,7 @@
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/generator/templates/jetbrains.mps.baseLanguage.methodReferencesExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/generator/templates/jetbrains.mps.baseLanguage.methodReferencesExt.generator.templates@generator.mps
index 95cfe152..a91478ad 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/generator/templates/jetbrains.mps.baseLanguage.methodReferencesExt.generator.templates@generator.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/generator/templates/jetbrains.mps.baseLanguage.methodReferencesExt.generator.templates@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
index 2a0e0b96..7edcab4b 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -47,7 +47,6 @@
         <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
         <module reference="9e36d2ee-c59c-4580-9e81-646748d0614b(jetbrains.mps.baseLanguage.closuresExt)" version="0" />
@@ -55,7 +54,6 @@
         <module reference="acfc188d-d5d6-4598-b370-6f4a983f05b2(jetbrains.mps.baseLanguage.methodReferences)" version="0" />
         <module reference="d2606676-9c22-45cc-a5bb-171443d07005(jetbrains.mps.baseLanguage.methodReferencesExt)" version="0" />
         <module reference="77d974b5-43ab-4f91-a79d-965bb8f7123c(jetbrains.mps.baseLanguage.methodReferencesExt.generator)" version="0" />
-        <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" version="0" />
         <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
@@ -68,7 +66,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
@@ -76,7 +73,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -85,7 +82,7 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="23" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
     <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
     <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
index cb3e20c3..0b0ad5c5 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
@@ -276,8 +276,8 @@
       </concept>
       <concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
         <reference id="6097203247184207800" name="template" index="3jm46O" />
-        <child id="6097203247185219723" name="argument" index="3jicU7" />
         <child id="6097203247184212024" name="logical" index="3jm6SO" />
+        <child id="32821478321731038" name="argumentBinding" index="3GayWF" />
       </concept>
       <concept id="3575255234196628445" name="jetbrains.mps.lang.coderules.structure.RequireStatement" flags="ng" index="1mebxG">
         <child id="3575255234196628696" name="node" index="1mebXD" />
@@ -296,6 +296,10 @@
         <child id="3575255234174969665" name="rule" index="1nLNNK" />
       </concept>
       <concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
+      <concept id="1697725338399423179" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraintArgumentBinding" flags="ng" index="1uXrbS">
+        <reference id="1697725338399424253" name="declaration" index="1uXrre" />
+        <child id="1697725338399424251" name="argument" index="1uXrr8" />
+      </concept>
       <concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
         <child id="7674753015762572647" name="body" index="3xSepj" />
       </concept>
@@ -992,25 +996,6 @@
                           <node concept="3Aqczg" id="6ZRhjsGe_Qj" role="3cqZAp">
                             <node concept="3jm4v3" id="6ZRhjsGe_Qk" role="3Aqpz8">
                               <ref role="3jm46O" to="kqnc:53tmmMs9igR" resolve="instantiateScheme" />
-                              <node concept="2OqwBi" id="6ZRhjsGe_Ql" role="3jicU7">
-                                <node concept="3A2sRY" id="6ZRhjsGe_Qm" role="2Oq$k0">
-                                  <ref role="3A2yKK" node="6ZRhjsG9Rrh" resolve="mr" />
-                                </node>
-                                <node concept="3TrEf2" id="6ZRhjsGe_Qn" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="506t:3gWoVHRAD21" resolve="method" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="6ZRhjsGe_Qo" role="3jicU7">
-                                <node concept="3A2sRY" id="6ZRhjsGe_Qp" role="2Oq$k0">
-                                  <ref role="3A2yKK" node="6ZRhjsG9Rrh" resolve="mr" />
-                                </node>
-                                <node concept="3Tsc0h" id="6ZRhjsGe_Qq" role="2OqNvi">
-                                  <ref role="3TtcxE" to="506t:24wQCj4sNWI" resolve="typeParameters" />
-                                </node>
-                              </node>
-                              <node concept="37vLTw" id="6ZRhjsGe_Qr" role="3jicU7">
-                                <ref role="3cqZAo" node="6ZRhjsGe0Q6" resolve="clsTVD" />
-                              </node>
                               <node concept="a7P8L" id="6ZRhjsGe_Qs" role="3jm6SO">
                                 <ref role="a7OzE" node="6ZRhjsGdVtj" resolve="MethType" />
                               </node>
@@ -1020,6 +1005,34 @@
                               <node concept="a7P8L" id="6ZRhjsGe_Ue" role="3jm6SO">
                                 <ref role="a7OzE" node="6ZRhjsGdvWI" resolve="MethCtxTVar" />
                               </node>
+                              <node concept="1uXrbS" id="2m3sq2$d0iZ" role="3GayWF">
+                                <ref role="1uXrre" to="kqnc:53tmmMs9Jdj" resolve="origin" />
+                                <node concept="2OqwBi" id="6ZRhjsGe_Ql" role="1uXrr8">
+                                  <node concept="3A2sRY" id="6ZRhjsGe_Qm" role="2Oq$k0">
+                                    <ref role="3A2yKK" node="6ZRhjsG9Rrh" resolve="mr" />
+                                  </node>
+                                  <node concept="3TrEf2" id="6ZRhjsGe_Qn" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="506t:3gWoVHRAD21" resolve="method" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="1uXrbS" id="2m3sq2$d0j0" role="3GayWF">
+                                <ref role="1uXrre" to="kqnc:53tmmMs9igS" resolve="tyArgs" />
+                                <node concept="2OqwBi" id="6ZRhjsGe_Qo" role="1uXrr8">
+                                  <node concept="3A2sRY" id="6ZRhjsGe_Qp" role="2Oq$k0">
+                                    <ref role="3A2yKK" node="6ZRhjsG9Rrh" resolve="mr" />
+                                  </node>
+                                  <node concept="3Tsc0h" id="6ZRhjsGe_Qq" role="2OqNvi">
+                                    <ref role="3TtcxE" to="506t:24wQCj4sNWI" resolve="typeParameters" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="1uXrbS" id="2m3sq2$d0j1" role="3GayWF">
+                                <ref role="1uXrre" to="kqnc:53tmmMsqySa" resolve="contextTvds" />
+                                <node concept="37vLTw" id="6ZRhjsGe_Qr" role="1uXrr8">
+                                  <ref role="3cqZAo" node="6ZRhjsGe0Q6" resolve="clsTVD" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                           <node concept="3Aqczg" id="6ZRhjsGdW31" role="3cqZAp">