diff --git a/build/mpsTesting.xml b/build/mpsTesting.xml
index a7e4744a3ff5..74186adadf99 100644
--- a/build/mpsTesting.xml
+++ b/build/mpsTesting.xml
@@ -364,6 +364,7 @@
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
@@ -506,6 +507,7 @@
       <library file="${artifacts.mpsBootstrapCore}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
+      <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
diff --git a/build/tests/mpsSModel.xml b/build/tests/mpsSModel.xml
index 3f06c9b42b73..d0d02d95e0fa 100644
--- a/build/tests/mpsSModel.xml
+++ b/build/tests/mpsSModel.xml
@@ -130,8 +130,16 @@
     <echoxml file="${build.tmp}/default/jetbrains.mps.test.smodel.jar/META-INF/module.xml">
       <module namespace="jetbrains.mps.test.smodel" type="solution" uuid="494e76b6-a751-488a-8cfa-cbf8aead39e9">
         <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="c8cbf416-5e11-499c-816d-60b07b47b8c1(jetbrains.mps.lang.test.generator.rt)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
         <classpath>
           <entry path="." />
@@ -398,16 +406,16 @@
         <pathelement path="${basedir}/testbench/modules/generator-tests/smodel/test_gen/" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <fileset file="${artifacts.IDEA}/lib/hamcrest-core-1.3.jar" />
diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps
index 24cd5e590b89..2b72c4f32747 100644
--- a/plugins/mps-build/solutions/mpsBuild/models/build.mps
+++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps
@@ -30131,6 +30131,11 @@
             <ref role="3bR37D" node="4SM2EuqHUPF" resolve="jetbrains.mps.lang.modelapi" />
           </node>
         </node>
+        <node concept="1SiIV0" id="6LH9MCjQW0u" role="3bR37C">
+          <node concept="1Busua" id="6LH9MCjQW0v" role="1SiIV1">
+            <ref role="1Busuk" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
         <node concept="1yeLz9" id="3AyJARAAkVk" role="1TViLv">
           <property role="TrG5h" value="jetbrains.mps.lang.test.generator#01" />
           <property role="3LESm3" value="24e429f7-0439-4d0c-a3f8-8deb1e1e2912" />
@@ -33078,11 +33083,11 @@
           <ref role="3_I8Xa" node="1QfYSWzYzJR" resolve="vcs-platform.jar" />
         </node>
         <node concept="L2wRC" id="1QfYSWzZotz" role="39821P">
-          <ref role="L2wRA" node="4WGKd_KIwrs" resolve="jetbrains.mps.vcs.mergehints.runtime" />
+          <ref role="L2wRA" node="4WGKd_KIwrs" />
           <node concept="3yLZsm" id="1QfYSWzZMd$" role="3yL2VB">
             <property role="3yLZsk" value="../lib/vcs-core.jar" />
             <node concept="398BVA" id="1QfYSWzZMd_" role="3yLZsn">
-              <ref role="398BVh" node="6ifcnI8$2ke" resolve="mps_home" />
+              <ref role="398BVh" node="6ifcnI8$2ke" />
               <node concept="2Ry0Ak" id="1QfYSWzZMdA" role="iGT6I">
                 <property role="2Ry0Am" value="plugins" />
                 <node concept="2Ry0Ak" id="1QfYSWzZMdB" role="2Ry0An">
@@ -33099,11 +33104,11 @@
           </node>
         </node>
         <node concept="L2wRC" id="1QfYSWzZooj" role="39821P">
-          <ref role="L2wRA" node="39HJr_hyEzS" resolve="jetbrains.mps.ide.vcs.platform" />
+          <ref role="L2wRA" node="39HJr_hyEzS" />
           <node concept="3yLZsm" id="1QfYSWzZLWo" role="3yL2VB">
             <property role="3yLZsk" value="../lib/vcs-platform.jar" />
             <node concept="398BVA" id="1QfYSWzZLWp" role="3yLZsn">
-              <ref role="398BVh" node="6ifcnI8$2ke" resolve="mps_home" />
+              <ref role="398BVh" node="6ifcnI8$2ke" />
               <node concept="2Ry0Ak" id="1QfYSWzZLWq" role="iGT6I">
                 <property role="2Ry0Am" value="plugins" />
                 <node concept="2Ry0Ak" id="1QfYSWzZLWr" role="2Ry0An">
@@ -33120,11 +33125,11 @@
           </node>
         </node>
         <node concept="L2wRC" id="1QfYSWzZott" role="39821P">
-          <ref role="L2wRA" node="39HJr_hyAl1" resolve="jetbrains.mps.ide.vcs.core" />
+          <ref role="L2wRA" node="39HJr_hyAl1" />
           <node concept="3yLZsm" id="1QfYSWzZMaQ" role="3yL2VB">
             <property role="3yLZsk" value="../lib/vcs-core.jar" />
             <node concept="398BVA" id="1QfYSWzZMaR" role="3yLZsn">
-              <ref role="398BVh" node="6ifcnI8$2ke" resolve="mps_home" />
+              <ref role="398BVh" node="6ifcnI8$2ke" />
               <node concept="2Ry0Ak" id="1QfYSWzZMaS" role="iGT6I">
                 <property role="2Ry0Am" value="plugins" />
                 <node concept="2Ry0Ak" id="1QfYSWzZMaT" role="2Ry0An">
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
index 0e909634a056..e69de29bb2d1 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="bd73ubk96shdgubut9cocih3gju21il" />
-
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
index a7e4744a3ff5..74186adadf99 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
@@ -364,6 +364,7 @@
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
@@ -506,6 +507,7 @@
       <library file="${artifacts.mpsBootstrapCore}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
+      <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
       <library file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
index 3f06c9b42b73..d0d02d95e0fa 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
@@ -130,8 +130,16 @@
     <echoxml file="${build.tmp}/default/jetbrains.mps.test.smodel.jar/META-INF/module.xml">
       <module namespace="jetbrains.mps.test.smodel" type="solution" uuid="494e76b6-a751-488a-8cfa-cbf8aead39e9">
         <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="c8cbf416-5e11-499c-816d-60b07b47b8c1(jetbrains.mps.lang.test.generator.rt)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
         <classpath>
           <entry path="." />
@@ -398,16 +406,16 @@
         <pathelement path="${basedir}/testbench/modules/generator-tests/smodel/test_gen/" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <fileset file="${artifacts.IDEA}/lib/hamcrest-core-1.3.jar" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
index af06c111ee78..e69de29bb2d1 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<debug-info version="2">
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/141865155246494254">
-    <file name="mpsDataFlow.xml">
-      <unit id="141865155246494254" at="1,0,731,10" name="jetbrains.mps.ide.build.tests.mpsDataFlow" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2085316548396374793">
-    <file name="mpsImplementationStripping.xml">
-      <unit id="2085316548396374793" at="1,0,639,10" name="jetbrains.mps.ide.build.tests.mpsImplementationStripping" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2201735946498405745">
-    <file name="mpsTypesystem.xml">
-      <unit id="2201735946498405745" at="1,0,390,10" name="jetbrains.mps.ide.build.tests.mpsTypesystem" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2883693069523015134">
-    <file name="mpsConstraints.xml">
-      <unit id="2883693069523015134" at="1,0,493,10" name="jetbrains.mps.ide.build.tests.mpsConstraints" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3197190366568000187">
-    <file name="mpsBuild.xml">
-      <unit id="3197190366568000187" at="1,0,538,10" name="jetbrains.mps.ide.build.tests.mpsBuild" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3474133302908391407">
-    <file name="mpsExecution.xml">
-      <unit id="3474133302908391407" at="1,0,688,10" name="jetbrains.mps.ide.build.tests.mpsExecution" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3856853424911912638">
-    <file name="mpsEditorImageGen.xml">
-      <unit id="3856853424911912638" at="1,0,557,10" name="jetbrains.mps.ide.build.tests.mpsEditorImageGen" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4074183641147971049">
-    <file name="mpsSModel.xml">
-      <unit id="4074183641147971049" at="1,0,574,10" name="jetbrains.mps.ide.build.tests.mpsSModel" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4286050570470716727">
-    <file name="mpsText.xml">
-      <unit id="4286050570470716727" at="1,0,399,10" name="jetbrains.mps.ide.build.tests.mpsText" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5003005296035786909">
-    <file name="mpsEditorDiagram.xml">
-      <unit id="5003005296035786909" at="1,0,649,10" name="jetbrains.mps.ide.build.tests.mpsEditorDiagram" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5332690376493680136">
-    <file name="mpsSmartRefAttrMigration.xml">
-      <unit id="5332690376493680136" at="1,0,379,10" name="jetbrains.mps.ide.build.tests.mpsSmartRefAttrMigration" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5624877018229105292">
-    <file name="mpsEditorTransformationMenu.xml">
-      <unit id="5624877018229105292" at="1,0,1940,10" name="jetbrains.mps.ide.build.tests.mpsEditorTransformationMenu" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5833628797344916224">
-    <file name="mpsEditor.xml">
-      <unit id="5833628797344916224" at="1,0,1893,10" name="jetbrains.mps.ide.build.tests.mpsEditor" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5973657458022229901">
-    <file name="mpsPackaged.xml">
-      <unit id="5973657458022229901" at="1,0,497,10" name="jetbrains.mps.ide.build.tests.mpsPackaged" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6147098677962246363">
-    <file name="mpsHttpSupport.xml">
-      <unit id="6147098677962246363" at="1,0,454,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353312053">
-    <file name="mpsGenerator.xml">
-      <unit id="617882099353312053" at="1,0,1571,10" name="jetbrains.mps.ide.build.tests.mpsGenerator" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353331886">
-    <file name="mpsJava.xml">
-      <unit id="617882099353331886" at="1,0,463,10" name="jetbrains.mps.ide.build.tests.mpsJava" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6238501899265293051">
-    <file name="mpsActions.xml">
-      <unit id="6238501899265293051" at="1,0,475,10" name="jetbrains.mps.ide.build.tests.mpsActions" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7210153263370654627">
-    <file name="mpsBaseLanguage.xml">
-      <unit id="7210153263370654627" at="1,0,467,10" name="jetbrains.mps.ide.build.tests.mpsBaseLanguage" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7438002853058266164">
-    <file name="mpsBehavior.xml">
-      <unit id="7438002853058266164" at="1,0,1138,10" name="jetbrains.mps.ide.build.tests.mpsBehavior" />
-    </file>
-  </root>
-  <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/9219004022556570565">
-    <file name="mpsConsole.xml">
-      <unit id="9219004022556570565" at="1,0,457,10" name="jetbrains.mps.ide.build.tests.mpsConsole" />
-    </file>
-  </root>
-</debug-info>
-
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info
index b44dba6e4ff7..e69de29bb2d1 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<debug-info version="2">
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1392391688312941958">
-    <file name="mpsStandalone.xml">
-      <unit id="1392391688312941958" at="1,0,101,10" name="jetbrains.mps.ide.build.mpsStandalone" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1545517825663017278">
-    <file name="mpsVcs.xml">
-      <unit id="1545517825663017278" at="1,0,563,10" name="jetbrains.mps.ide.build.mpsVcs" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2002671966457711287">
-    <file name="mpsContextActionsTool.xml">
-      <unit id="2002671966457711287" at="1,0,551,10" name="jetbrains.mps.ide.build.mpsContextActionsTool" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2130197740972030755">
-    <file name="mpsVcsPlatformPre.xml">
-      <unit id="2130197740972030755" at="1,0,159,10" name="jetbrains.mps.ide.build.mpsVcsPlatformPre" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2405506926871158265">
-    <file name="jetpad.xml">
-      <unit id="2405506926871158265" at="1,0,129,10" name="jetbrains.mps.ide.build.jetpad" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2569834391839970845">
-    <file name="mpsWorkbench.xml">
-      <unit id="2569834391839970845" at="1,0,1008,10" name="jetbrains.mps.ide.build.mpsWorkbench" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4218078887717256532">
-    <file name="mpsConsolePlugin.xml">
-      <unit id="4218078887717256532" at="1,0,1454,10" name="jetbrains.mps.ide.build.mpsConsolePlugin" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4301118715654192646">
-    <file name="mps.xml">
-      <unit id="4301118715654192646" at="1,0,265,10" name="jetbrains.mps.ide.build.mps" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4301118715654497533">
-    <file name="mpsDistribution.xml">
-      <unit id="4301118715654497533" at="1,0,294,10" name="jetbrains.mps.ide.build.mpsDistribution" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4301118715654819483">
-    <file name="mpsTroveCollections.xml">
-      <unit id="4301118715654819483" at="1,0,415,10" name="jetbrains.mps.ide.build.mpsTroveCollections" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4305752832749937830">
-    <file name="mpsDiagramEditor.xml">
-      <unit id="4305752832749937830" at="1,0,835,10" name="jetbrains.mps.ide.build.mpsDiagramEditor" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/5548512857136492214">
-    <file name="mpsDevKit.xml">
-      <unit id="5548512857136492214" at="1,0,1241,10" name="jetbrains.mps.ide.build.mpsDevKit" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/5970299968953452763">
-    <file name="mpsConnectorPlugin.xml">
-      <unit id="5970299968953452763" at="1,0,89,10" name="jetbrains.mps.ide.build.mpsConnectorPlugin" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6164334420696839314">
-    <file name="mpsDebuggerPlugin.xml">
-      <unit id="6164334420696839314" at="1,0,1380,10" name="jetbrains.mps.ide.build.mpsDebuggerPlugin" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/618786790401812237">
-    <file name="mpsTesting.xml">
-      <unit id="618786790401812237" at="1,0,1182,10" name="jetbrains.mps.ide.build.mpsTesting" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6265574260762011003">
-    <file name="mpsMakePlugin.xml">
-      <unit id="6265574260762011003" at="1,0,286,10" name="jetbrains.mps.ide.build.mpsMakePlugin" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6361939271669846483">
-    <file name="mpsExecutionPlugin.xml">
-      <unit id="6361939271669846483" at="1,0,1482,10" name="jetbrains.mps.ide.build.mpsExecutionPlugin" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6391307088354381121">
-    <file name="mpsPlugins.xml">
-      <unit id="6391307088354381121" at="1,0,325,10" name="jetbrains.mps.ide.build.mpsPlugins" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6503539749405386437">
-    <file name="mpsCore.xml">
-      <unit id="6503539749405386437" at="1,0,886,10" name="jetbrains.mps.ide.build.mpsCore" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/716066598061903713">
-    <file name="Info.plist.xml">
-      <unit id="716066598061903713" at="1,0,121,8" name="jetbrains.mps.ide.build.Info$plist" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7246064732104303799">
-    <file name="mpsVcsPlatform.xml">
-      <unit id="7246064732104303799" at="1,0,437,10" name="jetbrains.mps.ide.build.mpsVcsPlatform" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7352975819312388027">
-    <file name="mpsVcsStandaloneJar.xml">
-      <unit id="7352975819312388027" at="1,0,138,10" name="jetbrains.mps.ide.build.mpsVcsStandaloneJar" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7375832234660265597">
-    <file name="mpsHttpSupportPlugin.xml">
-      <unit id="7375832234660265597" at="1,0,644,10" name="jetbrains.mps.ide.build.mpsHttpSupportPlugin" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7401958389406848608">
-    <file name="mpsJavaPlatform.xml">
-      <unit id="7401958389406848608" at="1,0,252,10" name="jetbrains.mps.ide.build.mpsJavaPlatform" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7926701909975931624">
-    <file name="mpsBootstrapCore.xml">
-      <unit id="7926701909975931624" at="1,0,15954,10" name="jetbrains.mps.ide.build.mpsBootstrapCore" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8006829063600512192">
-    <file name="mpsJavaWorkbench.xml">
-      <unit id="8006829063600512192" at="1,0,269,10" name="jetbrains.mps.ide.build.mpsJavaWorkbench" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8214399919540084172">
-    <file name="mpsMigrationCore.xml">
-      <unit id="8214399919540084172" at="1,0,117,10" name="jetbrains.mps.ide.build.mpsMigrationCore" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8214399919540087303">
-    <file name="mpsMigration.xml">
-      <unit id="8214399919540087303" at="1,0,406,10" name="jetbrains.mps.ide.build.mpsMigration" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8227093612176368028">
-    <file name="mpsBuildUI.xml">
-      <unit id="8227093612176368028" at="1,0,503,10" name="jetbrains.mps.ide.build.mpsBuildUI" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8524659923334108558">
-    <file name="mpsBuild.xml">
-      <unit id="8524659923334108558" at="1,0,1590,10" name="jetbrains.mps.ide.build.mpsBuild" />
-    </file>
-  </root>
-  <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/945136127677776238">
-    <file name="mpsMaven.xml">
-      <unit id="945136127677776238" at="1,0,49,10" name="jetbrains.mps.ide.build.mpsMaven" />
-    </file>
-  </root>
-</debug-info>
-
diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen.caches/jetbrains/mps/lang/test/generator/generated b/plugins/mps-testing/languages/gentest/generator/source_gen.caches/jetbrains/mps/lang/test/generator/generated
index cc7889b9294f..8b29412fe3b9 100644
--- a/plugins/mps-testing/languages/gentest/generator/source_gen.caches/jetbrains/mps/lang/test/generator/generated
+++ b/plugins/mps-testing/languages/gentest/generator/source_gen.caches/jetbrains/mps/lang/test/generator/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="6aiu0gmw2otb2okqs2xc2lv15jx53vi" />
+<dependencies version="2" modelHash="6z0ojspsuy83rcbp1tosenokchmwdgn" />
 
diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen.caches/main/generated b/plugins/mps-testing/languages/gentest/generator/source_gen.caches/main/generated
index d8a0db38eaac..1921d5f54039 100644
--- a/plugins/mps-testing/languages/gentest/generator/source_gen.caches/main/generated
+++ b/plugins/mps-testing/languages/gentest/generator/source_gen.caches/main/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="40mr4nb8l4u8brw9lcad3brb1258ul5" />
+<dependencies version="2" modelHash="-ew5oh8bhtby9kietlmsyd8sn7lqqpc3" />
 
diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/Generator.java b/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/Generator.java
index 379bf0f1ba40..c6ebebcb1c63 100644
--- a/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/Generator.java
+++ b/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/Generator.java
@@ -34,9 +34,10 @@ protected void fillTemplateModels(TemplateModuleInterpreted2.TemplateModels mode
 
   @Override
   public Collection<SLanguage> getTargetLanguages() {
-    SLanguage[] rv = new SLanguage[2];
+    SLanguage[] rv = new SLanguage[3];
     rv[0] = MetaAdapterFactory.getLanguage(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, "jetbrains.mps.baseLanguage");
-    rv[1] = MetaAdapterFactory.getLanguage(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, "jetbrains.mps.lang.smodel");
+    rv[1] = MetaAdapterFactory.getLanguage(0x63650c5916c8498aL, 0x99c8005c7ee9515dL, "jetbrains.mps.lang.access");
+    rv[2] = MetaAdapterFactory.getLanguage(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, "jetbrains.mps.lang.smodel");
     return Arrays.asList(rv);
   }
 
diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/trace.info b/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/trace.info
index 7bb3463325b5..36e76cc42e05 100644
--- a/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/trace.info
+++ b/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root>
     <file name="Generator.java">
-      <unit at="17,0,44,0" name="jetbrains.mps.lang.test.generator.Generator" />
+      <unit at="17,0,45,0" name="jetbrains.mps.lang.test.generator.Generator" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen/main/QueriesGenerated.java b/plugins/mps-testing/languages/gentest/generator/source_gen/main/QueriesGenerated.java
index 75282e1d8f2b..2f3489d0a243 100644
--- a/plugins/mps-testing/languages/gentest/generator/source_gen/main/QueriesGenerated.java
+++ b/plugins/mps-testing/languages/gentest/generator/source_gen/main/QueriesGenerated.java
@@ -36,20 +36,28 @@ public class QueriesGenerated extends QueryProviderBase {
   public QueriesGenerated() {
     super(1);
   }
-  public static Object propertyMacro_GetValue_1_0(final PropertyMacroContext _context) {
+  public static Object propertyMacro_GetValue_0_0(final PropertyMacroContext _context) {
     // XXX would prefer template.input to reference GeneratorTest instead of node.parent 
     return _context.createIndexedName(_context.getTemplateValue(), SNodeOperations.getParent(_context.getNode()), false);
   }
-  public static Object propertyMacro_GetValue_1_1(final PropertyMacroContext _context) {
+  public static Object propertyMacro_GetValue_0_1(final PropertyMacroContext _context) {
     return ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d060L, "referenceModels"))).count();
   }
-  public static Object propertyMacro_GetValue_1_2(final PropertyMacroContext _context) {
+  public static Object propertyMacro_GetValue_0_2(final PropertyMacroContext _context) {
     // XXX would prefer template.input to reference GeneratorTest instead of node.parent 
     // XXX don't use templateValue as I'd like the name of the method to be the same for both single and multiple match 
     //     Just to avoid complicated hack with method name in GneratorTestWrapper 
     return _context.createIndexedName("testTransformAndMatch", SNodeOperations.getParent(_context.getNode()), false);
   }
-  public static Object propertyMacro_GetValue_1_3(final PropertyMacroContext _context) {
+  public static Object propertyMacro_GetValue_0_3(final PropertyMacroContext _context) {
+    // XXX would prefer template.input to reference GeneratorTest instead of node.parent 
+    return _context.createIndexedName(_context.getTemplateValue(), SNodeOperations.getParent(_context.getNode()), false);
+  }
+  public static Object propertyMacro_GetValue_1_0(final PropertyMacroContext _context) {
+    // XXX would prefer template.input to reference GeneratorTest instead of node.parent 
+    return _context.createIndexedName(_context.getTemplateValue(), SNodeOperations.getParent(_context.getNode()), false);
+  }
+  public static Object propertyMacro_GetValue_1_1(final PropertyMacroContext _context) {
     return SPropertyOperations.getString(_context.getNode(), MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"));
   }
   public static Object propertyMacro_GetValue_2_0(final PropertyMacroContext _context) {
@@ -59,35 +67,51 @@ public static Object propertyMacro_GetValue_2_0(final PropertyMacroContext _cont
   public static Object propertyMacro_GetValue_3_0(final PropertyMacroContext _context) {
     return PersistenceFacade.getInstance().asString(ModelIdentity__BehaviorDescriptor.toModelReference_id1Bs_61$mvvu.invoke(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf09c6eL, 0x7b1db36ecf09c72L, "param"))));
   }
-  public static Object referenceMacro_GetReferent_1_0(final ReferenceMacroContext _context) {
+  public static Object referenceMacro_GetReferent_0_0(final ReferenceMacroContext _context) {
     return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, 0x7b1db36ecf0d05eL, "inputModel")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field");
   }
-  public static Object referenceMacro_GetReferent_1_1(final ReferenceMacroContext _context) {
+  public static Object referenceMacro_GetReferent_0_1(final ReferenceMacroContext _context) {
     return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, 0x7b1db36ecf0d063L, "transformationPlan")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field");
 
   }
-  public static Object referenceMacro_GetReferent_1_2(final ReferenceMacroContext _context) {
+  public static Object referenceMacro_GetReferent_0_2(final ReferenceMacroContext _context) {
     return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, 0x7b1db36ecf0d060L, "referenceModel")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field");
   }
-  public static Object referenceMacro_GetReferent_1_3(final ReferenceMacroContext _context) {
+  public static Object referenceMacro_GetReferent_0_3(final ReferenceMacroContext _context) {
     return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d05eL, "inputModel")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field");
   }
-  public static Object referenceMacro_GetReferent_1_4(final ReferenceMacroContext _context) {
+  public static Object referenceMacro_GetReferent_0_4(final ReferenceMacroContext _context) {
     return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d063L, "transformationPlan")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field");
 
   }
-  public static Object referenceMacro_GetReferent_1_5(final ReferenceMacroContext _context) {
+  public static Object referenceMacro_GetReferent_0_5(final ReferenceMacroContext _context) {
     return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field");
   }
+  public static Object referenceMacro_GetReferent_0_6(final ReferenceMacroContext _context) {
+    return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346acL, "inputModel")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field");
+  }
+  public static Object referenceMacro_GetReferent_0_7(final ReferenceMacroContext _context) {
+    return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field");
+
+  }
   public static Object referenceMacro_GetReferent_3_0(final ReferenceMacroContext _context) {
     return _context.getOutputNodeByInputNodeAndMappingLabel(_context.getNode(), "TestArg2Field");
   }
-  public static boolean ifMacro_Condition_1_0(final IfMacroContext _context) {
+  public static boolean ifMacro_Condition_0_0(final IfMacroContext _context) {
     return (SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, 0x7b1db36ecf0d063L, "transformationPlan")) != null);
   }
-  public static boolean ifMacro_Condition_1_1(final IfMacroContext _context) {
+  public static boolean ifMacro_Condition_0_1(final IfMacroContext _context) {
     return (SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d063L, "transformationPlan")) != null);
   }
+  public static boolean ifMacro_Condition_0_2(final IfMacroContext _context) {
+    return (SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan")) != null);
+  }
+  public static Iterable<SNode> sourceNodesQuery_0_0(final SourceSubstituteMacroNodesContext _context) {
+    return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d060L, "referenceModels"));
+  }
+  public static Iterable<SNode> sourceNodesQuery_0_1(final SourceSubstituteMacroNodesContext _context) {
+    return SLinkOperations.getChildren(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d36ef9L, "assertions")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x108bbca0f48L, 0x108bbd29b4aL, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"));
+  }
   public static Iterable<SNode> sourceNodesQuery_1_0(final SourceSubstituteMacroNodesContext _context) {
     return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf09c67L, "arguments"));
   }
@@ -95,22 +119,16 @@ public static Iterable<SNode> sourceNodesQuery_1_1(final SourceSubstituteMacroNo
     return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf09c67L, "arguments"));
   }
   public static Iterable<SNode> sourceNodesQuery_1_2(final SourceSubstituteMacroNodesContext _context) {
-    return SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf0d067L, "tests")), MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, "jetbrains.mps.lang.test.generator.structure.TransformationMatchAssertion"));
-  }
-  public static Iterable<SNode> sourceNodesQuery_1_3(final SourceSubstituteMacroNodesContext _context) {
-    return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d060L, "referenceModels"));
-  }
-  public static Iterable<SNode> sourceNodesQuery_1_4(final SourceSubstituteMacroNodesContext _context) {
-    return SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf0d067L, "tests")), MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, "jetbrains.mps.lang.test.generator.structure.TransformationMatchManyAssertion"));
+    return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf0d067L, "tests"));
   }
   private final Map<String, SourceNodesQuery> snsqMethods = new HashMap<String, SourceNodesQuery>();
   {
     int i = 0;
+    snsqMethods.put("6346338635721396810", new QueriesGenerated.SNsQ(i++));
+    snsqMethods.put("7812943990232824646", new QueriesGenerated.SNsQ(i++));
     snsqMethods.put("7985317431307037803", new QueriesGenerated.SNsQ(i++));
     snsqMethods.put("7985317431307068138", new QueriesGenerated.SNsQ(i++));
-    snsqMethods.put("7985317431306988014", new QueriesGenerated.SNsQ(i++));
-    snsqMethods.put("6346338635721396810", new QueriesGenerated.SNsQ(i++));
-    snsqMethods.put("6346338635721222539", new QueriesGenerated.SNsQ(i++));
+    snsqMethods.put("7812943990232109188", new QueriesGenerated.SNsQ(i++));
   }
   @NotNull
   @Override
@@ -130,15 +148,15 @@ public SNsQ(int methodKey) {
     public Collection<SNode> evaluate(@NotNull SourceSubstituteMacroNodesContext ctx) throws GenerationFailureException {
       switch (methodKey) {
         case 0:
-          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_0(ctx));
+          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_0_0(ctx));
         case 1:
-          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_1(ctx));
+          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_0_1(ctx));
         case 2:
-          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_2(ctx));
+          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_0(ctx));
         case 3:
-          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_3(ctx));
+          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_1(ctx));
         case 4:
-          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_4(ctx));
+          return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_2(ctx));
         default:
           throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no method for query %s (key: #%d)", ctx.getTemplateReference(), methodKey));
       }
@@ -147,9 +165,11 @@ public Collection<SNode> evaluate(@NotNull SourceSubstituteMacroNodesContext ctx
   private final Map<String, PropertyValueQuery> pvqMethods = new HashMap<String, PropertyValueQuery>();
   {
     int i = 0;
-    pvqMethods.put("7985317431306989793", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatch"));
+    pvqMethods.put("7812943990232128388", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatch"));
     pvqMethods.put("6346338635721331627", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc59b314L, 0xf8cc59b315L, "value"), "3"));
     pvqMethods.put("6346338635721222548", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatchMany"));
+    pvqMethods.put("7812943990232644236", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatch"));
+    pvqMethods.put("7812943990232097779", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatch"));
     pvqMethods.put("2681075272524333361", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "GeneratorTestClass"));
     pvqMethods.put("7985317431307070194", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "myArg"));
     pvqMethods.put("7985317431307775128", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf93d565d10L, 0xf93d565d11L, "value"), ""));
@@ -173,16 +193,20 @@ private static class PVQ extends PropertyValueQuery.Base {
     public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailureException {
       switch (methodKey) {
         case 0:
-          return QueriesGenerated.propertyMacro_GetValue_1_0(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_0_0(ctx);
         case 1:
-          return QueriesGenerated.propertyMacro_GetValue_1_1(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_0_1(ctx);
         case 2:
-          return QueriesGenerated.propertyMacro_GetValue_1_2(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_0_2(ctx);
         case 3:
-          return QueriesGenerated.propertyMacro_GetValue_1_3(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_0_3(ctx);
         case 4:
-          return QueriesGenerated.propertyMacro_GetValue_2_0(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_1_0(ctx);
         case 5:
+          return QueriesGenerated.propertyMacro_GetValue_1_1(ctx);
+        case 6:
+          return QueriesGenerated.propertyMacro_GetValue_2_0(ctx);
+        case 7:
           return QueriesGenerated.propertyMacro_GetValue_3_0(ctx);
         default:
           throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no method for query %s (key: #%d)", ctx.getTemplateReference(), methodKey));
@@ -192,8 +216,9 @@ public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailu
   private final Map<String, IfMacroCondition> imcMethods = new HashMap<String, IfMacroCondition>();
   {
     int i = 0;
-    imcMethods.put("7985317431307213918", new QueriesGenerated.IfMC(i++));
+    imcMethods.put("7812943990232128342", new QueriesGenerated.IfMC(i++));
     imcMethods.put("6346338635721222502", new QueriesGenerated.IfMC(i++));
+    imcMethods.put("7812943990232644200", new QueriesGenerated.IfMC(i++));
   }
   @NotNull
   @Override
@@ -213,9 +238,11 @@ public IfMC(int methodKey) {
     public boolean check(@NotNull IfMacroContext ctx) throws GenerationFailureException {
       switch (methodKey) {
         case 0:
-          return QueriesGenerated.ifMacro_Condition_1_0(ctx);
+          return QueriesGenerated.ifMacro_Condition_0_0(ctx);
         case 1:
-          return QueriesGenerated.ifMacro_Condition_1_1(ctx);
+          return QueriesGenerated.ifMacro_Condition_0_1(ctx);
+        case 2:
+          return QueriesGenerated.ifMacro_Condition_0_2(ctx);
         default:
           throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no condition method for if macro %s (key: #%d)", ctx.getTemplateReference(), methodKey));
       }
@@ -223,13 +250,15 @@ public boolean check(@NotNull IfMacroContext ctx) throws GenerationFailureExcept
   }
   private final Map<String, ReferenceTargetQuery> rtqMethods = new HashMap<String, ReferenceTargetQuery>();
   {
-    rtqMethods.put("7985317431307113950", new QueriesGenerated.RTQ(0, "f"));
-    rtqMethods.put("7985317431307194769", new QueriesGenerated.RTQ(1, "f"));
-    rtqMethods.put("7985317431307179476", new QueriesGenerated.RTQ(2, "f"));
-    rtqMethods.put("6346338635721222466", new QueriesGenerated.RTQ(3, "f"));
+    rtqMethods.put("7812943990232128306", new QueriesGenerated.RTQ(0, "mdl"));
+    rtqMethods.put("7812943990232128329", new QueriesGenerated.RTQ(1, "f"));
+    rtqMethods.put("7812943990232128359", new QueriesGenerated.RTQ(2, "mdl"));
+    rtqMethods.put("6346338635721222466", new QueriesGenerated.RTQ(3, "mdl"));
     rtqMethods.put("6346338635721222489", new QueriesGenerated.RTQ(4, "f"));
     rtqMethods.put("6346338635721388511", new QueriesGenerated.RTQ(5, "f"));
-    rtqMethods.put("7985317431307754088", new QueriesGenerated.RTQ(6, "f"));
+    rtqMethods.put("7812943990232644164", new QueriesGenerated.RTQ(6, "mdl"));
+    rtqMethods.put("7812943990232644187", new QueriesGenerated.RTQ(7, "f"));
+    rtqMethods.put("7985317431307754088", new QueriesGenerated.RTQ(8, "f"));
   }
   @NotNull
   @Override
@@ -250,18 +279,22 @@ private static class RTQ extends ReferenceTargetQuery.Base {
     public Object evaluate(@NotNull ReferenceMacroContext ctx) throws GenerationFailureException {
       switch (methodKey) {
         case 0:
-          return QueriesGenerated.referenceMacro_GetReferent_1_0(ctx);
+          return QueriesGenerated.referenceMacro_GetReferent_0_0(ctx);
         case 1:
-          return QueriesGenerated.referenceMacro_GetReferent_1_1(ctx);
+          return QueriesGenerated.referenceMacro_GetReferent_0_1(ctx);
         case 2:
-          return QueriesGenerated.referenceMacro_GetReferent_1_2(ctx);
+          return QueriesGenerated.referenceMacro_GetReferent_0_2(ctx);
         case 3:
-          return QueriesGenerated.referenceMacro_GetReferent_1_3(ctx);
+          return QueriesGenerated.referenceMacro_GetReferent_0_3(ctx);
         case 4:
-          return QueriesGenerated.referenceMacro_GetReferent_1_4(ctx);
+          return QueriesGenerated.referenceMacro_GetReferent_0_4(ctx);
         case 5:
-          return QueriesGenerated.referenceMacro_GetReferent_1_5(ctx);
+          return QueriesGenerated.referenceMacro_GetReferent_0_5(ctx);
         case 6:
+          return QueriesGenerated.referenceMacro_GetReferent_0_6(ctx);
+        case 7:
+          return QueriesGenerated.referenceMacro_GetReferent_0_7(ctx);
+        case 8:
           return QueriesGenerated.referenceMacro_GetReferent_3_0(ctx);
         default:
           throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no method for query %s (key: #%d)", ctx.getTemplateReference(), methodKey));
diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen/main/trace.info b/plugins/mps-testing/languages/gentest/generator/source_gen/main/trace.info
index 936b15f32885..b2db166de200 100644
--- a/plugins/mps-testing/languages/gentest/generator/source_gen/main/trace.info
+++ b/plugins/mps-testing/languages/gentest/generator/source_gen/main/trace.info
@@ -7,208 +7,260 @@
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1081236700938:jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
   <root>
     <file name="QueriesGenerated.java">
-      <unit at="207,0,224,0" name="main.QueriesGenerated$IfMC" />
-      <unit at="124,0,147,0" name="main.QueriesGenerated$SNsQ" />
-      <unit at="166,0,192,0" name="main.QueriesGenerated$PVQ" />
-      <unit at="243,0,271,0" name="main.QueriesGenerated$RTQ" />
-      <unit at="34,0,272,0" name="main.QueriesGenerated" />
+      <unit at="232,0,251,0" name="main.QueriesGenerated$IfMC" />
+      <unit at="142,0,165,0" name="main.QueriesGenerated$SNsQ" />
+      <unit at="186,0,216,0" name="main.QueriesGenerated$PVQ" />
+      <unit at="272,0,304,0" name="main.QueriesGenerated$RTQ" />
+      <unit at="34,0,305,0" name="main.QueriesGenerated" />
     </file>
   </root>
-  <root nodeRef="r:31166abf-6347-416d-8581-1bd201a97b8f(main@generator)/554465258093227637">
+  <root nodeRef="r:31166abf-6347-416d-8581-1bd201a97b8f(main@generator)/554465258093140497">
     <file name="QueriesGenerated.java">
-      <node id="7985317431307035524" at="39,88,40,89" concept="2" />
-      <node id="7985317431306990958" at="40,89,41,121" concept="1" />
+      <node id="7812943990232128391" at="39,88,40,89" concept="2" />
+      <node id="7812943990232128393" at="40,89,41,121" concept="1" />
       <node id="6346338635721336184" at="43,88,44,231" concept="1" />
       <node id="6346338635721222551" at="46,88,47,89" concept="2" />
       <node id="4727632598642902757" at="47,89,48,120" concept="2" />
       <node id="4727632598642904373" at="48,120,49,82" concept="2" />
       <node id="6346338635721222553" at="49,82,50,117" concept="1" />
-      <node id="2681075272524333371" at="52,88,53,175" concept="1" />
-      <node id="7985317431307115123" at="62,93,63,412" concept="1" />
-      <node id="7985317431307195952" at="65,93,66,420" concept="1" />
-      <node id="7985317431307200290" at="66,420,67,0" concept="3" />
-      <node id="7985317431307181826" at="69,93,70,416" concept="1" />
-      <node id="6346338635721222469" at="72,93,73,413" concept="1" />
-      <node id="6346338635721222492" at="75,93,76,421" concept="1" />
-      <node id="6346338635721222501" at="76,421,77,0" concept="3" />
-      <node id="6346338635721394455" at="79,93,80,250" concept="1" />
-      <node id="7985317431307217665" at="85,78,86,210" concept="1" />
-      <node id="6346338635721222505" at="88,78,89,211" concept="1" />
-      <node id="7985317431307037810" at="91,104,92,193" concept="1" />
-      <node id="7985317431307068145" at="94,104,95,193" concept="1" />
-      <node id="7985317431306988021" at="97,104,98,385" concept="1" />
-      <node id="6346338635721396817" at="100,104,101,200" concept="1" />
-      <node id="6346338635721222541" at="103,104,104,390" concept="1" />
-      <node id="7985317431307037803" at="108,14,109,75" concept="0" />
-      <node id="7985317431307068138" at="109,75,110,75" concept="0" />
-      <node id="7985317431306988014" at="110,75,111,75" concept="0" />
-      <node id="6346338635721396810" at="111,75,112,75" concept="0" />
-      <node id="6346338635721222539" at="112,75,113,75" concept="0" />
-      <node id="7985317431307037803" at="132,15,133,87" concept="1" />
-      <node id="7985317431307068138" at="134,15,135,87" concept="1" />
-      <node id="7985317431306988014" at="136,15,137,87" concept="1" />
-      <node id="6346338635721396810" at="138,15,139,87" concept="1" />
-      <node id="6346338635721222539" at="140,15,141,87" concept="1" />
-      <node id="7985317431306989793" at="149,14,150,212" concept="0" />
-      <node id="6346338635721331627" at="150,212,151,191" concept="0" />
-      <node id="6346338635721222548" at="151,191,152,216" concept="0" />
-      <node id="2681075272524333361" at="152,216,153,209" concept="0" />
-      <node id="7985317431306989793" at="175,15,176,66" concept="1" />
-      <node id="6346338635721331627" at="177,15,178,66" concept="1" />
-      <node id="6346338635721222548" at="179,15,180,66" concept="1" />
-      <node id="2681075272524333361" at="181,15,182,66" concept="1" />
-      <node id="7985317431307213918" at="194,14,195,74" concept="0" />
-      <node id="6346338635721222502" at="195,74,196,74" concept="0" />
-      <node id="7985317431307213918" at="215,15,216,61" concept="1" />
-      <node id="6346338635721222502" at="217,15,218,61" concept="1" />
-      <node id="7985317431307113950" at="225,3,226,76" concept="0" />
-      <node id="7985317431307194769" at="226,76,227,76" concept="0" />
-      <node id="7985317431307179476" at="227,76,228,76" concept="0" />
-      <node id="6346338635721222466" at="228,76,229,76" concept="0" />
-      <node id="6346338635721222489" at="229,76,230,76" concept="0" />
-      <node id="6346338635721388511" at="230,76,231,76" concept="0" />
-      <node id="7985317431307113950" at="252,15,253,70" concept="1" />
-      <node id="7985317431307194769" at="254,15,255,70" concept="1" />
-      <node id="7985317431307179476" at="256,15,257,70" concept="1" />
-      <node id="6346338635721222466" at="258,15,259,70" concept="1" />
-      <node id="6346338635721222489" at="260,15,261,70" concept="1" />
-      <node id="6346338635721388511" at="262,15,263,70" concept="1" />
-      <node id="6346338635721331628" at="43,0,46,0" concept="4" trace="propertyMacro_GetValue_1_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="2681075272524333364" at="52,0,55,0" concept="4" trace="propertyMacro_GetValue_1_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="7985317431307113951" at="62,0,65,0" concept="4" trace="referenceMacro_GetReferent_1_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="7985317431307179477" at="69,0,72,0" concept="4" trace="referenceMacro_GetReferent_1_2#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="6346338635721222467" at="72,0,75,0" concept="4" trace="referenceMacro_GetReferent_1_3#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="6346338635721388512" at="79,0,82,0" concept="4" trace="referenceMacro_GetReferent_1_5#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="7985317431307213920" at="85,0,88,0" concept="4" trace="ifMacro_Condition_1_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6346338635721222503" at="88,0,91,0" concept="4" trace="ifMacro_Condition_1_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7985317431307037803" at="91,0,94,0" concept="4" trace="sourceNodesQuery_1_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="7985317431307068138" at="94,0,97,0" concept="4" trace="sourceNodesQuery_1_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="7985317431306988014" at="97,0,100,0" concept="4" trace="sourceNodesQuery_1_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="6346338635721396810" at="100,0,103,0" concept="4" trace="sourceNodesQuery_1_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="6346338635721222539" at="103,0,106,0" concept="4" trace="sourceNodesQuery_1_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="7985317431306989794" at="39,0,43,0" concept="4" trace="propertyMacro_GetValue_1_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="7985317431307194770" at="65,0,69,0" concept="4" trace="referenceMacro_GetReferent_1_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="6346338635721222490" at="75,0,79,0" concept="4" trace="referenceMacro_GetReferent_1_4#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="6346338635721222549" at="46,0,52,0" concept="4" trace="propertyMacro_GetValue_1_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7812943990232644239" at="52,88,53,89" concept="2" />
+      <node id="7812943990232644241" at="53,89,54,121" concept="1" />
+      <node id="7812943990232128309" at="70,93,71,412" concept="1" />
+      <node id="7812943990232128332" at="73,93,74,420" concept="1" />
+      <node id="7812943990232128341" at="74,420,75,0" concept="3" />
+      <node id="7812943990232128362" at="77,93,78,416" concept="1" />
+      <node id="6346338635721222469" at="80,93,81,413" concept="1" />
+      <node id="6346338635721222492" at="83,93,84,421" concept="1" />
+      <node id="6346338635721222501" at="84,421,85,0" concept="3" />
+      <node id="6346338635721394455" at="87,93,88,250" concept="1" />
+      <node id="7812943990232644167" at="90,93,91,414" concept="1" />
+      <node id="7812943990232644190" at="93,93,94,422" concept="1" />
+      <node id="7812943990232644199" at="94,422,95,0" concept="3" />
+      <node id="7812943990232128345" at="100,78,101,210" concept="1" />
+      <node id="6346338635721222505" at="103,78,104,211" concept="1" />
+      <node id="7812943990232644203" at="106,78,107,212" concept="1" />
+      <node id="6346338635721396817" at="109,104,110,200" concept="1" />
+      <node id="7812943990232831659" at="112,104,113,495" concept="1" />
+      <node id="6346338635721396810" at="126,14,127,75" concept="0" />
+      <node id="7812943990232824646" at="127,75,128,75" concept="0" />
+      <node id="6346338635721396810" at="150,15,151,87" concept="1" />
+      <node id="7812943990232824646" at="152,15,153,87" concept="1" />
+      <node id="7812943990232128388" at="167,14,168,212" concept="0" />
+      <node id="6346338635721331627" at="168,212,169,191" concept="0" />
+      <node id="6346338635721222548" at="169,191,170,216" concept="0" />
+      <node id="7812943990232644236" at="170,216,171,212" concept="0" />
+      <node id="7812943990232128388" at="195,15,196,66" concept="1" />
+      <node id="6346338635721331627" at="197,15,198,66" concept="1" />
+      <node id="6346338635721222548" at="199,15,200,66" concept="1" />
+      <node id="7812943990232644236" at="201,15,202,66" concept="1" />
+      <node id="7812943990232128342" at="218,14,219,74" concept="0" />
+      <node id="6346338635721222502" at="219,74,220,74" concept="0" />
+      <node id="7812943990232644200" at="220,74,221,74" concept="0" />
+      <node id="7812943990232128342" at="240,15,241,61" concept="1" />
+      <node id="6346338635721222502" at="242,15,243,61" concept="1" />
+      <node id="7812943990232644200" at="244,15,245,61" concept="1" />
+      <node id="7812943990232128306" at="252,3,253,78" concept="0" />
+      <node id="7812943990232128329" at="253,78,254,76" concept="0" />
+      <node id="7812943990232128359" at="254,76,255,78" concept="0" />
+      <node id="6346338635721222466" at="255,78,256,78" concept="0" />
+      <node id="6346338635721222489" at="256,78,257,76" concept="0" />
+      <node id="6346338635721388511" at="257,76,258,76" concept="0" />
+      <node id="7812943990232644164" at="258,76,259,78" concept="0" />
+      <node id="7812943990232644187" at="259,78,260,76" concept="0" />
+      <node id="7812943990232128306" at="281,15,282,70" concept="1" />
+      <node id="7812943990232128329" at="283,15,284,70" concept="1" />
+      <node id="7812943990232128359" at="285,15,286,70" concept="1" />
+      <node id="6346338635721222466" at="287,15,288,70" concept="1" />
+      <node id="6346338635721222489" at="289,15,290,70" concept="1" />
+      <node id="6346338635721388511" at="291,15,292,70" concept="1" />
+      <node id="7812943990232644164" at="293,15,294,70" concept="1" />
+      <node id="7812943990232644187" at="295,15,296,70" concept="1" />
+      <node id="6346338635721331628" at="43,0,46,0" concept="4" trace="propertyMacro_GetValue_0_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7812943990232128307" at="70,0,73,0" concept="4" trace="referenceMacro_GetReferent_0_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="7812943990232128360" at="77,0,80,0" concept="4" trace="referenceMacro_GetReferent_0_2#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="6346338635721222467" at="80,0,83,0" concept="4" trace="referenceMacro_GetReferent_0_3#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="6346338635721388512" at="87,0,90,0" concept="4" trace="referenceMacro_GetReferent_0_5#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="7812943990232644165" at="90,0,93,0" concept="4" trace="referenceMacro_GetReferent_0_6#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="7812943990232128343" at="100,0,103,0" concept="4" trace="ifMacro_Condition_0_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6346338635721222503" at="103,0,106,0" concept="4" trace="ifMacro_Condition_0_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7812943990232644201" at="106,0,109,0" concept="4" trace="ifMacro_Condition_0_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6346338635721396810" at="109,0,112,0" concept="4" trace="sourceNodesQuery_0_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7812943990232824646" at="112,0,115,0" concept="4" trace="sourceNodesQuery_0_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7812943990232128389" at="39,0,43,0" concept="4" trace="propertyMacro_GetValue_0_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7812943990232644237" at="52,0,56,0" concept="4" trace="propertyMacro_GetValue_0_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7812943990232128330" at="73,0,77,0" concept="4" trace="referenceMacro_GetReferent_0_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="6346338635721222490" at="83,0,87,0" concept="4" trace="referenceMacro_GetReferent_0_4#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="7812943990232644188" at="93,0,97,0" concept="4" trace="referenceMacro_GetReferent_0_7#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="6346338635721222549" at="46,0,52,0" concept="4" trace="propertyMacro_GetValue_0_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <scope id="6346338635721331629" at="43,88,44,231" />
-      <scope id="2681075272524333365" at="52,88,53,175" />
-      <scope id="7985317431307113952" at="62,93,63,412" />
-      <scope id="7985317431307179478" at="69,93,70,416" />
-      <scope id="6346338635721222468" at="72,93,73,413" />
-      <scope id="6346338635721388513" at="79,93,80,250" />
-      <scope id="7985317431307213922" at="85,78,86,210" />
-      <scope id="6346338635721222504" at="88,78,89,211" />
-      <scope id="7985317431307037804" at="91,104,92,193" />
-      <scope id="7985317431307068139" at="94,104,95,193" />
-      <scope id="7985317431306988015" at="97,104,98,385" />
-      <scope id="6346338635721396811" at="100,104,101,200" />
-      <scope id="6346338635721222540" at="103,104,104,390" />
-      <scope id="7985317431307037803" at="132,15,133,87" />
-      <scope id="7985317431307068138" at="134,15,135,87" />
-      <scope id="7985317431306988014" at="136,15,137,87" />
-      <scope id="6346338635721396810" at="138,15,139,87" />
-      <scope id="6346338635721222539" at="140,15,141,87" />
-      <scope id="7985317431306989793" at="175,15,176,66" />
-      <scope id="6346338635721331627" at="177,15,178,66" />
-      <scope id="6346338635721222548" at="179,15,180,66" />
-      <scope id="2681075272524333361" at="181,15,182,66" />
-      <scope id="7985317431307213918" at="215,15,216,61" />
-      <scope id="6346338635721222502" at="217,15,218,61" />
-      <scope id="7985317431307113950" at="252,15,253,70" />
-      <scope id="7985317431307194769" at="254,15,255,70" />
-      <scope id="7985317431307179476" at="256,15,257,70" />
-      <scope id="6346338635721222466" at="258,15,259,70" />
-      <scope id="6346338635721222489" at="260,15,261,70" />
-      <scope id="6346338635721388511" at="262,15,263,70" />
-      <scope id="7985317431306989795" at="39,88,41,121" />
-      <scope id="7985317431307194771" at="65,93,67,0" />
-      <scope id="6346338635721222491" at="75,93,77,0" />
+      <scope id="7812943990232128308" at="70,93,71,412" />
+      <scope id="7812943990232128361" at="77,93,78,416" />
+      <scope id="6346338635721222468" at="80,93,81,413" />
+      <scope id="6346338635721388513" at="87,93,88,250" />
+      <scope id="7812943990232644166" at="90,93,91,414" />
+      <scope id="7812943990232128344" at="100,78,101,210" />
+      <scope id="6346338635721222504" at="103,78,104,211" />
+      <scope id="7812943990232644202" at="106,78,107,212" />
+      <scope id="6346338635721396811" at="109,104,110,200" />
+      <scope id="7812943990232824647" at="112,104,113,495" />
+      <scope id="6346338635721396810" at="150,15,151,87" />
+      <scope id="7812943990232824646" at="152,15,153,87" />
+      <scope id="7812943990232128388" at="195,15,196,66" />
+      <scope id="6346338635721331627" at="197,15,198,66" />
+      <scope id="6346338635721222548" at="199,15,200,66" />
+      <scope id="7812943990232644236" at="201,15,202,66" />
+      <scope id="7812943990232128342" at="240,15,241,61" />
+      <scope id="6346338635721222502" at="242,15,243,61" />
+      <scope id="7812943990232644200" at="244,15,245,61" />
+      <scope id="7812943990232128306" at="281,15,282,70" />
+      <scope id="7812943990232128329" at="283,15,284,70" />
+      <scope id="7812943990232128359" at="285,15,286,70" />
+      <scope id="6346338635721222466" at="287,15,288,70" />
+      <scope id="6346338635721222489" at="289,15,290,70" />
+      <scope id="6346338635721388511" at="291,15,292,70" />
+      <scope id="7812943990232644164" at="293,15,294,70" />
+      <scope id="7812943990232644187" at="295,15,296,70" />
+      <scope id="7812943990232128390" at="39,88,41,121" />
+      <scope id="7812943990232644238" at="52,88,54,121" />
+      <scope id="7812943990232128331" at="73,93,75,0" />
+      <scope id="6346338635721222491" at="83,93,85,0" />
+      <scope id="7812943990232644189" at="93,93,95,0" />
       <scope id="6346338635721331628" at="43,0,46,0">
         <var name="_context" id="6346338635721331628" />
       </scope>
-      <scope id="2681075272524333364" at="52,0,55,0">
-        <var name="_context" id="2681075272524333364" />
-      </scope>
-      <scope id="7985317431307113951" at="62,0,65,0">
-        <var name="_context" id="7985317431307113951" />
+      <scope id="7812943990232128307" at="70,0,73,0">
+        <var name="_context" id="7812943990232128307" />
       </scope>
-      <scope id="7985317431307179477" at="69,0,72,0">
-        <var name="_context" id="7985317431307179477" />
+      <scope id="7812943990232128360" at="77,0,80,0">
+        <var name="_context" id="7812943990232128360" />
       </scope>
-      <scope id="6346338635721222467" at="72,0,75,0">
+      <scope id="6346338635721222467" at="80,0,83,0">
         <var name="_context" id="6346338635721222467" />
       </scope>
-      <scope id="6346338635721388512" at="79,0,82,0">
+      <scope id="6346338635721388512" at="87,0,90,0">
         <var name="_context" id="6346338635721388512" />
       </scope>
-      <scope id="7985317431307213920" at="85,0,88,0">
-        <var name="_context" id="7985317431307213920" />
+      <scope id="7812943990232644165" at="90,0,93,0">
+        <var name="_context" id="7812943990232644165" />
       </scope>
-      <scope id="6346338635721222503" at="88,0,91,0">
-        <var name="_context" id="6346338635721222503" />
-      </scope>
-      <scope id="7985317431307037803" at="91,0,94,0">
-        <var name="_context" id="7985317431307037803" />
+      <scope id="7812943990232128343" at="100,0,103,0">
+        <var name="_context" id="7812943990232128343" />
       </scope>
-      <scope id="7985317431307068138" at="94,0,97,0">
-        <var name="_context" id="7985317431307068138" />
+      <scope id="6346338635721222503" at="103,0,106,0">
+        <var name="_context" id="6346338635721222503" />
       </scope>
-      <scope id="7985317431306988014" at="97,0,100,0">
-        <var name="_context" id="7985317431306988014" />
+      <scope id="7812943990232644201" at="106,0,109,0">
+        <var name="_context" id="7812943990232644201" />
       </scope>
-      <scope id="6346338635721396810" at="100,0,103,0">
+      <scope id="6346338635721396810" at="109,0,112,0">
         <var name="_context" id="6346338635721396810" />
       </scope>
-      <scope id="6346338635721222539" at="103,0,106,0">
-        <var name="_context" id="6346338635721222539" />
+      <scope id="7812943990232824646" at="112,0,115,0">
+        <var name="_context" id="7812943990232824646" />
       </scope>
-      <scope id="7985317431306989794" at="39,0,43,0">
-        <var name="_context" id="7985317431306989794" />
+      <scope id="7812943990232128389" at="39,0,43,0">
+        <var name="_context" id="7812943990232128389" />
       </scope>
       <scope id="6346338635721222550" at="46,88,50,117" />
-      <scope id="7985317431307194770" at="65,0,69,0">
-        <var name="_context" id="7985317431307194770" />
+      <scope id="7812943990232644237" at="52,0,56,0">
+        <var name="_context" id="7812943990232644237" />
+      </scope>
+      <scope id="7812943990232128330" at="73,0,77,0">
+        <var name="_context" id="7812943990232128330" />
       </scope>
-      <scope id="6346338635721222490" at="75,0,79,0">
+      <scope id="6346338635721222490" at="83,0,87,0">
         <var name="_context" id="6346338635721222490" />
       </scope>
+      <scope id="7812943990232644188" at="93,0,97,0">
+        <var name="_context" id="7812943990232644188" />
+      </scope>
       <scope id="6346338635721222549" at="46,0,52,0">
         <var name="_context" id="6346338635721222549" />
       </scope>
     </file>
   </root>
+  <root nodeRef="r:31166abf-6347-416d-8581-1bd201a97b8f(main@generator)/554465258093227637">
+    <file name="QueriesGenerated.java">
+      <node id="7812943990232097782" at="56,88,57,89" concept="2" />
+      <node id="7812943990232097784" at="57,89,58,121" concept="1" />
+      <node id="2681075272524333371" at="60,88,61,175" concept="1" />
+      <node id="7985317431307037810" at="115,104,116,193" concept="1" />
+      <node id="7985317431307068145" at="118,104,119,193" concept="1" />
+      <node id="7812943990232116974" at="121,104,122,189" concept="1" />
+      <node id="7985317431307037803" at="128,75,129,75" concept="0" />
+      <node id="7985317431307068138" at="129,75,130,75" concept="0" />
+      <node id="7812943990232109188" at="130,75,131,75" concept="0" />
+      <node id="7985317431307037803" at="154,15,155,87" concept="1" />
+      <node id="7985317431307068138" at="156,15,157,87" concept="1" />
+      <node id="7812943990232109188" at="158,15,159,87" concept="1" />
+      <node id="7812943990232097779" at="171,212,172,212" concept="0" />
+      <node id="2681075272524333361" at="172,212,173,209" concept="0" />
+      <node id="7812943990232097779" at="203,15,204,66" concept="1" />
+      <node id="2681075272524333361" at="205,15,206,66" concept="1" />
+      <node id="2681075272524333364" at="60,0,63,0" concept="4" trace="propertyMacro_GetValue_1_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7985317431307037803" at="115,0,118,0" concept="4" trace="sourceNodesQuery_1_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7985317431307068138" at="118,0,121,0" concept="4" trace="sourceNodesQuery_1_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7812943990232109188" at="121,0,124,0" concept="4" trace="sourceNodesQuery_1_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7812943990232097780" at="56,0,60,0" concept="4" trace="propertyMacro_GetValue_1_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <scope id="2681075272524333365" at="60,88,61,175" />
+      <scope id="7985317431307037804" at="115,104,116,193" />
+      <scope id="7985317431307068139" at="118,104,119,193" />
+      <scope id="7812943990232109189" at="121,104,122,189" />
+      <scope id="7985317431307037803" at="154,15,155,87" />
+      <scope id="7985317431307068138" at="156,15,157,87" />
+      <scope id="7812943990232109188" at="158,15,159,87" />
+      <scope id="7812943990232097779" at="203,15,204,66" />
+      <scope id="2681075272524333361" at="205,15,206,66" />
+      <scope id="7812943990232097781" at="56,88,58,121" />
+      <scope id="2681075272524333364" at="60,0,63,0">
+        <var name="_context" id="2681075272524333364" />
+      </scope>
+      <scope id="7985317431307037803" at="115,0,118,0">
+        <var name="_context" id="7985317431307037803" />
+      </scope>
+      <scope id="7985317431307068138" at="118,0,121,0">
+        <var name="_context" id="7985317431307068138" />
+      </scope>
+      <scope id="7812943990232109188" at="121,0,124,0">
+        <var name="_context" id="7812943990232109188" />
+      </scope>
+      <scope id="7812943990232097780" at="56,0,60,0">
+        <var name="_context" id="7812943990232097780" />
+      </scope>
+    </file>
+  </root>
   <root nodeRef="r:31166abf-6347-416d-8581-1bd201a97b8f(main@generator)/7985317431307070106">
     <file name="QueriesGenerated.java">
-      <node id="7985317431307104664" at="55,88,56,52" concept="2" />
-      <node id="7985317431307075619" at="56,52,57,267" concept="1" />
-      <node id="7985317431307070194" at="153,209,154,196" concept="0" />
-      <node id="7985317431307070194" at="183,15,184,66" concept="1" />
-      <node id="7985317431307070195" at="55,0,59,0" concept="4" trace="propertyMacro_GetValue_2_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <scope id="7985317431307070194" at="183,15,184,66" />
-      <scope id="7985317431307070196" at="55,88,57,267" />
-      <scope id="7985317431307070195" at="55,0,59,0">
+      <node id="7985317431307104664" at="63,88,64,52" concept="2" />
+      <node id="7985317431307075619" at="64,52,65,267" concept="1" />
+      <node id="7985317431307070194" at="173,209,174,196" concept="0" />
+      <node id="7985317431307070194" at="207,15,208,66" concept="1" />
+      <node id="7985317431307070195" at="63,0,67,0" concept="4" trace="propertyMacro_GetValue_2_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <scope id="7985317431307070194" at="207,15,208,66" />
+      <scope id="7985317431307070196" at="63,88,65,267" />
+      <scope id="7985317431307070195" at="63,0,67,0">
         <var name="_context" id="7985317431307070195" />
       </scope>
     </file>
   </root>
   <root nodeRef="r:31166abf-6347-416d-8581-1bd201a97b8f(main@generator)/7985317431307070113">
     <file name="QueriesGenerated.java">
-      <node id="7985317431307790543" at="59,88,60,302" concept="1" />
-      <node id="7985317431307755469" at="82,93,83,97" concept="1" />
-      <node id="7985317431307775128" at="154,196,155,190" concept="0" />
-      <node id="7985317431307775128" at="185,15,186,66" concept="1" />
-      <node id="7985317431307754088" at="231,76,232,76" concept="0" />
-      <node id="7985317431307754088" at="264,15,265,70" concept="1" />
-      <node id="7985317431307775129" at="59,0,62,0" concept="4" trace="propertyMacro_GetValue_3_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="7985317431307754089" at="82,0,85,0" concept="4" trace="referenceMacro_GetReferent_3_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <scope id="7985317431307775130" at="59,88,60,302" />
-      <scope id="7985317431307754090" at="82,93,83,97" />
-      <scope id="7985317431307775128" at="185,15,186,66" />
-      <scope id="7985317431307754088" at="264,15,265,70" />
-      <scope id="7985317431307775129" at="59,0,62,0">
+      <node id="7985317431307790543" at="67,88,68,302" concept="1" />
+      <node id="7985317431307755469" at="97,93,98,97" concept="1" />
+      <node id="7985317431307775128" at="174,196,175,190" concept="0" />
+      <node id="7985317431307775128" at="209,15,210,66" concept="1" />
+      <node id="7985317431307754088" at="260,76,261,76" concept="0" />
+      <node id="7985317431307754088" at="297,15,298,70" concept="1" />
+      <node id="7985317431307775129" at="67,0,70,0" concept="4" trace="propertyMacro_GetValue_3_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7985317431307754089" at="97,0,100,0" concept="4" trace="referenceMacro_GetReferent_3_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <scope id="7985317431307775130" at="67,88,68,302" />
+      <scope id="7985317431307754090" at="97,93,98,97" />
+      <scope id="7985317431307775128" at="209,15,210,66" />
+      <scope id="7985317431307754088" at="297,15,298,70" />
+      <scope id="7985317431307775129" at="67,0,70,0">
         <var name="_context" id="7985317431307775129" />
       </scope>
-      <scope id="7985317431307754089" at="82,0,85,0">
+      <scope id="7985317431307754089" at="97,0,100,0">
         <var name="_context" id="7985317431307754089" />
       </scope>
     </file>
diff --git a/plugins/mps-testing/languages/gentest/generator/template/main@generator.mps b/plugins/mps-testing/languages/gentest/generator/template/main@generator.mps
index a77d1a3d63e3..2a990c837943 100644
--- a/plugins/mps-testing/languages/gentest/generator/template/main@generator.mps
+++ b/plugins/mps-testing/languages/gentest/generator/template/main@generator.mps
@@ -2,6 +2,7 @@
 <model ref="r:31166abf-6347-416d-8581-1bd201a97b8f(main@generator)">
   <persistence version="9" />
   <languages>
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
@@ -12,6 +13,9 @@
     <import index="xlb7" ref="r:cf42fd0a-68d2-493b-8b77-961658617704(jetbrains.mps.lang.modelapi.behavior)" />
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -41,6 +45,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
@@ -113,9 +120,21 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+    </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
+      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
+        <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
+      </concept>
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
+        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
         <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
       </concept>
       <concept id="1112730859144" name="jetbrains.mps.lang.generator.structure.TemplateSwitch" flags="ig" index="jVnub">
@@ -167,6 +186,11 @@
         <child id="1167770376702" name="referentFunction" index="3$ytzL" />
       </concept>
     </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
     <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
       <concept id="1187483539462121947" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_CreateIndexedName" flags="nn" index="32eq0B">
         <property id="1187483539462194806" name="skipFirstIndex" index="32f$Ya" />
@@ -180,14 +204,11 @@
       <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
-      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
-        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
-      </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
@@ -222,615 +243,946 @@
   </registry>
   <node concept="bUwia" id="uLQNrGVXCh">
     <property role="TrG5h" value="main" />
-    <node concept="3lhOvk" id="uLQNrGWiQb" role="3lj3bC">
-      <ref role="30HIoZ" to="lur:uLQNrGW9aY" resolve="GeneratorTest" />
-      <ref role="3lhOvi" node="uLQNrGWiTP" resolve="GeneratorTestClass" />
-    </node>
-    <node concept="2rT7sh" id="6VhyYlfMRqJ" role="2rTMjI">
-      <property role="TrG5h" value="TestArg2Field" />
-      <ref role="2rTdP9" to="lur:uLQNrGW9LE" resolve="TestArgument" />
-      <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
-    </node>
-  </node>
-  <node concept="312cEu" id="uLQNrGWiTP">
-    <property role="TrG5h" value="GeneratorTestClass" />
-    <node concept="312cEg" id="6VhyYlfMAsj" role="jymVt">
-      <property role="TrG5h" value="f" />
-      <node concept="3Tm6S6" id="6VhyYlfMAsk" role="1B3o_S" />
-      <node concept="10Oyi0" id="6VhyYlfMAL3" role="1tU5fm" />
-      <node concept="1WS0z7" id="6VhyYlfMALC" role="lGtFl">
-        <node concept="3JmXsc" id="6VhyYlfMALF" role="3Jn$fo">
-          <node concept="3clFbS" id="6VhyYlfMALG" role="2VODD2">
-            <node concept="3clFbF" id="6VhyYlfMALM" role="3cqZAp">
-              <node concept="2OqwBi" id="6VhyYlfMALH" role="3clFbG">
-                <node concept="3Tsc0h" id="2kP5W5yTzqG" role="2OqNvi">
-                  <ref role="3TtcxE" to="lur:uLQNrGW9LB" resolve="arguments" />
+    <node concept="3aamgX" id="6LH9MCjNLG9" role="3acgRq">
+      <ref role="30HIoZ" to="lur:uLQNrGWd1n" resolve="TransformationMatchAssertion" />
+      <node concept="1Koe21" id="6LH9MCjNLGd" role="1lVwrX">
+        <node concept="312cEu" id="6LH9MCjNLGj" role="1Koe22">
+          <property role="TrG5h" value="Test" />
+          <node concept="2tJIrI" id="6LH9MCjNZa9" role="jymVt" />
+          <node concept="312cEg" id="6LH9MCjO4P3" role="jymVt">
+            <property role="34CwA1" value="false" />
+            <property role="eg7rD" value="false" />
+            <property role="TrG5h" value="mdl" />
+            <property role="3TUv4t" value="false" />
+            <node concept="H_c77" id="6LH9MCjO45j" role="1tU5fm" />
+          </node>
+          <node concept="2tJIrI" id="6LH9MCjNZbJ" role="jymVt" />
+          <node concept="3clFb_" id="6LH9MCjNLGA" role="jymVt">
+            <property role="TrG5h" value="testTransformAndMatch" />
+            <node concept="3cqZAl" id="6LH9MCjNLGB" role="3clF45" />
+            <node concept="3Tm1VV" id="6LH9MCjNLGC" role="1B3o_S" />
+            <node concept="3clFbS" id="6LH9MCjNLGD" role="3clF47">
+              <node concept="3cpWs8" id="6LH9MCjNLGE" role="3cqZAp">
+                <node concept="3cpWsn" id="6LH9MCjNLGF" role="3cpWs9">
+                  <property role="TrG5h" value="t" />
+                  <node concept="3uibUv" id="6LH9MCjNLGG" role="1tU5fm">
+                    <ref role="3uigEE" to="9gdl:6VhyYlfKJd8" resolve="TransformHelper" />
+                  </node>
+                  <node concept="1rXfSq" id="6LH9MCjNLGH" role="33vP2m">
+                    <ref role="37wK5l" to="9gdl:6VhyYlfKUJG" resolve="newTransformer" />
+                  </node>
                 </node>
-                <node concept="30H73N" id="6VhyYlfMALL" role="2Oq$k0" />
               </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1sPUBX" id="2kP5W5yTsls" role="lGtFl">
-        <ref role="v9R2y" node="6VhyYlfMIEq" resolve="switch_TestArgument_Field" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6VhyYlfKVUZ" role="jymVt" />
-    <node concept="3clFb_" id="6VhyYlfMB_O" role="jymVt">
-      <property role="TrG5h" value="prepareArguments" />
-      <node concept="3cqZAl" id="6VhyYlfMB_Q" role="3clF45" />
-      <node concept="3Tm1VV" id="6VhyYlfMB_R" role="1B3o_S" />
-      <node concept="3clFbS" id="6VhyYlfMB_S" role="3clF47">
-        <node concept="3clFbF" id="6VhyYlfMFAT" role="3cqZAp">
-          <node concept="37vLTI" id="6VhyYlfMHDR" role="3clFbG">
-            <node concept="3cmrfG" id="6VhyYlfMHI4" role="37vLTx">
-              <property role="3cmrfH" value="3" />
-            </node>
-            <node concept="37vLTw" id="6VhyYlfMFAS" role="37vLTJ">
-              <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
-            </node>
-          </node>
-          <node concept="1WS0z7" id="6VhyYlfMIbB" role="lGtFl">
-            <node concept="3JmXsc" id="6VhyYlfMIbE" role="3Jn$fo">
-              <node concept="3clFbS" id="6VhyYlfMIbF" role="2VODD2">
-                <node concept="3clFbF" id="6VhyYlfMIbL" role="3cqZAp">
-                  <node concept="2OqwBi" id="6VhyYlfMIbG" role="3clFbG">
-                    <node concept="3Tsc0h" id="2kP5W5yT$2x" role="2OqNvi">
-                      <ref role="3TtcxE" to="lur:uLQNrGW9LB" resolve="arguments" />
+              <node concept="3cpWs8" id="6LH9MCjNLGI" role="3cqZAp">
+                <node concept="3cpWsn" id="6LH9MCjNLGJ" role="3cpWs9">
+                  <property role="TrG5h" value="i" />
+                  <node concept="H_c77" id="6LH9MCjNLGK" role="1tU5fm" />
+                  <node concept="37vLTw" id="6LH9MCjNLGL" role="33vP2m">
+                    <ref role="3cqZAo" node="6LH9MCjO4P3" resolve="mdl" />
+                    <node concept="1ZhdrF" id="6LH9MCjNLGM" role="lGtFl">
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                      <property role="2qtEX8" value="variableDeclaration" />
+                      <node concept="3$xsQk" id="6LH9MCjNLGN" role="3$ytzL">
+                        <node concept="3clFbS" id="6LH9MCjNLGO" role="2VODD2">
+                          <node concept="3clFbF" id="6LH9MCjNLGP" role="3cqZAp">
+                            <node concept="2OqwBi" id="6LH9MCjNLGQ" role="3clFbG">
+                              <node concept="1iwH7S" id="6LH9MCjNLGR" role="2Oq$k0" />
+                              <node concept="1iwH70" id="6LH9MCjNLGS" role="2OqNvi">
+                                <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
+                                <node concept="2OqwBi" id="6LH9MCjNLGT" role="1iwH7V">
+                                  <node concept="2OqwBi" id="6LH9MCjNLGU" role="2Oq$k0">
+                                    <node concept="30H73N" id="6LH9MCjNLGV" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="6LH9MCjNLGW" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="lur:uLQNrGWd1u" resolve="inputModel" />
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="6LH9MCjNLGX" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
-                    <node concept="30H73N" id="6VhyYlfMIbK" role="2Oq$k0" />
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-          <node concept="1sPUBX" id="2kP5W5yTts$" role="lGtFl">
-            <ref role="v9R2y" node="6VhyYlfMIEx" resolve="switch_TestArgument_Initializer" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6VhyYlfME4H" role="2AJF6D">
-        <ref role="2AI5Lk" to="rjhg:~Before" resolve="Before" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6VhyYlfMAU8" role="jymVt" />
-    <node concept="3clFb_" id="6VhyYlfKVVh" role="jymVt">
-      <property role="TrG5h" value="testTransformAndMatch" />
-      <node concept="3cqZAl" id="6VhyYlfKVVj" role="3clF45" />
-      <node concept="3Tm1VV" id="6VhyYlfKVVk" role="1B3o_S" />
-      <node concept="3clFbS" id="6VhyYlfKVVl" role="3clF47">
-        <node concept="3cpWs8" id="6VhyYlfKW1i" role="3cqZAp">
-          <node concept="3cpWsn" id="6VhyYlfKW1j" role="3cpWs9">
-            <property role="TrG5h" value="t" />
-            <node concept="3uibUv" id="6VhyYlfKW1h" role="1tU5fm">
-              <ref role="3uigEE" to="9gdl:6VhyYlfKJd8" resolve="TransformHelper" />
-            </node>
-            <node concept="1rXfSq" id="6VhyYlfKW1k" role="33vP2m">
-              <ref role="37wK5l" to="9gdl:6VhyYlfKUJG" resolve="newTransformer" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6VhyYlfKXbQ" role="3cqZAp">
-          <node concept="3cpWsn" id="6VhyYlfKXbT" role="3cpWs9">
-            <property role="TrG5h" value="i" />
-            <node concept="H_c77" id="6VhyYlfKXbO" role="1tU5fm" />
-            <node concept="37vLTw" id="6VhyYlfKXnp" role="33vP2m">
-              <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
-              <node concept="1ZhdrF" id="6VhyYlfMTnu" role="lGtFl">
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                <property role="2qtEX8" value="variableDeclaration" />
-                <node concept="3$xsQk" id="6VhyYlfMTnv" role="3$ytzL">
-                  <node concept="3clFbS" id="6VhyYlfMTnw" role="2VODD2">
-                    <node concept="3clFbF" id="6VhyYlfMTDN" role="3cqZAp">
-                      <node concept="2OqwBi" id="6VhyYlfMTPZ" role="3clFbG">
-                        <node concept="1iwH7S" id="6VhyYlfMTDM" role="2Oq$k0" />
-                        <node concept="1iwH70" id="6VhyYlfMTVH" role="2OqNvi">
-                          <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
-                          <node concept="2OqwBi" id="6VhyYlfN1pO" role="1iwH7V">
-                            <node concept="2OqwBi" id="6VhyYlfMUq3" role="2Oq$k0">
-                              <node concept="30H73N" id="6VhyYlfMUfz" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="6VhyYlfN0B8" role="2OqNvi">
-                                <ref role="3Tt5mk" to="lur:uLQNrGWd1u" resolve="inputModel" />
+              <node concept="3clFbF" id="6LH9MCjNLGY" role="3cqZAp">
+                <node concept="2OqwBi" id="6LH9MCjNLGZ" role="3clFbG">
+                  <node concept="37vLTw" id="6LH9MCjNLH0" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6LH9MCjNLGF" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="6LH9MCjNLH1" role="2OqNvi">
+                    <ref role="37wK5l" to="9gdl:6VhyYlfKJet" resolve="setInput" />
+                    <node concept="37vLTw" id="6LH9MCjNLH2" role="37wK5m">
+                      <ref role="3cqZAo" node="6LH9MCjNLGJ" resolve="i" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6LH9MCjNLH3" role="3cqZAp">
+                <node concept="2OqwBi" id="6LH9MCjNLH4" role="3clFbG">
+                  <node concept="37vLTw" id="6LH9MCjNLH5" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6LH9MCjNLGF" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="6LH9MCjNLH6" role="2OqNvi">
+                    <ref role="37wK5l" to="9gdl:354Yu58nCyL" resolve="setPlanProvider" />
+                    <node concept="1rXfSq" id="6LH9MCjNLH7" role="37wK5m">
+                      <ref role="37wK5l" to="9gdl:354Yu58nyp6" resolve="planProviderFromModel" />
+                      <node concept="37vLTw" id="6LH9MCjNLH8" role="37wK5m">
+                        <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
+                        <node concept="1ZhdrF" id="6LH9MCjNLH9" role="lGtFl">
+                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                          <property role="2qtEX8" value="variableDeclaration" />
+                          <node concept="3$xsQk" id="6LH9MCjNLHa" role="3$ytzL">
+                            <node concept="3clFbS" id="6LH9MCjNLHb" role="2VODD2">
+                              <node concept="3clFbF" id="6LH9MCjNLHc" role="3cqZAp">
+                                <node concept="2OqwBi" id="6LH9MCjNLHd" role="3clFbG">
+                                  <node concept="1iwH7S" id="6LH9MCjNLHe" role="2Oq$k0" />
+                                  <node concept="1iwH70" id="6LH9MCjNLHf" role="2OqNvi">
+                                    <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
+                                    <node concept="2OqwBi" id="6LH9MCjNLHg" role="1iwH7V">
+                                      <node concept="2OqwBi" id="6LH9MCjNLHh" role="2Oq$k0">
+                                        <node concept="30H73N" id="6LH9MCjNLHi" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="6LH9MCjNLHj" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="lur:uLQNrGWd1z" resolve="transformationPlan" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrEf2" id="6LH9MCjNLHk" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
+                              <node concept="3clFbH" id="6LH9MCjNLHl" role="3cqZAp" />
                             </node>
-                            <node concept="3TrEf2" id="6VhyYlfN1C2" role="2OqNvi">
-                              <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1W57fq" id="6LH9MCjNLHm" role="lGtFl">
+                  <node concept="3IZrLx" id="6LH9MCjNLHn" role="3IZSJc">
+                    <node concept="3clFbS" id="6LH9MCjNLHo" role="2VODD2">
+                      <node concept="3clFbF" id="6LH9MCjNLHp" role="3cqZAp">
+                        <node concept="2OqwBi" id="6LH9MCjNLHq" role="3clFbG">
+                          <node concept="2OqwBi" id="6LH9MCjNLHr" role="2Oq$k0">
+                            <node concept="30H73N" id="6LH9MCjNLHs" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="6LH9MCjNLHt" role="2OqNvi">
+                              <ref role="3Tt5mk" to="lur:uLQNrGWd1z" resolve="transformationPlan" />
                             </node>
                           </node>
+                          <node concept="3x8VRR" id="6LH9MCjNLHu" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6VhyYlfKW0F" role="3cqZAp">
-          <node concept="2OqwBi" id="6VhyYlfKW84" role="3clFbG">
-            <node concept="37vLTw" id="6VhyYlfKW1l" role="2Oq$k0">
-              <ref role="3cqZAo" node="6VhyYlfKW1j" resolve="t" />
-            </node>
-            <node concept="liA8E" id="6VhyYlfKWjh" role="2OqNvi">
-              <ref role="37wK5l" to="9gdl:6VhyYlfKJet" resolve="setInput" />
-              <node concept="37vLTw" id="6VhyYlfN6H$" role="37wK5m">
-                <ref role="3cqZAo" node="6VhyYlfKXbT" resolve="i" />
+              <node concept="3clFbF" id="6LH9MCjNLHv" role="3cqZAp">
+                <node concept="2OqwBi" id="6LH9MCjNLHw" role="3clFbG">
+                  <node concept="37vLTw" id="6LH9MCjNLHx" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6LH9MCjNLGF" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="6LH9MCjNLHy" role="2OqNvi">
+                    <ref role="37wK5l" to="9gdl:6VhyYlfKR_6" resolve="transform" />
+                  </node>
+                </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6VhyYlfKWlS" role="3cqZAp">
-          <node concept="2OqwBi" id="6VhyYlfKWrJ" role="3clFbG">
-            <node concept="37vLTw" id="6VhyYlfKWlQ" role="2Oq$k0">
-              <ref role="3cqZAo" node="6VhyYlfKW1j" resolve="t" />
-            </node>
-            <node concept="liA8E" id="6VhyYlfKWBw" role="2OqNvi">
-              <ref role="37wK5l" to="9gdl:354Yu58nCyL" resolve="setPlanProvider" />
-              <node concept="1rXfSq" id="6VhyYlfNcM7" role="37wK5m">
-                <ref role="37wK5l" to="9gdl:354Yu58nyp6" resolve="planProviderFromModel" />
-                <node concept="37vLTw" id="6VhyYlfNcOj" role="37wK5m">
-                  <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
-                  <node concept="1ZhdrF" id="6VhyYlfNd6h" role="lGtFl">
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <node concept="3$xsQk" id="6VhyYlfNd6i" role="3$ytzL">
-                      <node concept="3clFbS" id="6VhyYlfNd6j" role="2VODD2">
-                        <node concept="3clFbF" id="6VhyYlfNdoK" role="3cqZAp">
-                          <node concept="2OqwBi" id="6VhyYlfNd$Z" role="3clFbG">
-                            <node concept="1iwH7S" id="6VhyYlfNdoJ" role="2Oq$k0" />
-                            <node concept="1iwH70" id="6VhyYlfNefw" role="2OqNvi">
-                              <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
-                              <node concept="2OqwBi" id="6VhyYlfNfHU" role="1iwH7V">
-                                <node concept="2OqwBi" id="6VhyYlfNeF9" role="2Oq$k0">
-                                  <node concept="30H73N" id="6VhyYlfNev2" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="6VhyYlfNeX_" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="lur:uLQNrGWd1z" resolve="transformationPlan" />
+              <node concept="3cpWs8" id="6LH9MCjNLHz" role="3cqZAp">
+                <node concept="3cpWsn" id="6LH9MCjNLH$" role="3cpWs9">
+                  <property role="TrG5h" value="rm" />
+                  <node concept="H_c77" id="6LH9MCjNLH_" role="1tU5fm" />
+                  <node concept="37vLTw" id="6LH9MCjNLHA" role="33vP2m">
+                    <ref role="3cqZAo" node="6LH9MCjO4P3" resolve="mdl" />
+                    <node concept="1ZhdrF" id="6LH9MCjNLHB" role="lGtFl">
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                      <property role="2qtEX8" value="variableDeclaration" />
+                      <node concept="3$xsQk" id="6LH9MCjNLHC" role="3$ytzL">
+                        <node concept="3clFbS" id="6LH9MCjNLHD" role="2VODD2">
+                          <node concept="3clFbF" id="6LH9MCjNLHE" role="3cqZAp">
+                            <node concept="2OqwBi" id="6LH9MCjNLHF" role="3clFbG">
+                              <node concept="1iwH7S" id="6LH9MCjNLHG" role="2Oq$k0" />
+                              <node concept="1iwH70" id="6LH9MCjNLHH" role="2OqNvi">
+                                <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
+                                <node concept="2OqwBi" id="6LH9MCjNLHI" role="1iwH7V">
+                                  <node concept="2OqwBi" id="6LH9MCjNLHJ" role="2Oq$k0">
+                                    <node concept="30H73N" id="6LH9MCjNLHK" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="6LH9MCjNLHL" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="lur:uLQNrGWd1w" resolve="referenceModel" />
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="6LH9MCjNLHM" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
                                   </node>
-                                </node>
-                                <node concept="3TrEf2" id="6VhyYlfNgbe" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbH" id="6VhyYlfNesy" role="3cqZAp" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="3clFbF" id="6LH9MCjNLHN" role="3cqZAp">
+                <node concept="1rXfSq" id="6LH9MCjNLHO" role="3clFbG">
+                  <ref role="37wK5l" to="9gdl:6VhyYlfL99j" resolve="assertMatch" />
+                  <node concept="2OqwBi" id="6LH9MCjNLHP" role="37wK5m">
+                    <node concept="37vLTw" id="6LH9MCjNLHQ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6LH9MCjNLGF" resolve="t" />
+                    </node>
+                    <node concept="liA8E" id="6LH9MCjNLHR" role="2OqNvi">
+                      <ref role="37wK5l" to="9gdl:6VhyYlfKTp_" resolve="getOutputModel" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="6LH9MCjNLHS" role="37wK5m">
+                    <ref role="3cqZAo" node="6LH9MCjNLH$" resolve="rm" />
+                  </node>
+                </node>
+              </node>
             </node>
-          </node>
-          <node concept="1W57fq" id="6VhyYlfNhLu" role="lGtFl">
-            <node concept="3IZrLx" id="6VhyYlfNhLw" role="3IZSJc">
-              <node concept="3clFbS" id="6VhyYlfNhLy" role="2VODD2">
-                <node concept="3clFbF" id="6VhyYlfNiG1" role="3cqZAp">
-                  <node concept="2OqwBi" id="6VhyYlfNjTN" role="3clFbG">
-                    <node concept="2OqwBi" id="6VhyYlfNiTv" role="2Oq$k0">
-                      <node concept="30H73N" id="6VhyYlfNiG0" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="6VhyYlfNjpf" role="2OqNvi">
-                        <ref role="3Tt5mk" to="lur:uLQNrGWd1z" resolve="transformationPlan" />
+            <node concept="2AHcQZ" id="6LH9MCjNLHT" role="2AJF6D">
+              <ref role="2AI5Lk" to="rjhg:~Test" resolve="Test" />
+            </node>
+            <node concept="17Uvod" id="6LH9MCjNLI4" role="lGtFl">
+              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+              <property role="2qtEX9" value="name" />
+              <node concept="3zFVjK" id="6LH9MCjNLI5" role="3zH0cK">
+                <node concept="3clFbS" id="6LH9MCjNLI6" role="2VODD2">
+                  <node concept="3SKdUt" id="6LH9MCjNLI7" role="3cqZAp">
+                    <node concept="3SKdUq" id="6LH9MCjNLI8" role="3SKWNk">
+                      <property role="3SKdUp" value="XXX would prefer template.input to reference GeneratorTest instead of node.parent" />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="6LH9MCjNLI9" role="3cqZAp">
+                    <node concept="2OqwBi" id="6LH9MCjNLIa" role="3clFbG">
+                      <node concept="1iwH7S" id="6LH9MCjNLIb" role="2Oq$k0" />
+                      <node concept="32eq0B" id="6LH9MCjNLIc" role="2OqNvi">
+                        <property role="32f$Ya" value="false" />
+                        <node concept="3zGtF$" id="6LH9MCjNLId" role="32eq0w" />
+                        <node concept="2OqwBi" id="6LH9MCjNLIe" role="32eq0x">
+                          <node concept="30H73N" id="6LH9MCjNLIf" role="2Oq$k0" />
+                          <node concept="1mfA1w" id="6LH9MCjNLIg" role="2OqNvi" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="3x8VRR" id="6VhyYlfNknn" role="2OqNvi" />
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="raruj" id="6LH9MCjNPdj" role="lGtFl" />
           </node>
-        </node>
-        <node concept="3clFbF" id="6VhyYlfKWEd" role="3cqZAp">
-          <node concept="2OqwBi" id="6VhyYlfKWV_" role="3clFbG">
-            <node concept="37vLTw" id="6VhyYlfKWEb" role="2Oq$k0">
-              <ref role="3cqZAo" node="6VhyYlfKW1j" resolve="t" />
-            </node>
-            <node concept="liA8E" id="6VhyYlfKX70" role="2OqNvi">
-              <ref role="37wK5l" to="9gdl:6VhyYlfKR_6" resolve="transform" />
-            </node>
+          <node concept="2tJIrI" id="6LH9MCjNLGu" role="jymVt" />
+          <node concept="3Tm1VV" id="6LH9MCjNLGk" role="1B3o_S" />
+          <node concept="3uibUv" id="6LH9MCjNVtk" role="1zkMxy">
+            <ref role="3uigEE" to="9gdl:3AyJARA_3iV" resolve="BaseGeneratorTest" />
           </node>
         </node>
-        <node concept="3cpWs8" id="6VhyYlfMmTc" role="3cqZAp">
-          <node concept="3cpWsn" id="6VhyYlfMmTf" role="3cpWs9">
-            <property role="TrG5h" value="rm" />
-            <node concept="H_c77" id="6VhyYlfMmTa" role="1tU5fm" />
-            <node concept="37vLTw" id="6VhyYlfN95L" role="33vP2m">
-              <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
-              <node concept="1ZhdrF" id="6VhyYlfN9nk" role="lGtFl">
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                <property role="2qtEX8" value="variableDeclaration" />
-                <node concept="3$xsQk" id="6VhyYlfN9nl" role="3$ytzL">
-                  <node concept="3clFbS" id="6VhyYlfN9nm" role="2VODD2">
-                    <node concept="3clFbF" id="6VhyYlfN9W2" role="3cqZAp">
-                      <node concept="2OqwBi" id="6VhyYlfNa8e" role="3clFbG">
-                        <node concept="1iwH7S" id="6VhyYlfN9VN" role="2Oq$k0" />
-                        <node concept="1iwH70" id="6VhyYlfNa$d" role="2OqNvi">
-                          <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
-                          <node concept="2OqwBi" id="6VhyYlfNbP0" role="1iwH7V">
-                            <node concept="2OqwBi" id="6VhyYlfNb7k" role="2Oq$k0">
-                              <node concept="30H73N" id="6VhyYlfNaW1" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="6VhyYlfNbpK" role="2OqNvi">
-                                <ref role="3Tt5mk" to="lur:uLQNrGWd1w" resolve="referenceModel" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="6LH9MCjO96z" role="3acgRq">
+      <ref role="30HIoZ" to="lur:5wiIlPAvMBp" resolve="TransformationMatchManyAssertion" />
+      <node concept="1Koe21" id="6LH9MCjO96$" role="1lVwrX">
+        <node concept="312cEu" id="6LH9MCjO96_" role="1Koe22">
+          <property role="TrG5h" value="Test" />
+          <node concept="2tJIrI" id="6LH9MCjO96A" role="jymVt" />
+          <node concept="312cEg" id="6LH9MCjO96B" role="jymVt">
+            <property role="34CwA1" value="false" />
+            <property role="eg7rD" value="false" />
+            <property role="TrG5h" value="mdl" />
+            <property role="3TUv4t" value="false" />
+            <node concept="H_c77" id="6LH9MCjO96C" role="1tU5fm" />
+          </node>
+          <node concept="2tJIrI" id="6LH9MCjO96D" role="jymVt" />
+          <node concept="3clFb_" id="5wiIlPAw2$Q" role="jymVt">
+            <property role="TrG5h" value="testTransformAndMatchMany" />
+            <node concept="3cqZAl" id="5wiIlPAw2$R" role="3clF45" />
+            <node concept="3Tm1VV" id="5wiIlPAw2$S" role="1B3o_S" />
+            <node concept="3clFbS" id="5wiIlPAw2$T" role="3clF47">
+              <node concept="3cpWs8" id="5wiIlPAw2$U" role="3cqZAp">
+                <node concept="3cpWsn" id="5wiIlPAw2$V" role="3cpWs9">
+                  <property role="TrG5h" value="t" />
+                  <node concept="3uibUv" id="5wiIlPAw2$W" role="1tU5fm">
+                    <ref role="3uigEE" to="9gdl:6VhyYlfKJd8" resolve="TransformHelper" />
+                  </node>
+                  <node concept="1rXfSq" id="5wiIlPAw2$X" role="33vP2m">
+                    <ref role="37wK5l" to="9gdl:6VhyYlfKUJG" resolve="newTransformer" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="5wiIlPAw2$Y" role="3cqZAp">
+                <node concept="3cpWsn" id="5wiIlPAw2$Z" role="3cpWs9">
+                  <property role="TrG5h" value="i" />
+                  <node concept="H_c77" id="5wiIlPAw2_0" role="1tU5fm" />
+                  <node concept="37vLTw" id="5wiIlPAw2_1" role="33vP2m">
+                    <ref role="3cqZAo" node="6LH9MCjO96B" resolve="mdl" />
+                    <node concept="1ZhdrF" id="5wiIlPAw2_2" role="lGtFl">
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                      <property role="2qtEX8" value="variableDeclaration" />
+                      <node concept="3$xsQk" id="5wiIlPAw2_3" role="3$ytzL">
+                        <node concept="3clFbS" id="5wiIlPAw2_4" role="2VODD2">
+                          <node concept="3clFbF" id="5wiIlPAw2_5" role="3cqZAp">
+                            <node concept="2OqwBi" id="5wiIlPAw2_6" role="3clFbG">
+                              <node concept="1iwH7S" id="5wiIlPAw2_7" role="2Oq$k0" />
+                              <node concept="1iwH70" id="5wiIlPAw2_8" role="2OqNvi">
+                                <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
+                                <node concept="2OqwBi" id="5wiIlPAw2_9" role="1iwH7V">
+                                  <node concept="2OqwBi" id="5wiIlPAw2_a" role="2Oq$k0">
+                                    <node concept="30H73N" id="5wiIlPAw2_b" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="5wiIlPAwkxK" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="lur:5wiIlPAvMBr" resolve="inputModel" />
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="5wiIlPAw2_d" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                                  </node>
+                                </node>
                               </node>
                             </node>
-                            <node concept="3TrEf2" id="6VhyYlfNcaL" role="2OqNvi">
-                              <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="5wiIlPAw2_e" role="3cqZAp">
+                <node concept="2OqwBi" id="5wiIlPAw2_f" role="3clFbG">
+                  <node concept="37vLTw" id="5wiIlPAw2_g" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5wiIlPAw2$V" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="5wiIlPAw2_h" role="2OqNvi">
+                    <ref role="37wK5l" to="9gdl:6VhyYlfKJet" resolve="setInput" />
+                    <node concept="37vLTw" id="5wiIlPAw2_i" role="37wK5m">
+                      <ref role="3cqZAo" node="5wiIlPAw2$Z" resolve="i" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="5wiIlPAw2_j" role="3cqZAp">
+                <node concept="2OqwBi" id="5wiIlPAw2_k" role="3clFbG">
+                  <node concept="37vLTw" id="5wiIlPAw2_l" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5wiIlPAw2$V" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="5wiIlPAw2_m" role="2OqNvi">
+                    <ref role="37wK5l" to="9gdl:354Yu58nCyL" resolve="setPlanProvider" />
+                    <node concept="1rXfSq" id="5wiIlPAw2_n" role="37wK5m">
+                      <ref role="37wK5l" to="9gdl:354Yu58nyp6" resolve="planProviderFromModel" />
+                      <node concept="37vLTw" id="5wiIlPAw2_o" role="37wK5m">
+                        <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
+                        <node concept="1ZhdrF" id="5wiIlPAw2_p" role="lGtFl">
+                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                          <property role="2qtEX8" value="variableDeclaration" />
+                          <node concept="3$xsQk" id="5wiIlPAw2_q" role="3$ytzL">
+                            <node concept="3clFbS" id="5wiIlPAw2_r" role="2VODD2">
+                              <node concept="3clFbF" id="5wiIlPAw2_s" role="3cqZAp">
+                                <node concept="2OqwBi" id="5wiIlPAw2_t" role="3clFbG">
+                                  <node concept="1iwH7S" id="5wiIlPAw2_u" role="2Oq$k0" />
+                                  <node concept="1iwH70" id="5wiIlPAw2_v" role="2OqNvi">
+                                    <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
+                                    <node concept="2OqwBi" id="5wiIlPAw2_w" role="1iwH7V">
+                                      <node concept="2OqwBi" id="5wiIlPAw2_x" role="2Oq$k0">
+                                        <node concept="30H73N" id="5wiIlPAw2_y" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="5wiIlPAwmeA" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="lur:5wiIlPAvMBt" resolve="transformationPlan" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrEf2" id="5wiIlPAw2_$" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbH" id="5wiIlPAw2__" role="3cqZAp" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1W57fq" id="5wiIlPAw2_A" role="lGtFl">
+                  <node concept="3IZrLx" id="5wiIlPAw2_B" role="3IZSJc">
+                    <node concept="3clFbS" id="5wiIlPAw2_C" role="2VODD2">
+                      <node concept="3clFbF" id="5wiIlPAw2_D" role="3cqZAp">
+                        <node concept="2OqwBi" id="5wiIlPAw2_E" role="3clFbG">
+                          <node concept="2OqwBi" id="5wiIlPAw2_F" role="2Oq$k0">
+                            <node concept="30H73N" id="5wiIlPAw2_G" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="5wiIlPAwlFR" role="2OqNvi">
+                              <ref role="3Tt5mk" to="lur:5wiIlPAvMBt" resolve="transformationPlan" />
                             </node>
                           </node>
+                          <node concept="3x8VRR" id="5wiIlPAw2_I" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6YXK3BUcpG" role="3cqZAp">
-          <node concept="1rXfSq" id="6VhyYlfMoDE" role="3clFbG">
-            <ref role="37wK5l" to="9gdl:6VhyYlfL99j" resolve="assertMatch" />
-            <node concept="2OqwBi" id="6NpSidvrzsE" role="37wK5m">
-              <node concept="37vLTw" id="6NpSidvrzls" role="2Oq$k0">
-                <ref role="3cqZAo" node="6VhyYlfKW1j" resolve="t" />
+              <node concept="3clFbF" id="5wiIlPAw2_J" role="3cqZAp">
+                <node concept="2OqwBi" id="5wiIlPAw2_K" role="3clFbG">
+                  <node concept="37vLTw" id="5wiIlPAw2_L" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5wiIlPAw2$V" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="5wiIlPAw2_M" role="2OqNvi">
+                    <ref role="37wK5l" to="9gdl:6VhyYlfKR_6" resolve="transform" />
+                  </node>
+                </node>
               </node>
-              <node concept="liA8E" id="6NpSidvrzzu" role="2OqNvi">
-                <ref role="37wK5l" to="9gdl:6VhyYlfKTp_" resolve="getOutputModel" />
+              <node concept="3cpWs8" id="5wiIlPAwpKv" role="3cqZAp">
+                <node concept="3cpWsn" id="5wiIlPAwpKw" role="3cpWs9">
+                  <property role="TrG5h" value="outputModels" />
+                  <node concept="3uibUv" id="5wiIlPAwpKr" role="1tU5fm">
+                    <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+                    <node concept="H_c77" id="5wiIlPAwpKu" role="11_B2D" />
+                  </node>
+                  <node concept="2OqwBi" id="5wiIlPAwpKx" role="33vP2m">
+                    <node concept="37vLTw" id="5wiIlPAwpKy" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5wiIlPAw2$V" resolve="t" />
+                    </node>
+                    <node concept="liA8E" id="5wiIlPAwpKz" role="2OqNvi">
+                      <ref role="37wK5l" to="9gdl:5wiIlPAwdhS" resolve="getOutputModels" />
+                    </node>
+                  </node>
+                </node>
               </node>
-            </node>
-            <node concept="37vLTw" id="6VhyYlfMoDG" role="37wK5m">
-              <ref role="3cqZAo" node="6VhyYlfMmTf" resolve="rm" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6VhyYlfMqzM" role="2AJF6D">
-        <ref role="2AI5Lk" to="rjhg:~Test" resolve="Test" />
-      </node>
-      <node concept="1WS0z7" id="6VhyYlfMqBF" role="lGtFl">
-        <node concept="3JmXsc" id="6VhyYlfMqBI" role="3Jn$fo">
-          <node concept="3clFbS" id="6VhyYlfMqBJ" role="2VODD2">
-            <node concept="3clFbF" id="6VhyYlfMqBP" role="3cqZAp">
-              <node concept="2OqwBi" id="6VhyYlfMX54" role="3clFbG">
-                <node concept="2OqwBi" id="6VhyYlfMqBK" role="2Oq$k0">
-                  <node concept="3Tsc0h" id="6VhyYlfMqBN" role="2OqNvi">
-                    <ref role="3TtcxE" to="lur:uLQNrGWd1B" resolve="tests" />
+              <node concept="3clFbF" id="5wiIlPAwmuH" role="3cqZAp">
+                <node concept="2YIFZM" id="5wiIlPAwn4F" role="3clFbG">
+                  <ref role="37wK5l" to="rjhg:~Assert.assertEquals(java.lang.String,long,long):void" resolve="assertEquals" />
+                  <ref role="1Pybhc" to="rjhg:~Assert" resolve="Assert" />
+                  <node concept="Xl_RD" id="5wiIlPAwnwK" role="37wK5m">
+                    <property role="Xl_RC" value="Number of output models" />
+                  </node>
+                  <node concept="3cmrfG" id="5wiIlPAwsCZ" role="37wK5m">
+                    <property role="3cmrfH" value="3" />
+                    <node concept="17Uvod" id="5wiIlPAwteF" role="lGtFl">
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                      <property role="2qtEX9" value="value" />
+                      <node concept="3zFVjK" id="5wiIlPAwteG" role="3zH0cK">
+                        <node concept="3clFbS" id="5wiIlPAwteH" role="2VODD2">
+                          <node concept="3clFbF" id="5wiIlPAwulS" role="3cqZAp">
+                            <node concept="2OqwBi" id="5wiIlPAwxYo" role="3clFbG">
+                              <node concept="2OqwBi" id="5wiIlPAwuII" role="2Oq$k0">
+                                <node concept="30H73N" id="5wiIlPAwulR" role="2Oq$k0" />
+                                <node concept="3Tsc0h" id="5wiIlPAwvIJ" role="2OqNvi">
+                                  <ref role="3TtcxE" to="lur:5wiIlPAvMBs" resolve="referenceModels" />
+                                </node>
+                              </node>
+                              <node concept="34oBXx" id="5wiIlPAwzNP" role="2OqNvi" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="5wiIlPAwrIT" role="37wK5m">
+                    <node concept="37vLTw" id="5wiIlPAwrjn" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5wiIlPAwpKw" resolve="outputModels" />
+                    </node>
+                    <node concept="liA8E" id="5wiIlPAws9L" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~Collection.size():int" resolve="size" />
+                    </node>
                   </node>
-                  <node concept="30H73N" id="6VhyYlfMqBO" role="2Oq$k0" />
                 </node>
-                <node concept="v3k3i" id="6VhyYlfMZzM" role="2OqNvi">
-                  <node concept="chp4Y" id="6VhyYlfMZSY" role="v3oSu">
-                    <ref role="cht4Q" to="lur:uLQNrGWd1n" resolve="TransformationMatchAssertion" />
+              </node>
+              <node concept="3clFbF" id="5wiIlPAw2A3" role="3cqZAp">
+                <node concept="1rXfSq" id="5wiIlPAw2A4" role="3clFbG">
+                  <ref role="37wK5l" to="9gdl:5wiIlPAv$5M" resolve="assertMatch" />
+                  <node concept="37vLTw" id="5wiIlPAwCkf" role="37wK5m">
+                    <ref role="3cqZAo" node="5wiIlPAwpKw" resolve="outputModels" />
+                  </node>
+                  <node concept="37vLTw" id="5wiIlPAwEz$" role="37wK5m">
+                    <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
+                    <node concept="1ZhdrF" id="5wiIlPAwF7v" role="lGtFl">
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                      <property role="2qtEX8" value="variableDeclaration" />
+                      <node concept="3$xsQk" id="5wiIlPAwF7w" role="3$ytzL">
+                        <node concept="3clFbS" id="5wiIlPAwF7x" role="2VODD2">
+                          <node concept="3clFbF" id="5wiIlPAwG$n" role="3cqZAp">
+                            <node concept="2OqwBi" id="5wiIlPAwG$o" role="3clFbG">
+                              <node concept="1iwH7S" id="5wiIlPAwG$p" role="2Oq$k0" />
+                              <node concept="1iwH70" id="5wiIlPAwG$q" role="2OqNvi">
+                                <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
+                                <node concept="2OqwBi" id="5wiIlPAwIWN" role="1iwH7V">
+                                  <node concept="30H73N" id="5wiIlPAwG$t" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="5wiIlPAwJbP" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1WS0z7" id="5wiIlPAwH97" role="lGtFl">
+                      <node concept="3JmXsc" id="5wiIlPAwH9a" role="3Jn$fo">
+                        <node concept="3clFbS" id="5wiIlPAwH9b" role="2VODD2">
+                          <node concept="3clFbF" id="5wiIlPAwH9h" role="3cqZAp">
+                            <node concept="2OqwBi" id="5wiIlPAwH9c" role="3clFbG">
+                              <node concept="3Tsc0h" id="5wiIlPAwH9f" role="2OqNvi">
+                                <ref role="3TtcxE" to="lur:5wiIlPAvMBs" resolve="referenceModels" />
+                              </node>
+                              <node concept="30H73N" id="5wiIlPAwH9g" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17Uvod" id="6VhyYlfMr3x" role="lGtFl">
-        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-        <property role="2qtEX9" value="name" />
-        <node concept="3zFVjK" id="6VhyYlfMr3y" role="3zH0cK">
-          <node concept="3clFbS" id="6VhyYlfMr3z" role="2VODD2">
-            <node concept="3SKdUt" id="6VhyYlfMAe4" role="3cqZAp">
-              <node concept="3SKdUq" id="6VhyYlfMAe6" role="3SKWNk">
-                <property role="3SKdUp" value="XXX would prefer template.input to reference GeneratorTest instead of node.parent" />
-              </node>
+            <node concept="2AHcQZ" id="5wiIlPAw2A9" role="2AJF6D">
+              <ref role="2AI5Lk" to="rjhg:~Test" resolve="Test" />
             </node>
-            <node concept="3clFbF" id="6VhyYlfMrlI" role="3cqZAp">
-              <node concept="2OqwBi" id="6VhyYlfMrXJ" role="3clFbG">
-                <node concept="1iwH7S" id="6VhyYlfMrlH" role="2Oq$k0" />
-                <node concept="32eq0B" id="6VhyYlfM$il" role="2OqNvi">
-                  <property role="32f$Ya" value="false" />
-                  <node concept="3zGtF$" id="6VhyYlfM$zJ" role="32eq0w" />
-                  <node concept="2OqwBi" id="6VhyYlfM_4X" role="32eq0x">
-                    <node concept="30H73N" id="6VhyYlfM$T8" role="2Oq$k0" />
-                    <node concept="1mfA1w" id="6VhyYlfM_qj" role="2OqNvi" />
+            <node concept="17Uvod" id="5wiIlPAw2Ak" role="lGtFl">
+              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+              <property role="2qtEX9" value="name" />
+              <node concept="3zFVjK" id="5wiIlPAw2Al" role="3zH0cK">
+                <node concept="3clFbS" id="5wiIlPAw2Am" role="2VODD2">
+                  <node concept="3SKdUt" id="5wiIlPAw2An" role="3cqZAp">
+                    <node concept="3SKdUq" id="5wiIlPAw2Ao" role="3SKWNk">
+                      <property role="3SKdUp" value="XXX would prefer template.input to reference GeneratorTest instead of node.parent" />
+                    </node>
+                  </node>
+                  <node concept="3SKdUt" id="46rVcNAEGr_" role="3cqZAp">
+                    <node concept="3SKdUq" id="46rVcNAEGrB" role="3SKWNk">
+                      <property role="3SKdUp" value="XXX don't use templateValue as I'd like the name of the method to be the same for both single and multiple match" />
+                    </node>
+                  </node>
+                  <node concept="3SKdUt" id="46rVcNAEGOP" role="3cqZAp">
+                    <node concept="3SKdUq" id="46rVcNAEGOR" role="3SKWNk">
+                      <property role="3SKdUp" value="    Just to avoid complicated hack with method name in GneratorTestWrapper" />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="5wiIlPAw2Ap" role="3cqZAp">
+                    <node concept="2OqwBi" id="5wiIlPAw2Aq" role="3clFbG">
+                      <node concept="1iwH7S" id="5wiIlPAw2Ar" role="2Oq$k0" />
+                      <node concept="32eq0B" id="5wiIlPAw2As" role="2OqNvi">
+                        <property role="32f$Ya" value="false" />
+                        <node concept="Xl_RD" id="46rVcNAEFYr" role="32eq0w">
+                          <property role="Xl_RC" value="testTransformAndMatch" />
+                        </node>
+                        <node concept="2OqwBi" id="5wiIlPAw2Au" role="32eq0x">
+                          <node concept="30H73N" id="5wiIlPAw2Av" role="2Oq$k0" />
+                          <node concept="1mfA1w" id="5wiIlPAw2Aw" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="raruj" id="6LH9MCjOklF" role="lGtFl" />
+          </node>
+          <node concept="2tJIrI" id="6LH9MCjO98c" role="jymVt" />
+          <node concept="3Tm1VV" id="6LH9MCjO98d" role="1B3o_S" />
+          <node concept="3uibUv" id="6LH9MCjO98e" role="1zkMxy">
+            <ref role="3uigEE" to="9gdl:3AyJARA_3iV" resolve="BaseGeneratorTest" />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="5wiIlPAw3Pa" role="jymVt" />
-    <node concept="3clFb_" id="5wiIlPAw2$Q" role="jymVt">
-      <property role="TrG5h" value="testTransformAndMatchMany" />
-      <node concept="3cqZAl" id="5wiIlPAw2$R" role="3clF45" />
-      <node concept="3Tm1VV" id="5wiIlPAw2$S" role="1B3o_S" />
-      <node concept="3clFbS" id="5wiIlPAw2$T" role="3clF47">
-        <node concept="3cpWs8" id="5wiIlPAw2$U" role="3cqZAp">
-          <node concept="3cpWsn" id="5wiIlPAw2$V" role="3cpWs9">
-            <property role="TrG5h" value="t" />
-            <node concept="3uibUv" id="5wiIlPAw2$W" role="1tU5fm">
-              <ref role="3uigEE" to="9gdl:6VhyYlfKJd8" resolve="TransformHelper" />
-            </node>
-            <node concept="1rXfSq" id="5wiIlPAw2$X" role="33vP2m">
-              <ref role="37wK5l" to="9gdl:6VhyYlfKUJG" resolve="newTransformer" />
-            </node>
+    <node concept="3aamgX" id="6LH9MCjPJCL" role="3acgRq">
+      <ref role="30HIoZ" to="lur:6LH9MCjOOqD" resolve="TransformationMatchCustomConditions" />
+      <node concept="1Koe21" id="6LH9MCjPJCM" role="1lVwrX">
+        <node concept="312cEu" id="6LH9MCjPJCN" role="1Koe22">
+          <property role="TrG5h" value="Test" />
+          <node concept="2tJIrI" id="6LH9MCjPJCO" role="jymVt" />
+          <node concept="312cEg" id="6LH9MCjPJCP" role="jymVt">
+            <property role="34CwA1" value="false" />
+            <property role="eg7rD" value="false" />
+            <property role="TrG5h" value="mdl" />
+            <property role="3TUv4t" value="false" />
+            <node concept="H_c77" id="6LH9MCjPJCQ" role="1tU5fm" />
           </node>
-        </node>
-        <node concept="3cpWs8" id="5wiIlPAw2$Y" role="3cqZAp">
-          <node concept="3cpWsn" id="5wiIlPAw2$Z" role="3cpWs9">
-            <property role="TrG5h" value="i" />
-            <node concept="H_c77" id="5wiIlPAw2_0" role="1tU5fm" />
-            <node concept="37vLTw" id="5wiIlPAw2_1" role="33vP2m">
-              <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
-              <node concept="1ZhdrF" id="5wiIlPAw2_2" role="lGtFl">
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                <property role="2qtEX8" value="variableDeclaration" />
-                <node concept="3$xsQk" id="5wiIlPAw2_3" role="3$ytzL">
-                  <node concept="3clFbS" id="5wiIlPAw2_4" role="2VODD2">
-                    <node concept="3clFbF" id="5wiIlPAw2_5" role="3cqZAp">
-                      <node concept="2OqwBi" id="5wiIlPAw2_6" role="3clFbG">
-                        <node concept="1iwH7S" id="5wiIlPAw2_7" role="2Oq$k0" />
-                        <node concept="1iwH70" id="5wiIlPAw2_8" role="2OqNvi">
-                          <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
-                          <node concept="2OqwBi" id="5wiIlPAw2_9" role="1iwH7V">
-                            <node concept="2OqwBi" id="5wiIlPAw2_a" role="2Oq$k0">
-                              <node concept="30H73N" id="5wiIlPAw2_b" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="5wiIlPAwkxK" role="2OqNvi">
-                                <ref role="3Tt5mk" to="lur:5wiIlPAvMBr" resolve="inputModel" />
+          <node concept="2tJIrI" id="6LH9MCjPJCR" role="jymVt" />
+          <node concept="3clFb_" id="6LH9MCjPJCS" role="jymVt">
+            <property role="TrG5h" value="testTransformAndMatch" />
+            <node concept="3cqZAl" id="6LH9MCjPJCT" role="3clF45" />
+            <node concept="3Tm1VV" id="6LH9MCjPJCU" role="1B3o_S" />
+            <node concept="3clFbS" id="6LH9MCjPJCV" role="3clF47">
+              <node concept="3cpWs8" id="6LH9MCjPJCW" role="3cqZAp">
+                <node concept="3cpWsn" id="6LH9MCjPJCX" role="3cpWs9">
+                  <property role="TrG5h" value="t" />
+                  <node concept="3uibUv" id="6LH9MCjPJCY" role="1tU5fm">
+                    <ref role="3uigEE" to="9gdl:6VhyYlfKJd8" resolve="TransformHelper" />
+                  </node>
+                  <node concept="1rXfSq" id="6LH9MCjPJCZ" role="33vP2m">
+                    <ref role="37wK5l" to="9gdl:6VhyYlfKUJG" resolve="newTransformer" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="6LH9MCjPJD0" role="3cqZAp">
+                <node concept="3cpWsn" id="6LH9MCjPJD1" role="3cpWs9">
+                  <property role="TrG5h" value="i" />
+                  <node concept="H_c77" id="6LH9MCjPJD2" role="1tU5fm" />
+                  <node concept="37vLTw" id="6LH9MCjPJD3" role="33vP2m">
+                    <ref role="3cqZAo" node="6LH9MCjPJCP" resolve="mdl" />
+                    <node concept="1ZhdrF" id="6LH9MCjPJD4" role="lGtFl">
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                      <property role="2qtEX8" value="variableDeclaration" />
+                      <node concept="3$xsQk" id="6LH9MCjPJD5" role="3$ytzL">
+                        <node concept="3clFbS" id="6LH9MCjPJD6" role="2VODD2">
+                          <node concept="3clFbF" id="6LH9MCjPJD7" role="3cqZAp">
+                            <node concept="2OqwBi" id="6LH9MCjPJD8" role="3clFbG">
+                              <node concept="1iwH7S" id="6LH9MCjPJD9" role="2Oq$k0" />
+                              <node concept="1iwH70" id="6LH9MCjPJDa" role="2OqNvi">
+                                <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
+                                <node concept="2OqwBi" id="6LH9MCjPJDb" role="1iwH7V">
+                                  <node concept="2OqwBi" id="6LH9MCjPJDc" role="2Oq$k0">
+                                    <node concept="30H73N" id="6LH9MCjPJDd" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="6LH9MCjQdZG" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="lur:6LH9MCjOOqG" resolve="inputModel" />
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="6LH9MCjPJDf" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6LH9MCjPJDg" role="3cqZAp">
+                <node concept="2OqwBi" id="6LH9MCjPJDh" role="3clFbG">
+                  <node concept="37vLTw" id="6LH9MCjPJDi" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6LH9MCjPJCX" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="6LH9MCjPJDj" role="2OqNvi">
+                    <ref role="37wK5l" to="9gdl:6VhyYlfKJet" resolve="setInput" />
+                    <node concept="37vLTw" id="6LH9MCjPJDk" role="37wK5m">
+                      <ref role="3cqZAo" node="6LH9MCjPJD1" resolve="i" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6LH9MCjPJDl" role="3cqZAp">
+                <node concept="2OqwBi" id="6LH9MCjPJDm" role="3clFbG">
+                  <node concept="37vLTw" id="6LH9MCjPJDn" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6LH9MCjPJCX" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="6LH9MCjPJDo" role="2OqNvi">
+                    <ref role="37wK5l" to="9gdl:354Yu58nCyL" resolve="setPlanProvider" />
+                    <node concept="1rXfSq" id="6LH9MCjPJDp" role="37wK5m">
+                      <ref role="37wK5l" to="9gdl:354Yu58nyp6" resolve="planProviderFromModel" />
+                      <node concept="37vLTw" id="6LH9MCjPJDq" role="37wK5m">
+                        <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
+                        <node concept="1ZhdrF" id="6LH9MCjPJDr" role="lGtFl">
+                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                          <property role="2qtEX8" value="variableDeclaration" />
+                          <node concept="3$xsQk" id="6LH9MCjPJDs" role="3$ytzL">
+                            <node concept="3clFbS" id="6LH9MCjPJDt" role="2VODD2">
+                              <node concept="3clFbF" id="6LH9MCjPJDu" role="3cqZAp">
+                                <node concept="2OqwBi" id="6LH9MCjPJDv" role="3clFbG">
+                                  <node concept="1iwH7S" id="6LH9MCjPJDw" role="2Oq$k0" />
+                                  <node concept="1iwH70" id="6LH9MCjPJDx" role="2OqNvi">
+                                    <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
+                                    <node concept="2OqwBi" id="6LH9MCjPJDy" role="1iwH7V">
+                                      <node concept="2OqwBi" id="6LH9MCjPJDz" role="2Oq$k0">
+                                        <node concept="30H73N" id="6LH9MCjPJD$" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="6LH9MCjQfwC" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="lur:6LH9MCjOOqI" resolve="transformationPlan" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrEf2" id="6LH9MCjPJDA" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
+                              <node concept="3clFbH" id="6LH9MCjPJDB" role="3cqZAp" />
                             </node>
-                            <node concept="3TrEf2" id="5wiIlPAw2_d" role="2OqNvi">
-                              <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1W57fq" id="6LH9MCjPJDC" role="lGtFl">
+                  <node concept="3IZrLx" id="6LH9MCjPJDD" role="3IZSJc">
+                    <node concept="3clFbS" id="6LH9MCjPJDE" role="2VODD2">
+                      <node concept="3clFbF" id="6LH9MCjPJDF" role="3cqZAp">
+                        <node concept="2OqwBi" id="6LH9MCjPJDG" role="3clFbG">
+                          <node concept="2OqwBi" id="6LH9MCjPJDH" role="2Oq$k0">
+                            <node concept="30H73N" id="6LH9MCjPJDI" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="6LH9MCjQjVT" role="2OqNvi">
+                              <ref role="3Tt5mk" to="lur:6LH9MCjOOqI" resolve="transformationPlan" />
                             </node>
                           </node>
+                          <node concept="3x8VRR" id="6LH9MCjPJDK" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5wiIlPAw2_e" role="3cqZAp">
-          <node concept="2OqwBi" id="5wiIlPAw2_f" role="3clFbG">
-            <node concept="37vLTw" id="5wiIlPAw2_g" role="2Oq$k0">
-              <ref role="3cqZAo" node="5wiIlPAw2$V" resolve="t" />
-            </node>
-            <node concept="liA8E" id="5wiIlPAw2_h" role="2OqNvi">
-              <ref role="37wK5l" to="9gdl:6VhyYlfKJet" resolve="setInput" />
-              <node concept="37vLTw" id="5wiIlPAw2_i" role="37wK5m">
-                <ref role="3cqZAo" node="5wiIlPAw2$Z" resolve="i" />
+              <node concept="3clFbF" id="6LH9MCjPJDL" role="3cqZAp">
+                <node concept="2OqwBi" id="6LH9MCjPJDM" role="3clFbG">
+                  <node concept="37vLTw" id="6LH9MCjPJDN" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6LH9MCjPJCX" resolve="t" />
+                  </node>
+                  <node concept="liA8E" id="6LH9MCjPJDO" role="2OqNvi">
+                    <ref role="37wK5l" to="9gdl:6VhyYlfKR_6" resolve="transform" />
+                  </node>
+                </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5wiIlPAw2_j" role="3cqZAp">
-          <node concept="2OqwBi" id="5wiIlPAw2_k" role="3clFbG">
-            <node concept="37vLTw" id="5wiIlPAw2_l" role="2Oq$k0">
-              <ref role="3cqZAo" node="5wiIlPAw2$V" resolve="t" />
-            </node>
-            <node concept="liA8E" id="5wiIlPAw2_m" role="2OqNvi">
-              <ref role="37wK5l" to="9gdl:354Yu58nCyL" resolve="setPlanProvider" />
-              <node concept="1rXfSq" id="5wiIlPAw2_n" role="37wK5m">
-                <ref role="37wK5l" to="9gdl:354Yu58nyp6" resolve="planProviderFromModel" />
-                <node concept="37vLTw" id="5wiIlPAw2_o" role="37wK5m">
-                  <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
-                  <node concept="1ZhdrF" id="5wiIlPAw2_p" role="lGtFl">
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <node concept="3$xsQk" id="5wiIlPAw2_q" role="3$ytzL">
-                      <node concept="3clFbS" id="5wiIlPAw2_r" role="2VODD2">
-                        <node concept="3clFbF" id="5wiIlPAw2_s" role="3cqZAp">
-                          <node concept="2OqwBi" id="5wiIlPAw2_t" role="3clFbG">
-                            <node concept="1iwH7S" id="5wiIlPAw2_u" role="2Oq$k0" />
-                            <node concept="1iwH70" id="5wiIlPAw2_v" role="2OqNvi">
-                              <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
-                              <node concept="2OqwBi" id="5wiIlPAw2_w" role="1iwH7V">
-                                <node concept="2OqwBi" id="5wiIlPAw2_x" role="2Oq$k0">
-                                  <node concept="30H73N" id="5wiIlPAw2_y" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="5wiIlPAwmeA" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="lur:5wiIlPAvMBt" resolve="transformationPlan" />
+              <node concept="3cpWs8" id="6LH9MCjPQHP" role="3cqZAp">
+                <node concept="3cpWsn" id="6LH9MCjPQHQ" role="3cpWs9">
+                  <property role="TrG5h" value="outputModel" />
+                  <node concept="H_c77" id="6LH9MCjPQHN" role="1tU5fm" />
+                  <node concept="2OqwBi" id="6LH9MCjPQHR" role="33vP2m">
+                    <node concept="37vLTw" id="6LH9MCjPQHS" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6LH9MCjPJCX" resolve="t" />
+                    </node>
+                    <node concept="liA8E" id="6LH9MCjPQHT" role="2OqNvi">
+                      <ref role="37wK5l" to="9gdl:6VhyYlfKTp_" resolve="getOutputModel" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1QHqEK" id="6LH9MCjQDPP" role="3cqZAp">
+                <node concept="1QHqEC" id="6LH9MCjQDPR" role="1QHqEI">
+                  <node concept="3clFbS" id="6LH9MCjQDPT" role="1bW5cS">
+                    <node concept="3clFbF" id="6LH9MCjPSyn" role="3cqZAp">
+                      <node concept="2OqwBi" id="6LH9MCjPTSn" role="3clFbG">
+                        <node concept="10M0yZ" id="6LH9MCjPT7V" role="2Oq$k0">
+                          <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+                          <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                        </node>
+                        <node concept="liA8E" id="6LH9MCjPUZm" role="2OqNvi">
+                          <ref role="37wK5l" to="guwi:~PrintStream.println():void" resolve="println" />
+                        </node>
+                      </node>
+                      <node concept="2b32R4" id="6LH9MCjQrH5" role="lGtFl">
+                        <node concept="3JmXsc" id="6LH9MCjQrH6" role="2P8S$">
+                          <node concept="3clFbS" id="6LH9MCjQrH7" role="2VODD2">
+                            <node concept="3clFbF" id="6LH9MCjQtqF" role="3cqZAp">
+                              <node concept="2OqwBi" id="6LH9MCjQvvl" role="3clFbG">
+                                <node concept="2OqwBi" id="6LH9MCjQuuI" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="6LH9MCjQtAP" role="2Oq$k0">
+                                    <node concept="30H73N" id="6LH9MCjQtqE" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="6LH9MCjQu1h" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="lur:6LH9MCjOQVT" resolve="assertions" />
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="6LH9MCjQuVq" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="tpee:gyVODHa" resolve="body" />
                                   </node>
                                 </node>
-                                <node concept="3TrEf2" id="5wiIlPAw2_$" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                                <node concept="3Tsc0h" id="6LH9MCjQw6h" role="2OqNvi">
+                                  <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbH" id="5wiIlPAw2__" role="3cqZAp" />
                       </node>
                     </node>
                   </node>
                 </node>
+                <node concept="2OqwBi" id="6LH9MCjQI5F" role="ukAjM">
+                  <node concept="2JrnkZ" id="6LH9MCjQJnQ" role="2Oq$k0">
+                    <node concept="37vLTw" id="6LH9MCjQHqD" role="2JrQYb">
+                      <ref role="3cqZAo" node="6LH9MCjPQHQ" resolve="outputModel" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="6LH9MCjQJu5" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  </node>
+                </node>
               </node>
             </node>
-          </node>
-          <node concept="1W57fq" id="5wiIlPAw2_A" role="lGtFl">
-            <node concept="3IZrLx" id="5wiIlPAw2_B" role="3IZSJc">
-              <node concept="3clFbS" id="5wiIlPAw2_C" role="2VODD2">
-                <node concept="3clFbF" id="5wiIlPAw2_D" role="3cqZAp">
-                  <node concept="2OqwBi" id="5wiIlPAw2_E" role="3clFbG">
-                    <node concept="2OqwBi" id="5wiIlPAw2_F" role="2Oq$k0">
-                      <node concept="30H73N" id="5wiIlPAw2_G" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="5wiIlPAwlFR" role="2OqNvi">
-                        <ref role="3Tt5mk" to="lur:5wiIlPAvMBt" resolve="transformationPlan" />
+            <node concept="2AHcQZ" id="6LH9MCjPJEb" role="2AJF6D">
+              <ref role="2AI5Lk" to="rjhg:~Test" resolve="Test" />
+            </node>
+            <node concept="17Uvod" id="6LH9MCjPJEc" role="lGtFl">
+              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+              <property role="2qtEX9" value="name" />
+              <node concept="3zFVjK" id="6LH9MCjPJEd" role="3zH0cK">
+                <node concept="3clFbS" id="6LH9MCjPJEe" role="2VODD2">
+                  <node concept="3SKdUt" id="6LH9MCjPJEf" role="3cqZAp">
+                    <node concept="3SKdUq" id="6LH9MCjPJEg" role="3SKWNk">
+                      <property role="3SKdUp" value="XXX would prefer template.input to reference GeneratorTest instead of node.parent" />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="6LH9MCjPJEh" role="3cqZAp">
+                    <node concept="2OqwBi" id="6LH9MCjPJEi" role="3clFbG">
+                      <node concept="1iwH7S" id="6LH9MCjPJEj" role="2Oq$k0" />
+                      <node concept="32eq0B" id="6LH9MCjPJEk" role="2OqNvi">
+                        <property role="32f$Ya" value="false" />
+                        <node concept="3zGtF$" id="6LH9MCjPJEl" role="32eq0w" />
+                        <node concept="2OqwBi" id="6LH9MCjPJEm" role="32eq0x">
+                          <node concept="30H73N" id="6LH9MCjPJEn" role="2Oq$k0" />
+                          <node concept="1mfA1w" id="6LH9MCjPJEo" role="2OqNvi" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="3x8VRR" id="5wiIlPAw2_I" role="2OqNvi" />
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="raruj" id="6LH9MCjPJEp" role="lGtFl" />
           </node>
-        </node>
-        <node concept="3clFbF" id="5wiIlPAw2_J" role="3cqZAp">
-          <node concept="2OqwBi" id="5wiIlPAw2_K" role="3clFbG">
-            <node concept="37vLTw" id="5wiIlPAw2_L" role="2Oq$k0">
-              <ref role="3cqZAo" node="5wiIlPAw2$V" resolve="t" />
-            </node>
-            <node concept="liA8E" id="5wiIlPAw2_M" role="2OqNvi">
-              <ref role="37wK5l" to="9gdl:6VhyYlfKR_6" resolve="transform" />
-            </node>
+          <node concept="2tJIrI" id="6LH9MCjPJEq" role="jymVt" />
+          <node concept="3Tm1VV" id="6LH9MCjPJEr" role="1B3o_S" />
+          <node concept="3uibUv" id="6LH9MCjPJEs" role="1zkMxy">
+            <ref role="3uigEE" to="9gdl:3AyJARA_3iV" resolve="BaseGeneratorTest" />
           </node>
         </node>
-        <node concept="3cpWs8" id="5wiIlPAwpKv" role="3cqZAp">
-          <node concept="3cpWsn" id="5wiIlPAwpKw" role="3cpWs9">
-            <property role="TrG5h" value="outputModels" />
-            <node concept="3uibUv" id="5wiIlPAwpKr" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-              <node concept="H_c77" id="5wiIlPAwpKu" role="11_B2D" />
-            </node>
-            <node concept="2OqwBi" id="5wiIlPAwpKx" role="33vP2m">
-              <node concept="37vLTw" id="5wiIlPAwpKy" role="2Oq$k0">
-                <ref role="3cqZAo" node="5wiIlPAw2$V" resolve="t" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="6LH9MCjQ1XK" role="3acgRq">
+      <ref role="30HIoZ" to="lur:6LH9MCjOVeL" resolve="Model_ConceptFunctionParameter" />
+      <node concept="1Koe21" id="6LH9MCjQlK8" role="1lVwrX">
+        <node concept="3clFb_" id="6LH9MCjQlKh" role="1Koe22">
+          <property role="TrG5h" value="foo" />
+          <node concept="H_c77" id="6LH9MCjQlOq" role="3clF45" />
+          <node concept="3clFbS" id="6LH9MCjQlKV" role="3clF47">
+            <node concept="3cpWs8" id="6LH9MCjQlKQ" role="3cqZAp">
+              <node concept="3cpWsn" id="6LH9MCjQlKT" role="3cpWs9">
+                <property role="TrG5h" value="outputModel" />
+                <node concept="H_c77" id="6LH9MCjQlKP" role="1tU5fm" />
+                <node concept="10Nm6u" id="6LH9MCjQlO6" role="33vP2m" />
               </node>
-              <node concept="liA8E" id="5wiIlPAwpKz" role="2OqNvi">
-                <ref role="37wK5l" to="9gdl:5wiIlPAwdhS" resolve="getOutputModels" />
+            </node>
+            <node concept="3clFbF" id="6LH9MCjQlM1" role="3cqZAp">
+              <node concept="37vLTw" id="6LH9MCjQlLZ" role="3clFbG">
+                <ref role="3cqZAo" node="6LH9MCjQlKT" resolve="outputModel" />
+                <node concept="raruj" id="6LH9MCjQlNC" role="lGtFl" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5wiIlPAwmuH" role="3cqZAp">
-          <node concept="2YIFZM" id="5wiIlPAwn4F" role="3clFbG">
-            <ref role="1Pybhc" to="rjhg:~Assert" resolve="Assert" />
-            <ref role="37wK5l" to="rjhg:~Assert.assertEquals(java.lang.String,long,long):void" resolve="assertEquals" />
-            <node concept="Xl_RD" id="5wiIlPAwnwK" role="37wK5m">
-              <property role="Xl_RC" value="Number of output models" />
-            </node>
-            <node concept="3cmrfG" id="5wiIlPAwsCZ" role="37wK5m">
-              <property role="3cmrfH" value="3" />
-              <node concept="17Uvod" id="5wiIlPAwteF" role="lGtFl">
-                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
-                <property role="2qtEX9" value="value" />
-                <node concept="3zFVjK" id="5wiIlPAwteG" role="3zH0cK">
-                  <node concept="3clFbS" id="5wiIlPAwteH" role="2VODD2">
-                    <node concept="3clFbF" id="5wiIlPAwulS" role="3cqZAp">
-                      <node concept="2OqwBi" id="5wiIlPAwxYo" role="3clFbG">
-                        <node concept="2OqwBi" id="5wiIlPAwuII" role="2Oq$k0">
-                          <node concept="30H73N" id="5wiIlPAwulR" role="2Oq$k0" />
-                          <node concept="3Tsc0h" id="5wiIlPAwvIJ" role="2OqNvi">
-                            <ref role="3TtcxE" to="lur:5wiIlPAvMBs" resolve="referenceModels" />
-                          </node>
-                        </node>
-                        <node concept="34oBXx" id="5wiIlPAwzNP" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
+      </node>
+    </node>
+    <node concept="3lhOvk" id="uLQNrGWiQb" role="3lj3bC">
+      <ref role="30HIoZ" to="lur:uLQNrGW9aY" resolve="GeneratorTest" />
+      <ref role="3lhOvi" node="uLQNrGWiTP" resolve="GeneratorTestClass" />
+    </node>
+    <node concept="2rT7sh" id="6VhyYlfMRqJ" role="2rTMjI">
+      <property role="TrG5h" value="TestArg2Field" />
+      <ref role="2rTdP9" to="lur:uLQNrGW9LE" resolve="TestArgument" />
+      <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
+    </node>
+  </node>
+  <node concept="312cEu" id="uLQNrGWiTP">
+    <property role="TrG5h" value="GeneratorTestClass" />
+    <node concept="312cEg" id="6VhyYlfMAsj" role="jymVt">
+      <property role="TrG5h" value="f" />
+      <node concept="3Tm6S6" id="6VhyYlfMAsk" role="1B3o_S" />
+      <node concept="10Oyi0" id="6VhyYlfMAL3" role="1tU5fm" />
+      <node concept="1WS0z7" id="6VhyYlfMALC" role="lGtFl">
+        <node concept="3JmXsc" id="6VhyYlfMALF" role="3Jn$fo">
+          <node concept="3clFbS" id="6VhyYlfMALG" role="2VODD2">
+            <node concept="3clFbF" id="6VhyYlfMALM" role="3cqZAp">
+              <node concept="2OqwBi" id="6VhyYlfMALH" role="3clFbG">
+                <node concept="3Tsc0h" id="2kP5W5yTzqG" role="2OqNvi">
+                  <ref role="3TtcxE" to="lur:uLQNrGW9LB" resolve="arguments" />
                 </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="5wiIlPAwrIT" role="37wK5m">
-              <node concept="37vLTw" id="5wiIlPAwrjn" role="2Oq$k0">
-                <ref role="3cqZAo" node="5wiIlPAwpKw" resolve="outputModels" />
-              </node>
-              <node concept="liA8E" id="5wiIlPAws9L" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Collection.size():int" resolve="size" />
+                <node concept="30H73N" id="6VhyYlfMALL" role="2Oq$k0" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5wiIlPAw2A3" role="3cqZAp">
-          <node concept="1rXfSq" id="5wiIlPAw2A4" role="3clFbG">
-            <ref role="37wK5l" to="9gdl:5wiIlPAv$5M" resolve="assertMatch" />
-            <node concept="37vLTw" id="5wiIlPAwCkf" role="37wK5m">
-              <ref role="3cqZAo" node="5wiIlPAwpKw" resolve="outputModels" />
+      </node>
+      <node concept="1sPUBX" id="2kP5W5yTsls" role="lGtFl">
+        <ref role="v9R2y" node="6VhyYlfMIEq" resolve="switch_TestArgument_Field" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6VhyYlfKVUZ" role="jymVt" />
+    <node concept="3clFb_" id="6VhyYlfMB_O" role="jymVt">
+      <property role="TrG5h" value="prepareArguments" />
+      <node concept="3cqZAl" id="6VhyYlfMB_Q" role="3clF45" />
+      <node concept="3Tm1VV" id="6VhyYlfMB_R" role="1B3o_S" />
+      <node concept="3clFbS" id="6VhyYlfMB_S" role="3clF47">
+        <node concept="3clFbF" id="6VhyYlfMFAT" role="3cqZAp">
+          <node concept="37vLTI" id="6VhyYlfMHDR" role="3clFbG">
+            <node concept="3cmrfG" id="6VhyYlfMHI4" role="37vLTx">
+              <property role="3cmrfH" value="3" />
             </node>
-            <node concept="37vLTw" id="5wiIlPAwEz$" role="37wK5m">
+            <node concept="37vLTw" id="6VhyYlfMFAS" role="37vLTJ">
               <ref role="3cqZAo" node="6VhyYlfMAsj" resolve="f" />
-              <node concept="1ZhdrF" id="5wiIlPAwF7v" role="lGtFl">
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                <property role="2qtEX8" value="variableDeclaration" />
-                <node concept="3$xsQk" id="5wiIlPAwF7w" role="3$ytzL">
-                  <node concept="3clFbS" id="5wiIlPAwF7x" role="2VODD2">
-                    <node concept="3clFbF" id="5wiIlPAwG$n" role="3cqZAp">
-                      <node concept="2OqwBi" id="5wiIlPAwG$o" role="3clFbG">
-                        <node concept="1iwH7S" id="5wiIlPAwG$p" role="2Oq$k0" />
-                        <node concept="1iwH70" id="5wiIlPAwG$q" role="2OqNvi">
-                          <ref role="1iwH77" node="6VhyYlfMRqJ" resolve="TestArg2Field" />
-                          <node concept="2OqwBi" id="5wiIlPAwIWN" role="1iwH7V">
-                            <node concept="30H73N" id="5wiIlPAwG$t" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="5wiIlPAwJbP" role="2OqNvi">
-                              <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1WS0z7" id="5wiIlPAwH97" role="lGtFl">
-                <node concept="3JmXsc" id="5wiIlPAwH9a" role="3Jn$fo">
-                  <node concept="3clFbS" id="5wiIlPAwH9b" role="2VODD2">
-                    <node concept="3clFbF" id="5wiIlPAwH9h" role="3cqZAp">
-                      <node concept="2OqwBi" id="5wiIlPAwH9c" role="3clFbG">
-                        <node concept="3Tsc0h" id="5wiIlPAwH9f" role="2OqNvi">
-                          <ref role="3TtcxE" to="lur:5wiIlPAvMBs" resolve="referenceModels" />
-                        </node>
-                        <node concept="30H73N" id="5wiIlPAwH9g" role="2Oq$k0" />
-                      </node>
+            </node>
+          </node>
+          <node concept="1WS0z7" id="6VhyYlfMIbB" role="lGtFl">
+            <node concept="3JmXsc" id="6VhyYlfMIbE" role="3Jn$fo">
+              <node concept="3clFbS" id="6VhyYlfMIbF" role="2VODD2">
+                <node concept="3clFbF" id="6VhyYlfMIbL" role="3cqZAp">
+                  <node concept="2OqwBi" id="6VhyYlfMIbG" role="3clFbG">
+                    <node concept="3Tsc0h" id="2kP5W5yT$2x" role="2OqNvi">
+                      <ref role="3TtcxE" to="lur:uLQNrGW9LB" resolve="arguments" />
                     </node>
+                    <node concept="30H73N" id="6VhyYlfMIbK" role="2Oq$k0" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="1sPUBX" id="2kP5W5yTts$" role="lGtFl">
+            <ref role="v9R2y" node="6VhyYlfMIEx" resolve="switch_TestArgument_Initializer" />
+          </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="5wiIlPAw2A9" role="2AJF6D">
+      <node concept="2AHcQZ" id="6VhyYlfME4H" role="2AJF6D">
+        <ref role="2AI5Lk" to="rjhg:~Before" resolve="Before" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6VhyYlfMAU8" role="jymVt" />
+    <node concept="3clFb_" id="6LH9MCjNEel" role="jymVt">
+      <property role="TrG5h" value="testTransformAndMatch" />
+      <node concept="3cqZAl" id="6LH9MCjNEem" role="3clF45" />
+      <node concept="3Tm1VV" id="6LH9MCjNEen" role="1B3o_S" />
+      <node concept="3clFbS" id="6LH9MCjNEeo" role="3clF47" />
+      <node concept="2AHcQZ" id="6LH9MCjNEfC" role="2AJF6D">
         <ref role="2AI5Lk" to="rjhg:~Test" resolve="Test" />
       </node>
-      <node concept="1WS0z7" id="5wiIlPAw2Aa" role="lGtFl">
-        <node concept="3JmXsc" id="5wiIlPAw2Ab" role="3Jn$fo">
-          <node concept="3clFbS" id="5wiIlPAw2Ac" role="2VODD2">
-            <node concept="3clFbF" id="5wiIlPAw2Ad" role="3cqZAp">
-              <node concept="2OqwBi" id="5wiIlPAw2Ae" role="3clFbG">
-                <node concept="2OqwBi" id="5wiIlPAw2Af" role="2Oq$k0">
-                  <node concept="3Tsc0h" id="5wiIlPAw2Ag" role="2OqNvi">
-                    <ref role="3TtcxE" to="lur:uLQNrGWd1B" resolve="tests" />
-                  </node>
-                  <node concept="30H73N" id="5wiIlPAw2Ah" role="2Oq$k0" />
-                </node>
-                <node concept="v3k3i" id="5wiIlPAw2Ai" role="2OqNvi">
-                  <node concept="chp4Y" id="5wiIlPAw66m" role="v3oSu">
-                    <ref role="cht4Q" to="lur:5wiIlPAvMBp" resolve="TransformationMatchManyAssertion" />
-                  </node>
+      <node concept="2b32R4" id="6LH9MCjNH23" role="lGtFl">
+        <node concept="3JmXsc" id="6LH9MCjNH24" role="2P8S$">
+          <node concept="3clFbS" id="6LH9MCjNH25" role="2VODD2">
+            <node concept="3clFbF" id="6LH9MCjNIVI" role="3cqZAp">
+              <node concept="2OqwBi" id="6LH9MCjNJlO" role="3clFbG">
+                <node concept="30H73N" id="6LH9MCjNIVH" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="6LH9MCjNL3K" role="2OqNvi">
+                  <ref role="3TtcxE" to="lur:uLQNrGWd1B" resolve="tests" />
                 </node>
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="17Uvod" id="5wiIlPAw2Ak" role="lGtFl">
+      <node concept="17Uvod" id="6LH9MCjNEfN" role="lGtFl">
         <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
         <property role="2qtEX9" value="name" />
-        <node concept="3zFVjK" id="5wiIlPAw2Al" role="3zH0cK">
-          <node concept="3clFbS" id="5wiIlPAw2Am" role="2VODD2">
-            <node concept="3SKdUt" id="5wiIlPAw2An" role="3cqZAp">
-              <node concept="3SKdUq" id="5wiIlPAw2Ao" role="3SKWNk">
+        <node concept="3zFVjK" id="6LH9MCjNEfO" role="3zH0cK">
+          <node concept="3clFbS" id="6LH9MCjNEfP" role="2VODD2">
+            <node concept="3SKdUt" id="6LH9MCjNEfQ" role="3cqZAp">
+              <node concept="3SKdUq" id="6LH9MCjNEfR" role="3SKWNk">
                 <property role="3SKdUp" value="XXX would prefer template.input to reference GeneratorTest instead of node.parent" />
               </node>
             </node>
-            <node concept="3SKdUt" id="46rVcNAEGr_" role="3cqZAp">
-              <node concept="3SKdUq" id="46rVcNAEGrB" role="3SKWNk">
-                <property role="3SKdUp" value="XXX don't use templateValue as I'd like the name of the method to be the same for both single and multiple match" />
-              </node>
-            </node>
-            <node concept="3SKdUt" id="46rVcNAEGOP" role="3cqZAp">
-              <node concept="3SKdUq" id="46rVcNAEGOR" role="3SKWNk">
-                <property role="3SKdUp" value="    Just to avoid complicated hack with method name in GneratorTestWrapper" />
-              </node>
-            </node>
-            <node concept="3clFbF" id="5wiIlPAw2Ap" role="3cqZAp">
-              <node concept="2OqwBi" id="5wiIlPAw2Aq" role="3clFbG">
-                <node concept="1iwH7S" id="5wiIlPAw2Ar" role="2Oq$k0" />
-                <node concept="32eq0B" id="5wiIlPAw2As" role="2OqNvi">
+            <node concept="3clFbF" id="6LH9MCjNEfS" role="3cqZAp">
+              <node concept="2OqwBi" id="6LH9MCjNEfT" role="3clFbG">
+                <node concept="1iwH7S" id="6LH9MCjNEfU" role="2Oq$k0" />
+                <node concept="32eq0B" id="6LH9MCjNEfV" role="2OqNvi">
                   <property role="32f$Ya" value="false" />
-                  <node concept="Xl_RD" id="46rVcNAEFYr" role="32eq0w">
-                    <property role="Xl_RC" value="testTransformAndMatch" />
-                  </node>
-                  <node concept="2OqwBi" id="5wiIlPAw2Au" role="32eq0x">
-                    <node concept="30H73N" id="5wiIlPAw2Av" role="2Oq$k0" />
-                    <node concept="1mfA1w" id="5wiIlPAw2Aw" role="2OqNvi" />
+                  <node concept="3zGtF$" id="6LH9MCjNEfW" role="32eq0w" />
+                  <node concept="2OqwBi" id="6LH9MCjNEfX" role="32eq0x">
+                    <node concept="30H73N" id="6LH9MCjNEfY" role="2Oq$k0" />
+                    <node concept="1mfA1w" id="6LH9MCjNEfZ" role="2OqNvi" />
                   </node>
                 </node>
               </node>
@@ -839,6 +1191,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6LH9MCjNAog" role="jymVt" />
     <node concept="3Tm1VV" id="uLQNrGWiTQ" role="1B3o_S" />
     <node concept="n94m4" id="uLQNrGWiTR" role="lGtFl">
       <ref role="n9lRv" to="lur:uLQNrGW9aY" resolve="GeneratorTest" />
diff --git a/plugins/mps-testing/languages/gentest/jetbrains.mps.lang.test.generator.mpl b/plugins/mps-testing/languages/gentest/jetbrains.mps.lang.test.generator.mpl
index 1f04ccbd1c59..e6e8f8e55fdb 100644
--- a/plugins/mps-testing/languages/gentest/jetbrains.mps.lang.test.generator.mpl
+++ b/plugins/mps-testing/languages/gentest/jetbrains.mps.lang.test.generator.mpl
@@ -28,6 +28,7 @@
         <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" />
+        <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
@@ -123,6 +124,8 @@
     <dependency reexport="false">c8cbf416-5e11-499c-816d-60b07b47b8c1(jetbrains.mps.lang.test.generator.rt)</dependency>
     <dependency reexport="false">49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)</dependency>
   </runtime>
-  <extendedLanguages />
+  <extendedLanguages>
+    <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
+  </extendedLanguages>
 </language>
 
diff --git a/plugins/mps-testing/languages/gentest/models/behavior.mps b/plugins/mps-testing/languages/gentest/models/behavior.mps
index afc96988969a..6bd86724cd52 100644
--- a/plugins/mps-testing/languages/gentest/models/behavior.mps
+++ b/plugins/mps-testing/languages/gentest/models/behavior.mps
@@ -5,7 +5,205 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="lur" ref="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
+        <reference id="1225194240799" name="concept" index="13h7C2" />
+        <child id="1225194240805" name="method" index="13h7CS" />
+        <child id="1225194240801" name="constructor" index="13h7CW" />
+      </concept>
+      <concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
+      <concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
+        <property id="5864038008284099149" name="isStatic" index="2Ki8OM" />
+        <property id="1225194472833" name="isPrivate" index="13i0is" />
+        <property id="1225194472832" name="isVirtual" index="13i0it" />
+        <property id="1225194472834" name="isAbstract" index="13i0iv" />
+        <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
+      </concept>
+      <concept id="1225194628440" name="jetbrains.mps.lang.behavior.structure.SuperNodeExpression" flags="nn" index="13iAh5">
+        <reference id="5299096511375896640" name="superConcept" index="3eA5LN" />
+      </concept>
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <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="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
+        <reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </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">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+    </language>
+  </registry>
+  <node concept="13h7C7" id="6LH9MCjORDI">
+    <property role="3GE5qa" value="custom" />
+    <ref role="13h7C2" to="lur:6LH9MCjORDm" resolve="CustomAssertionBlock" />
+    <node concept="13i0hz" id="2D1PBM_bzLa" role="13h7CS">
+      <property role="2Ki8OM" value="false" />
+      <property role="13i0is" value="false" />
+      <property role="TrG5h" value="getParameterConcepts" />
+      <property role="13i0it" value="false" />
+      <ref role="13i0hy" to="tpek:2xELmDxyi2v" resolve="getParameterConcepts" />
+      <node concept="3Tm1VV" id="2D1PBM_bzLb" role="1B3o_S" />
+      <node concept="3clFbS" id="2D1PBM_bzLc" role="3clF47">
+        <node concept="3cpWs8" id="2D1PBM_bzLd" role="3cqZAp">
+          <node concept="3cpWsn" id="2D1PBM_bzLe" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="_YKpA" id="2D1PBM_bzLi" role="1tU5fm">
+              <node concept="3bZ5Sz" id="2xELmDxRnD_" role="_ZDj9">
+                <ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2D1PBM_bzLq" role="33vP2m">
+              <node concept="13iAh5" id="2D1PBM_bzLm" role="2Oq$k0">
+                <ref role="3eA5LN" to="tpee:gyVMwX8" resolve="ConceptFunction" />
+              </node>
+              <node concept="2qgKlT" id="2D1PBM_bzLl" role="2OqNvi">
+                <ref role="37wK5l" to="tpek:2xELmDxyi2v" resolve="getParameterConcepts" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2D1PBM_bzLs" role="3cqZAp">
+          <node concept="2OqwBi" id="2D1PBM_bzLt" role="3clFbG">
+            <node concept="37vLTw" id="2D1PBM_bzLu" role="2Oq$k0">
+              <ref role="3cqZAo" node="2D1PBM_bzLe" resolve="result" />
+            </node>
+            <node concept="TSZUe" id="2D1PBM_bzLv" role="2OqNvi">
+              <node concept="35c_gC" id="2xELmDxRnD$" role="25WWJ7">
+                <ref role="35c_gD" to="lur:6LH9MCjOVeL" resolve="Model_ConceptFunctionParameter" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="2D1PBM_bzLw" role="3cqZAp">
+          <node concept="37vLTw" id="2D1PBM_bzLx" role="3cqZAk">
+            <ref role="3cqZAo" node="2D1PBM_bzLe" resolve="result" />
+          </node>
+        </node>
+      </node>
+      <node concept="_YKpA" id="2xELmDxRnDy" role="3clF45">
+        <node concept="3bZ5Sz" id="2xELmDxRnDz" role="_ZDj9">
+          <ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="$yZ68hB6Cw" role="13h7CS">
+      <property role="13i0is" value="false" />
+      <property role="TrG5h" value="getExpectedReturnType" />
+      <property role="13i0it" value="false" />
+      <property role="13i0iv" value="false" />
+      <ref role="13i0hy" to="tpek:hEwIGRD" resolve="getExpectedReturnType" />
+      <node concept="3Tm1VV" id="$yZ68hB6Cx" role="1B3o_S" />
+      <node concept="3clFbS" id="$yZ68hB6Cy" role="3clF47">
+        <node concept="3cpWs6" id="$yZ68hB6Cz" role="3cqZAp">
+          <node concept="2c44tf" id="6LH9MCjOVFx" role="3cqZAk">
+            <node concept="3cqZAl" id="6LH9MCjOVG5" role="2c44tc" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="$yZ68hB6C$" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="6LH9MCjORDJ" role="13h7CW">
+      <node concept="3clFbS" id="6LH9MCjORDK" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="6LH9MCjOVMn">
+    <property role="3GE5qa" value="custom" />
+    <ref role="13h7C2" to="lur:6LH9MCjOVeL" resolve="Model_ConceptFunctionParameter" />
+    <node concept="13hLZK" id="6LH9MCjOVMo" role="13h7CW">
+      <node concept="3clFbS" id="6LH9MCjOVMp" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="4IGpg_YjJlB" role="13h7CS">
+      <property role="TrG5h" value="getType" />
+      <property role="13i0it" value="false" />
+      <property role="13i0iv" value="false" />
+      <ref role="13i0hy" to="tpek:27DJnJtIQ9C" resolve="getType" />
+      <node concept="3Tm1VV" id="4IGpg_YjJlC" role="1B3o_S" />
+      <node concept="3clFbS" id="4IGpg_YjJlD" role="3clF47">
+        <node concept="3cpWs6" id="4IGpg_YjJlE" role="3cqZAp">
+          <node concept="2c44tf" id="4IGpg_YjJlA" role="3cqZAk">
+            <node concept="H_c77" id="6LH9MCjOW2y" role="2c44tc" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="4IGpg_YjJlF" role="3clF45">
+        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/mps-testing/languages/gentest/models/constraints.mps b/plugins/mps-testing/languages/gentest/models/constraints.mps
index 8b390ba96069..f7cf654f1b75 100644
--- a/plugins/mps-testing/languages/gentest/models/constraints.mps
+++ b/plugins/mps-testing/languages/gentest/models/constraints.mps
@@ -349,5 +349,114 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="6LH9MCjOOJv">
+    <ref role="1M2myG" to="lur:6LH9MCjOOqD" resolve="TransformationMatchCustomConditions" />
+    <node concept="9SLcT" id="6LH9MCjOOJU" role="9SGkU">
+      <node concept="3clFbS" id="6LH9MCjOOJV" role="2VODD2">
+        <node concept="3SKdUt" id="6LH9MCjOORd" role="3cqZAp">
+          <node concept="3SKdUq" id="6LH9MCjOORe" role="3SKWNk">
+            <property role="3SKdUp" value="this assertion is allowed to reference arguments that point to model only." />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="6LH9MCjOORf" role="3cqZAp">
+          <node concept="3clFbS" id="6LH9MCjOORg" role="3clFbx">
+            <node concept="3clFbJ" id="6LH9MCjOORh" role="3cqZAp">
+              <node concept="3clFbS" id="6LH9MCjOORi" role="3clFbx">
+                <node concept="3cpWs8" id="6LH9MCjOORj" role="3cqZAp">
+                  <node concept="3cpWsn" id="6LH9MCjOORk" role="3cpWs9">
+                    <property role="TrG5h" value="arg" />
+                    <node concept="3Tqbb2" id="6LH9MCjOORl" role="1tU5fm">
+                      <ref role="ehGHo" to="lur:uLQNrGW9LE" resolve="TestArgument" />
+                    </node>
+                    <node concept="2OqwBi" id="6LH9MCjOORm" role="33vP2m">
+                      <node concept="1PxgMI" id="6LH9MCjOORn" role="2Oq$k0">
+                        <property role="1BlNFB" value="true" />
+                        <node concept="chp4Y" id="6LH9MCjOORo" role="3oSUPX">
+                          <ref role="cht4Q" to="lur:uLQNrGWd1r" resolve="ArgumentReference" />
+                        </node>
+                        <node concept="2H4GUG" id="6LH9MCjOORp" role="1m5AlR" />
+                      </node>
+                      <node concept="3TrEf2" id="6LH9MCjOORq" role="2OqNvi">
+                        <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs6" id="6LH9MCjOORr" role="3cqZAp">
+                  <node concept="22lmx$" id="6LH9MCjOORs" role="3cqZAk">
+                    <node concept="2OqwBi" id="6LH9MCjOORt" role="3uHU7B">
+                      <node concept="37vLTw" id="6LH9MCjOORu" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6LH9MCjOORk" resolve="arg" />
+                      </node>
+                      <node concept="3w_OXm" id="6LH9MCjOORv" role="2OqNvi" />
+                    </node>
+                    <node concept="2OqwBi" id="6LH9MCjOORw" role="3uHU7w">
+                      <node concept="2OqwBi" id="6LH9MCjOORx" role="2Oq$k0">
+                        <node concept="37vLTw" id="6LH9MCjOORy" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6LH9MCjOORk" resolve="arg" />
+                        </node>
+                        <node concept="2yIwOk" id="6LH9MCjOORz" role="2OqNvi" />
+                      </node>
+                      <node concept="3O6GUB" id="6LH9MCjOOR$" role="2OqNvi">
+                        <node concept="chp4Y" id="6LH9MCjOOR_" role="3QVz_e">
+                          <ref role="cht4Q" to="lur:uLQNrGW9LI" resolve="ModelArgument" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="22lmx$" id="6LH9MCjOORA" role="3clFbw">
+                <node concept="2OqwBi" id="6LH9MCjOORB" role="3uHU7w">
+                  <node concept="2DA6wF" id="6LH9MCjOORC" role="2Oq$k0" />
+                  <node concept="liA8E" id="6LH9MCjOORD" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                    <node concept="359W_D" id="6LH9MCjOORE" role="37wK5m">
+                      <ref role="359W_E" to="lur:6LH9MCjOOqD" resolve="TransformationMatchCustomConditions" />
+                      <ref role="359W_F" to="lur:6LH9MCjOOqI" resolve="transformationPlan" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="6LH9MCjOORK" role="3uHU7B">
+                  <node concept="2DA6wF" id="6LH9MCjOORL" role="2Oq$k0" />
+                  <node concept="liA8E" id="6LH9MCjOORM" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                    <node concept="359W_D" id="6LH9MCjOORN" role="37wK5m">
+                      <ref role="359W_E" to="lur:6LH9MCjOOqD" resolve="TransformationMatchCustomConditions" />
+                      <ref role="359W_F" to="lur:6LH9MCjOOqG" resolve="inputModel" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="6LH9MCjOORO" role="3cqZAp">
+              <node concept="3SKdUq" id="6LH9MCjOORP" role="3SKWNk">
+                <property role="3SKdUp" value="fall through" />
+              </node>
+            </node>
+          </node>
+          <node concept="1Wc70l" id="6LH9MCjOORQ" role="3clFbw">
+            <node concept="3y3z36" id="6LH9MCjOORR" role="3uHU7B">
+              <node concept="10Nm6u" id="6LH9MCjOORS" role="3uHU7w" />
+              <node concept="2H4GUG" id="6LH9MCjOORT" role="3uHU7B" />
+            </node>
+            <node concept="2OqwBi" id="6LH9MCjOORU" role="3uHU7w">
+              <node concept="2DD5aU" id="6LH9MCjOORV" role="2Oq$k0" />
+              <node concept="3O6GUB" id="6LH9MCjOORW" role="2OqNvi">
+                <node concept="chp4Y" id="6LH9MCjOORX" role="3QVz_e">
+                  <ref role="cht4Q" to="lur:uLQNrGWd1r" resolve="ArgumentReference" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="6LH9MCjOORY" role="3cqZAp">
+          <node concept="3clFbT" id="6LH9MCjOORZ" role="3cqZAk">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/mps-testing/languages/gentest/models/editor.mps b/plugins/mps-testing/languages/gentest/models/editor.mps
index 325ae8a66130..ef733666b08d 100644
--- a/plugins/mps-testing/languages/gentest/models/editor.mps
+++ b/plugins/mps-testing/languages/gentest/models/editor.mps
@@ -257,5 +257,29 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="6LH9MCjOQVB">
+    <ref role="1XX52x" to="lur:6LH9MCjOOqD" resolve="TransformationMatchCustomConditions" />
+    <node concept="3EZMnI" id="6LH9MCjOQVD" role="2wV5jI">
+      <node concept="3F0ifn" id="6LH9MCjOQVE" role="3EZMnx">
+        <property role="3F0ifm" value="transform model " />
+      </node>
+      <node concept="3F1sOY" id="6LH9MCjOQVF" role="3EZMnx">
+        <ref role="1NtTu8" to="lur:6LH9MCjOOqG" resolve="inputModel" />
+      </node>
+      <node concept="2iRfu4" id="6LH9MCjOQVG" role="2iSdaV" />
+      <node concept="3F0ifn" id="6LH9MCjOQVH" role="3EZMnx">
+        <property role="3F0ifm" value=" with plan " />
+      </node>
+      <node concept="3F1sOY" id="6LH9MCjOQVI" role="3EZMnx">
+        <ref role="1NtTu8" to="lur:6LH9MCjOOqI" resolve="transformationPlan" />
+      </node>
+      <node concept="3F0ifn" id="6LH9MCjOQVJ" role="3EZMnx">
+        <property role="3F0ifm" value="and match " />
+      </node>
+      <node concept="3F1sOY" id="6LH9MCjORDA" role="3EZMnx">
+        <ref role="1NtTu8" to="lur:6LH9MCjOQVT" resolve="assertions" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/mps-testing/languages/gentest/models/structure.mps b/plugins/mps-testing/languages/gentest/models/structure.mps
index e7900b45fe8f..dbb10be44311 100644
--- a/plugins/mps-testing/languages/gentest/models/structure.mps
+++ b/plugins/mps-testing/languages/gentest/models/structure.mps
@@ -8,6 +8,7 @@
   <imports>
     <import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
@@ -42,6 +43,9 @@
       </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">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -173,5 +177,47 @@
       <ref role="20lvS9" node="uLQNrGWd1r" resolve="ArgumentReference" />
     </node>
   </node>
+  <node concept="1TIwiD" id="6LH9MCjOOqD">
+    <property role="EcuMT" value="7812943990232401577" />
+    <property role="TrG5h" value="TransformationMatchCustomConditions" />
+    <property role="R4oN_" value="transform and match custom conditions" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="6LH9MCjOOqG" role="1TKVEi">
+      <property role="IQ2ns" value="7812943990232401580" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="inputModel" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="uLQNrGWd1r" resolve="ArgumentReference" />
+    </node>
+    <node concept="1TJgyj" id="6LH9MCjOOqI" role="1TKVEi">
+      <property role="IQ2ns" value="7812943990232401582" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="transformationPlan" />
+      <ref role="20lvS9" node="uLQNrGWd1r" resolve="ArgumentReference" />
+    </node>
+    <node concept="1TJgyj" id="6LH9MCjOQVT" role="1TKVEi">
+      <property role="IQ2ns" value="7812943990232411897" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="assertions" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="6LH9MCjORDm" resolve="CustomAssertionBlock" />
+    </node>
+    <node concept="PrWs8" id="6LH9MCjOOqE" role="PzmwI">
+      <ref role="PrY4T" node="uLQNrGWd1o" resolve="TestAssertion" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="6LH9MCjORDm">
+    <property role="EcuMT" value="7812943990232414806" />
+    <property role="TrG5h" value="CustomAssertionBlock" />
+    <property role="3GE5qa" value="custom" />
+    <ref role="1TJDcQ" to="tpee:gyVMwX8" resolve="ConceptFunction" />
+  </node>
+  <node concept="1TIwiD" id="6LH9MCjOVeL">
+    <property role="EcuMT" value="7812943990232429489" />
+    <property role="TrG5h" value="Model_ConceptFunctionParameter" />
+    <property role="34LRSv" value="model" />
+    <property role="3GE5qa" value="custom" />
+    <ref role="1TJDcQ" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
+  </node>
 </model>
 
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/dependencies
index 779c762d5836..f81731014340 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/dependencies
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/dependencies
@@ -2,10 +2,66 @@
 <dependenciesRoot>
   <dependency className="jetbrains.mps.lang.test.generator.behavior.BehaviorAspectDescriptor" file="BehaviorAspectDescriptor.java">
     <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.api.BHDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.ConceptSwitchIndex" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.ConceptSwitchIndexBuilder" />
+    <classNode dependClassName="jetbrains.mps.lang.test.generator.behavior.CustomAssertionBlock__BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.test.generator.behavior.Model_ConceptFunctionParameter__BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.ids.MetaIdFactory" />
     <classNode dependClassName="org.jetbrains.annotations.NotNull" />
     <classNode dependClassName="org.jetbrains.annotations.Nullable" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
     <classNode extendsClassName="jetbrains.mps.core.aspects.behaviour.BaseBehaviorAspectDescriptor" />
   </dependency>
+  <dependency className="jetbrains.mps.lang.test.generator.behavior.CustomAssertionBlock__BehaviorDescriptor" file="CustomAssertionBlock__BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Class" />
+    <classNode dependClassName="java.lang.Object" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.util.Arrays" />
+    <classNode dependClassName="java.util.List" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.ConceptFunction__BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.AccessPrivileges" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.SJavaCompoundTypeImpl" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.SMethodBuilder" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.SModifiersImpl" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.api.SConstructor" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.api.SMethod" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.language.ConceptRegistry" />
+    <classNode dependClassName="org.jetbrains.annotations.NotNull" />
+    <classNode dependClassName="org.jetbrains.annotations.Nullable" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.test.generator.behavior.Model_ConceptFunctionParameter__BehaviorDescriptor" file="Model_ConceptFunctionParameter__BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Class" />
+    <classNode dependClassName="java.lang.Object" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.util.Arrays" />
+    <classNode dependClassName="java.util.List" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.AccessPrivileges" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.SJavaCompoundTypeImpl" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.SMethodBuilder" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.SModifiersImpl" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.api.SConstructor" />
+    <classNode dependClassName="jetbrains.mps.core.aspects.behaviour.api.SMethod" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.language.ConceptRegistry" />
+    <classNode dependClassName="org.jetbrains.annotations.NotNull" />
+    <classNode dependClassName="org.jetbrains.annotations.Nullable" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor" />
+  </dependency>
 </dependenciesRoot>
 
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/generated
index de5205a03ad1..397858169e0b 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/generated
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="cmls87gxefllhcbu3dojt3ybl6xpvug" />
+<dependencies version="2" modelHash="7nt0vtrb8ieh13ftnpn1a7358xaqkje" />
 
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/dependencies
index 2c26d624815f..e1d9f4ca7b5b 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/dependencies
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/dependencies
@@ -5,6 +5,7 @@
     <classNode dependClassName="jetbrains.mps.lang.smodel.ConceptSwitchIndex" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.ConceptSwitchIndexBuilder" />
     <classNode dependClassName="jetbrains.mps.lang.test.generator.constraints.TransformationMatchAssertion_Constraints" />
+    <classNode dependClassName="jetbrains.mps.lang.test.generator.constraints.TransformationMatchCustomConditions_Constraints" />
     <classNode dependClassName="jetbrains.mps.lang.test.generator.constraints.TransformationMatchManyAssertion_Constraints" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.ids.MetaIdFactory" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConstraintsDescriptor" />
@@ -30,6 +31,24 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor" />
   </dependency>
+  <dependency className="jetbrains.mps.lang.test.generator.constraints.TransformationMatchCustomConditions_Constraints" file="TransformationMatchCustomConditions_Constraints.java">
+    <classNode dependClassName="java.lang.Boolean" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.smodel.SNodePointer" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.runtime.CheckingNodeContext" />
+    <classNode dependClassName="jetbrains.mps.smodel.runtime.ConstraintContext_CanBeParent" />
+    <classNode dependClassName="jetbrains.mps.smodel.runtime.ConstraintFunction" />
+    <classNode dependClassName="org.jetbrains.annotations.NotNull" />
+    <classNode dependClassName="org.jetbrains.annotations.Nullable" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor" />
+  </dependency>
   <dependency className="jetbrains.mps.lang.test.generator.constraints.TransformationMatchManyAssertion_Constraints" file="TransformationMatchManyAssertion_Constraints.java">
     <classNode dependClassName="java.lang.Boolean" />
     <classNode dependClassName="java.lang.Override" />
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/generated
index 2df84d46075b..fb0f2beb282f 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/generated
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="6zrqe9zs0bb1nhk96fg79jb7lwk9r50" />
+<dependencies version="2" modelHash="-1fgku744v6rau4cdl3x829kegvnc62" />
 
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/dependencies
index 7369cb0354cc..979ad2a89e0c 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/dependencies
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/dependencies
@@ -14,6 +14,7 @@
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.ids.SLanguageId" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConceptPresentationAspect" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor" />
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/dependencies
index dd8ed603f865..bd0c8d8e592a 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/dependencies
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/dependencies
@@ -83,6 +83,7 @@
     <classNode dependClassName="jetbrains.mps.lang.test.generator.editor.GeneratorTest_Editor" />
     <classNode dependClassName="jetbrains.mps.lang.test.generator.editor.ModelArgument_Editor" />
     <classNode dependClassName="jetbrains.mps.lang.test.generator.editor.TransformationMatchAssertion_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.test.generator.editor.TransformationMatchCustomConditions_Editor" />
     <classNode dependClassName="jetbrains.mps.lang.test.generator.editor.TransformationMatchManyAssertion_Editor" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.descriptor.ConceptEditor" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.descriptor.SubstituteMenu" />
@@ -218,6 +219,34 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.editor.runtime.descriptor.AbstractEditorBuilder" />
   </dependency>
+  <dependency className="jetbrains.mps.lang.test.generator.editor.TransformationMatchCustomConditions_Editor" file="TransformationMatchCustomConditions_Editor.java">
+    <classNode dependClassName="jetbrains.mps.lang.test.generator.editor.TransformationMatchCustomConditions_EditorBuilder_a" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.test.generator.editor.TransformationMatchCustomConditions_EditorBuilder_a" file="TransformationMatchCustomConditions_EditorBuilder_a.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_DeleteSmart" />
+    <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellLayout.CellLayout_Horizontal" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.SChildSubstituteInfo" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.SEmptyContainmentSubstituteInfo" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Constant" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.DefaultSubstituteInfo" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.menus.transformation.SNodeLocation" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.annotations.NotNull" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.editor.runtime.descriptor.AbstractEditorBuilder" />
+  </dependency>
   <dependency className="jetbrains.mps.lang.test.generator.editor.TransformationMatchManyAssertion_Editor" file="TransformationMatchManyAssertion_Editor.java">
     <classNode dependClassName="jetbrains.mps.lang.test.generator.editor.TransformationMatchManyAssertion_EditorBuilder_a" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/generated
index 2af3ba2fea70..6c3467c6ec55 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/generated
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-4s5hd8l0hmq2ppytbkce3lgo8rgw8sg" />
+<dependencies version="2" modelHash="-xxsgoh2ppdd5ep3frc53oytdn2rb03" />
 
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/generated
index 3acad41b33df..4a01764eee57 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/generated
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-2sl97q7s998d3o9ek5b9050fjsf9ax4" />
+<dependencies version="2" modelHash="bgxpz9ihl9c5t6g0o7riad083ty162p" />
 
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/dependencies
index 31c417181193..9d52c41bf6a2 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/dependencies
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/dependencies
@@ -24,6 +24,8 @@
     <classNode dependClassName="jetbrains.mps.lang.test.generator.structure.LanguageConceptSwitch" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.ids.SConceptId" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConceptDescriptor" />
+    <classNode dependClassName="jetbrains.mps.smodel.runtime.ConceptKind" />
+    <classNode dependClassName="jetbrains.mps.smodel.runtime.StaticScope" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" />
     <classNode dependClassName="org.jetbrains.annotations.Nullable" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/generated
index 1993012bd01d..f2670e65256f 100644
--- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/generated
+++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-bl1caoaiuim5w5rt9hr513s62s8y3mj" />
+<dependencies version="2" modelHash="-7g4fldp03i94nlgkz9jozkik82lyjgf" />
 
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/Language.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/Language.java
index 51ac1a34c7d8..5a3ba44c9e2d 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/Language.java
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/Language.java
@@ -6,6 +6,7 @@
 import jetbrains.mps.smodel.adapter.ids.SLanguageId;
 import java.util.Collection;
 import org.jetbrains.mps.openapi.language.SLanguage;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
 import jetbrains.mps.smodel.runtime.ILanguageAspect;
 import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor;
 import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor;
@@ -40,6 +41,7 @@ public SLanguageId getId() {
 
   @Override
   protected void fillExtendedLanguages(Collection<SLanguage> extendedLanguages) {
+    extendedLanguages.add(MetaAdapterFactory.getLanguage(SLanguageId.deserialize("f3061a53-9226-4cc5-a443-f952ceaf5816"), "jetbrains.mps.baseLanguage"));
   }
 
   @Override
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/BehaviorAspectDescriptor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/BehaviorAspectDescriptor.java
index 688f0eb09fac..be29815b8958 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/BehaviorAspectDescriptor.java
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/BehaviorAspectDescriptor.java
@@ -3,12 +3,17 @@
 /*Generated by MPS */
 
 import jetbrains.mps.core.aspects.behaviour.BaseBehaviorAspectDescriptor;
-import org.jetbrains.annotations.Nullable;
 import jetbrains.mps.core.aspects.behaviour.api.BHDescriptor;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.lang.smodel.ConceptSwitchIndex;
+import jetbrains.mps.lang.smodel.ConceptSwitchIndexBuilder;
+import jetbrains.mps.smodel.adapter.ids.MetaIdFactory;
 
 public final class BehaviorAspectDescriptor extends BaseBehaviorAspectDescriptor {
+  private final BHDescriptor myCustomAssertionBlock__BehaviorDescriptor = new CustomAssertionBlock__BehaviorDescriptor();
+  private final BHDescriptor myModel_ConceptFunctionParameter__BehaviorDescriptor = new Model_ConceptFunctionParameter__BehaviorDescriptor();
 
   public BehaviorAspectDescriptor() {
   }
@@ -16,6 +21,14 @@ public BehaviorAspectDescriptor() {
   @Nullable
   public BHDescriptor getDescriptor(@NotNull SAbstractConcept concept) {
     SAbstractConcept cncpt = concept;
+    switch (conceptIndex.index(cncpt)) {
+      case 0:
+        return myCustomAssertionBlock__BehaviorDescriptor;
+      case 1:
+        return myModel_ConceptFunctionParameter__BehaviorDescriptor;
+      default:
+    }
     return null;
   }
+  private static final ConceptSwitchIndex conceptIndex = new ConceptSwitchIndexBuilder().put(MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d37a56L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d3b3b1L)).seal();
 }
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/CustomAssertionBlock__BehaviorDescriptor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/CustomAssertionBlock__BehaviorDescriptor.java
new file mode 100644
index 000000000000..8360c6cddacc
--- /dev/null
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/CustomAssertionBlock__BehaviorDescriptor.java
@@ -0,0 +1,103 @@
+package jetbrains.mps.lang.test.generator.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.List;
+import org.jetbrains.mps.openapi.language.SConcept;
+import jetbrains.mps.core.aspects.behaviour.SMethodBuilder;
+import jetbrains.mps.core.aspects.behaviour.SJavaCompoundTypeImpl;
+import jetbrains.mps.core.aspects.behaviour.SModifiersImpl;
+import jetbrains.mps.core.aspects.behaviour.AccessPrivileges;
+import org.jetbrains.mps.openapi.model.SNode;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import jetbrains.mps.baseLanguage.behavior.ConceptFunction__BehaviorDescriptor;
+import jetbrains.mps.internal.collections.runtime.ListSequence;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+import org.jetbrains.mps.openapi.persistence.PersistenceFacade;
+import jetbrains.mps.smodel.SModelUtil_new;
+
+public final class CustomAssertionBlock__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d37a56L, "jetbrains.mps.lang.test.generator.structure.CustomAssertionBlock");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+  public static final SMethod<List<SConcept>> getParameterConcepts_id2xELmDxyi2v = new SMethodBuilder<List<SConcept>>(new SJavaCompoundTypeImpl((Class<List<SConcept>>) ((Class) Object.class))).name("getParameterConcepts").modifiers(SModifiersImpl.create(8, AccessPrivileges.PUBLIC)).concept(CONCEPT).id("2xELmDxyi2v").registry(REGISTRY).build();
+  public static final SMethod<SNode> getExpectedReturnType_idhEwIGRD = new SMethodBuilder<SNode>(new SJavaCompoundTypeImpl((Class<SNode>) ((Class) Object.class))).name("getExpectedReturnType").modifiers(SModifiersImpl.create(8, AccessPrivileges.PUBLIC)).concept(CONCEPT).id("hEwIGRD").registry(REGISTRY).build();
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList(getParameterConcepts_id2xELmDxyi2v, getExpectedReturnType_idhEwIGRD);
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+  }
+
+  /*package*/ static List<SConcept> getParameterConcepts_id2xELmDxyi2v(@NotNull SNode __thisNode__) {
+    List<SConcept> result = ConceptFunction__BehaviorDescriptor.getParameterConcepts_id2xELmDxyi2v.invoke0(__thisNode__, MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x108bbca0f48L, "jetbrains.mps.baseLanguage.structure.ConceptFunction"));
+    ListSequence.fromList(result).addElement(MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d3b3b1L, "jetbrains.mps.lang.test.generator.structure.Model_ConceptFunctionParameter"));
+    return result;
+  }
+  /*package*/ static SNode getExpectedReturnType_idhEwIGRD(@NotNull SNode __thisNode__) {
+    return _quotation_createNode_sm6sey_a0a1();
+  }
+
+  /*package*/ CustomAssertionBlock__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      case 0:
+        return (T) ((List<SConcept>) getParameterConcepts_id2xELmDxyi2v(node));
+      case 1:
+        return (T) ((SNode) getExpectedReturnType_idhEwIGRD(node));
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+  private static SNode _quotation_createNode_sm6sey_a0a1() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(MetaAdapterFactory.getLanguage(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, "jetbrains.mps.baseLanguage"), 0xf8cc6bf96dL, "VoidType"), null, null, false);
+    return quotedNode_1;
+  }
+}
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/Model_ConceptFunctionParameter__BehaviorDescriptor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/Model_ConceptFunctionParameter__BehaviorDescriptor.java
new file mode 100644
index 000000000000..ab1c9dc26b87
--- /dev/null
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/Model_ConceptFunctionParameter__BehaviorDescriptor.java
@@ -0,0 +1,92 @@
+package jetbrains.mps.lang.test.generator.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.core.aspects.behaviour.SMethodBuilder;
+import jetbrains.mps.core.aspects.behaviour.SJavaCompoundTypeImpl;
+import jetbrains.mps.core.aspects.behaviour.SModifiersImpl;
+import jetbrains.mps.core.aspects.behaviour.AccessPrivileges;
+import java.util.List;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+import org.jetbrains.mps.openapi.persistence.PersistenceFacade;
+import jetbrains.mps.smodel.SModelUtil_new;
+
+public final class Model_ConceptFunctionParameter__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d3b3b1L, "jetbrains.mps.lang.test.generator.structure.Model_ConceptFunctionParameter");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+  public static final SMethod<SNode> getType_id27DJnJtIQ9C = new SMethodBuilder<SNode>(new SJavaCompoundTypeImpl((Class<SNode>) ((Class) Object.class))).name("getType").modifiers(SModifiersImpl.create(8, AccessPrivileges.PUBLIC)).concept(CONCEPT).id("27DJnJtIQ9C").registry(REGISTRY).build();
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList(getType_id27DJnJtIQ9C);
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+  }
+
+  /*package*/ static SNode getType_id27DJnJtIQ9C(@NotNull SNode __thisNode__) {
+    return _quotation_createNode_3zbibd_a0a0();
+  }
+
+  /*package*/ Model_ConceptFunctionParameter__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      case 0:
+        return (T) ((SNode) getType_id27DJnJtIQ9C(node));
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+  private static SNode _quotation_createNode_3zbibd_a0a0() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(MetaAdapterFactory.getLanguage(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, "jetbrains.mps.lang.smodel"), 0x10a2d94c0cdL, "SModelType"), null, null, false);
+    return quotedNode_1;
+  }
+}
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/trace.info b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/trace.info
index 1daaf0c28614..a8fe801046b4 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/trace.info
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/trace.info
@@ -1,8 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <debug-info version="2">
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123140:jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123155:jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123159:jetbrains.mps.baseLanguage.structure.IfStatement" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123165:jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068581242864:jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068581242878:jetbrains.mps.baseLanguage.structure.ReturnStatement" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1070462154015:jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1081236700938:jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1070475587102:jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1163670490218:jetbrains.mps.baseLanguage.structure.SwitchStatement" />
+  <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1164991038168:jetbrains.mps.baseLanguage.structure.ThrowStatement" />
   <root>
     <file name="BehaviorAspectDescriptor.java">
-      <unit at="11,0,22,0" name="jetbrains.mps.lang.test.generator.behavior.BehaviorAspectDescriptor" />
+      <unit at="14,0,35,0" name="jetbrains.mps.lang.test.generator.behavior.BehaviorAspectDescriptor" />
+    </file>
+  </root>
+  <root nodeRef="r:872e8efa-4b27-4db6-9b48-eef56c761198(jetbrains.mps.lang.test.generator.behavior)/7812943990232414830">
+    <file name="CustomAssertionBlock__BehaviorDescriptor.java">
+      <node id="7812943990232414830" at="29,0,30,0" concept="6" trace="CONCEPT" />
+      <node id="7812943990232414830" at="30,0,31,0" concept="6" trace="REGISTRY" />
+      <node id="7812943990232414830" at="32,0,33,0" concept="6" trace="getParameterConcepts_id2xELmDxyi2v" />
+      <node id="7812943990232414830" at="33,0,34,0" concept="6" trace="getExpectedReturnType_idhEwIGRD" />
+      <node id="7812943990232414830" at="35,0,36,0" concept="6" trace="BH_METHODS" />
+      <node id="3044950653914725453" at="40,101,41,266" concept="4" />
+      <node id="3044950653914725468" at="41,266,42,217" concept="1" />
+      <node id="3044950653914725472" at="42,217,43,18" concept="5" />
+      <node id="658365993681971747" at="45,89,46,47" concept="5" />
+      <node id="7812943990232414830" at="49,58,50,20" concept="8" />
+      <node id="7812943990232414830" at="54,114,55,21" concept="1" />
+      <node id="7812943990232414830" at="59,114,60,49" concept="4" />
+      <node id="7812943990232414830" at="61,26,62,56" concept="10" />
+      <node id="7812943990232414830" at="65,13,66,79" concept="5" />
+      <node id="7812943990232414830" at="67,13,68,67" concept="5" />
+      <node id="7812943990232414830" at="69,14,70,58" concept="10" />
+      <node id="7812943990232414830" at="75,128,76,49" concept="4" />
+      <node id="7812943990232414830" at="77,26,78,56" concept="10" />
+      <node id="7812943990232414830" at="81,14,82,58" concept="10" />
+      <node id="7812943990232414830" at="88,48,89,22" concept="5" />
+      <node id="7812943990232414830" at="94,40,95,19" concept="5" />
+      <node id="7812943990232431329" at="97,60,98,63" concept="4" />
+      <node id="7812943990232431329" at="98,63,99,30" concept="4" />
+      <node id="7812943990232431329" at="99,30,100,245" concept="1" />
+      <node id="7812943990232431329" at="100,245,101,24" concept="5" />
+      <node id="7812943990232414830" at="37,0,39,0" concept="7" trace="___init___#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7812943990232414830" at="45,0,48,0" concept="7" trace="getExpectedReturnType_idhEwIGRD#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7812943990232414830" at="49,0,52,0" concept="0" trace="CustomAssertionBlock__BehaviorDescriptor#()V" />
+      <node id="7812943990232414830" at="60,49,63,5" concept="2" />
+      <node id="7812943990232414830" at="76,49,79,5" concept="2" />
+      <node id="7812943990232414830" at="53,0,57,0" concept="3" trace="initNode#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/core/aspects/behaviour/api/SConstructor;[Ljava/lang/Object;)V" />
+      <node id="7812943990232414830" at="79,5,83,5" concept="9" />
+      <node id="7812943990232414830" at="40,0,45,0" concept="7" trace="getParameterConcepts_id2xELmDxyi2v#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/util/List;" />
+      <node id="7812943990232414830" at="86,0,91,0" concept="3" trace="getDeclaredMethods#()Ljava/util/List;" />
+      <node id="7812943990232414830" at="92,0,97,0" concept="3" trace="getConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="7812943990232431329" at="97,0,103,0" concept="7" trace="_quotation_createNode_sm6sey_a0a1#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7812943990232414830" at="63,5,71,5" concept="9" />
+      <node id="7812943990232414830" at="74,0,85,0" concept="3" trace="invokeSpecial0#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;Ljetbrains/mps/core/aspects/behaviour/api/SMethod;[Ljava/lang/Object;)null" />
+      <node id="7812943990232414830" at="58,0,73,0" concept="3" trace="invokeSpecial0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/core/aspects/behaviour/api/SMethod;[Ljava/lang/Object;)null" />
+      <scope id="7812943990232414830" at="37,63,37,63" />
+      <scope id="658365993681971746" at="45,89,46,47" />
+      <scope id="7812943990232414830" at="49,58,50,20" />
+      <scope id="7812943990232414830" at="54,114,55,21" />
+      <scope id="7812943990232414830" at="61,26,62,56" />
+      <scope id="7812943990232414830" at="65,13,66,79" />
+      <scope id="7812943990232414830" at="67,13,68,67" />
+      <scope id="7812943990232414830" at="69,14,70,58" />
+      <scope id="7812943990232414830" at="77,26,78,56" />
+      <scope id="7812943990232414830" at="81,14,82,58" />
+      <scope id="7812943990232414830" at="88,48,89,22" />
+      <scope id="7812943990232414830" at="94,40,95,19" />
+      <scope id="7812943990232414830" at="37,0,39,0">
+        <var name="__thisNode__" id="7812943990232414830" />
+      </scope>
+      <scope id="3044950653914725452" at="40,101,43,18">
+        <var name="result" id="3044950653914725454" />
+      </scope>
+      <scope id="7812943990232414830" at="45,0,48,0">
+        <var name="__thisNode__" id="7812943990232414830" />
+      </scope>
+      <scope id="7812943990232414830" at="49,0,52,0" />
+      <scope id="7812943990232414830" at="53,0,57,0">
+        <var name="constructor" id="7812943990232414830" />
+        <var name="node" id="7812943990232414830" />
+        <var name="parameters" id="7812943990232414830" />
+      </scope>
+      <scope id="7812943990232431329" at="97,60,101,24">
+        <var name="facade" id="7812943990232431329" />
+        <var name="quotedNode_1" id="7812943990232431329" />
+      </scope>
+      <scope id="7812943990232414830" at="40,0,45,0">
+        <var name="__thisNode__" id="7812943990232414830" />
+      </scope>
+      <scope id="7812943990232414830" at="86,0,91,0" />
+      <scope id="7812943990232414830" at="92,0,97,0" />
+      <scope id="7812943990232431329" at="97,0,103,0" />
+      <scope id="7812943990232414830" at="75,128,83,5">
+        <var name="methodIndex" id="7812943990232414830" />
+      </scope>
+      <scope id="7812943990232414830" at="74,0,85,0">
+        <var name="concept" id="7812943990232414830" />
+        <var name="method" id="7812943990232414830" />
+        <var name="parameters" id="7812943990232414830" />
+      </scope>
+      <scope id="7812943990232414830" at="59,114,71,5">
+        <var name="methodIndex" id="7812943990232414830" />
+      </scope>
+      <scope id="7812943990232414830" at="58,0,73,0">
+        <var name="method" id="7812943990232414830" />
+        <var name="node" id="7812943990232414830" />
+        <var name="parameters" id="7812943990232414830" />
+      </scope>
+      <unit id="7812943990232414830" at="28,0,104,0" name="jetbrains.mps.lang.test.generator.behavior.CustomAssertionBlock__BehaviorDescriptor" />
+    </file>
+  </root>
+  <root nodeRef="r:872e8efa-4b27-4db6-9b48-eef56c761198(jetbrains.mps.lang.test.generator.behavior)/7812943990232431767">
+    <file name="Model_ConceptFunctionParameter__BehaviorDescriptor.java">
+      <node id="7812943990232431767" at="26,0,27,0" concept="6" trace="CONCEPT" />
+      <node id="7812943990232431767" at="27,0,28,0" concept="6" trace="REGISTRY" />
+      <node id="7812943990232431767" at="29,0,30,0" concept="6" trace="getType_id27DJnJtIQ9C" />
+      <node id="7812943990232431767" at="31,0,32,0" concept="6" trace="BH_METHODS" />
+      <node id="5452844340287042922" at="36,79,37,47" concept="5" />
+      <node id="7812943990232431767" at="40,68,41,20" concept="8" />
+      <node id="7812943990232431767" at="45,114,46,21" concept="1" />
+      <node id="7812943990232431767" at="50,114,51,49" concept="4" />
+      <node id="7812943990232431767" at="52,26,53,56" concept="10" />
+      <node id="7812943990232431767" at="56,13,57,57" concept="5" />
+      <node id="7812943990232431767" at="58,14,59,58" concept="10" />
+      <node id="7812943990232431767" at="64,128,65,49" concept="4" />
+      <node id="7812943990232431767" at="66,26,67,56" concept="10" />
+      <node id="7812943990232431767" at="70,14,71,58" concept="10" />
+      <node id="7812943990232431767" at="77,48,78,22" concept="5" />
+      <node id="7812943990232431767" at="83,40,84,19" concept="5" />
+      <node id="5452844340287042918" at="86,60,87,63" concept="4" />
+      <node id="5452844340287042918" at="87,63,88,30" concept="4" />
+      <node id="5452844340287042918" at="88,30,89,247" concept="1" />
+      <node id="5452844340287042918" at="89,247,90,24" concept="5" />
+      <node id="7812943990232431767" at="33,0,35,0" concept="7" trace="___init___#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7812943990232431767" at="36,0,39,0" concept="7" trace="getType_id27DJnJtIQ9C#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7812943990232431767" at="40,0,43,0" concept="0" trace="Model_ConceptFunctionParameter__BehaviorDescriptor#()V" />
+      <node id="7812943990232431767" at="51,49,54,5" concept="2" />
+      <node id="7812943990232431767" at="65,49,68,5" concept="2" />
+      <node id="7812943990232431767" at="44,0,48,0" concept="3" trace="initNode#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/core/aspects/behaviour/api/SConstructor;[Ljava/lang/Object;)V" />
+      <node id="7812943990232431767" at="68,5,72,5" concept="9" />
+      <node id="7812943990232431767" at="75,0,80,0" concept="3" trace="getDeclaredMethods#()Ljava/util/List;" />
+      <node id="7812943990232431767" at="81,0,86,0" concept="3" trace="getConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="7812943990232431767" at="54,5,60,5" concept="9" />
+      <node id="5452844340287042918" at="86,0,92,0" concept="7" trace="_quotation_createNode_3zbibd_a0a0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7812943990232431767" at="63,0,74,0" concept="3" trace="invokeSpecial0#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;Ljetbrains/mps/core/aspects/behaviour/api/SMethod;[Ljava/lang/Object;)null" />
+      <node id="7812943990232431767" at="49,0,62,0" concept="3" trace="invokeSpecial0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/core/aspects/behaviour/api/SMethod;[Ljava/lang/Object;)null" />
+      <scope id="7812943990232431767" at="33,63,33,63" />
+      <scope id="5452844340287042921" at="36,79,37,47" />
+      <scope id="7812943990232431767" at="40,68,41,20" />
+      <scope id="7812943990232431767" at="45,114,46,21" />
+      <scope id="7812943990232431767" at="52,26,53,56" />
+      <scope id="7812943990232431767" at="56,13,57,57" />
+      <scope id="7812943990232431767" at="58,14,59,58" />
+      <scope id="7812943990232431767" at="66,26,67,56" />
+      <scope id="7812943990232431767" at="70,14,71,58" />
+      <scope id="7812943990232431767" at="77,48,78,22" />
+      <scope id="7812943990232431767" at="83,40,84,19" />
+      <scope id="7812943990232431767" at="33,0,35,0">
+        <var name="__thisNode__" id="7812943990232431767" />
+      </scope>
+      <scope id="7812943990232431767" at="36,0,39,0">
+        <var name="__thisNode__" id="7812943990232431767" />
+      </scope>
+      <scope id="7812943990232431767" at="40,0,43,0" />
+      <scope id="7812943990232431767" at="44,0,48,0">
+        <var name="constructor" id="7812943990232431767" />
+        <var name="node" id="7812943990232431767" />
+        <var name="parameters" id="7812943990232431767" />
+      </scope>
+      <scope id="5452844340287042918" at="86,60,90,24">
+        <var name="facade" id="5452844340287042918" />
+        <var name="quotedNode_1" id="5452844340287042918" />
+      </scope>
+      <scope id="7812943990232431767" at="75,0,80,0" />
+      <scope id="7812943990232431767" at="81,0,86,0" />
+      <scope id="5452844340287042918" at="86,0,92,0" />
+      <scope id="7812943990232431767" at="64,128,72,5">
+        <var name="methodIndex" id="7812943990232431767" />
+      </scope>
+      <scope id="7812943990232431767" at="50,114,60,5">
+        <var name="methodIndex" id="7812943990232431767" />
+      </scope>
+      <scope id="7812943990232431767" at="63,0,74,0">
+        <var name="concept" id="7812943990232431767" />
+        <var name="method" id="7812943990232431767" />
+        <var name="parameters" id="7812943990232431767" />
+      </scope>
+      <scope id="7812943990232431767" at="49,0,62,0">
+        <var name="method" id="7812943990232431767" />
+        <var name="node" id="7812943990232431767" />
+        <var name="parameters" id="7812943990232431767" />
+      </scope>
+      <unit id="7812943990232431767" at="25,0,93,0" name="jetbrains.mps.lang.test.generator.behavior.Model_ConceptFunctionParameter__BehaviorDescriptor" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/ConstraintsAspectDescriptor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/ConstraintsAspectDescriptor.java
index 04f7ba873614..7da5f82e71a2 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/ConstraintsAspectDescriptor.java
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/ConstraintsAspectDescriptor.java
@@ -21,10 +21,12 @@ public ConstraintsDescriptor getConstraints(SAbstractConcept concept) {
       case 0:
         return new TransformationMatchAssertion_Constraints();
       case 1:
+        return new TransformationMatchCustomConditions_Constraints();
+      case 2:
         return new TransformationMatchManyAssertion_Constraints();
       default:
     }
     return new BaseConstraintsDescriptor(concept);
   }
-  private static final ConceptSwitchIndex conceptIndex = new ConceptSwitchIndexBuilder().put(MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L)).seal();
+  private static final ConceptSwitchIndex conceptIndex = new ConceptSwitchIndexBuilder().put(MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L)).seal();
 }
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/TransformationMatchCustomConditions_Constraints.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/TransformationMatchCustomConditions_Constraints.java
new file mode 100644
index 000000000000..cdb8c199f9e1
--- /dev/null
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/TransformationMatchCustomConditions_Constraints.java
@@ -0,0 +1,52 @@
+package jetbrains.mps.lang.test.generator.constraints;
+
+/*Generated by MPS */
+
+import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.smodel.runtime.ConstraintFunction;
+import jetbrains.mps.smodel.runtime.ConstraintContext_CanBeParent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.smodel.runtime.CheckingNodeContext;
+import org.jetbrains.mps.openapi.model.SNode;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import org.jetbrains.mps.openapi.language.SContainmentLink;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
+import jetbrains.mps.smodel.SNodePointer;
+
+public class TransformationMatchCustomConditions_Constraints extends BaseConstraintsDescriptor {
+  public TransformationMatchCustomConditions_Constraints() {
+    super(MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, "jetbrains.mps.lang.test.generator.structure.TransformationMatchCustomConditions"));
+  }
+
+  @Override
+  protected ConstraintFunction<ConstraintContext_CanBeParent, Boolean> calculateCanBeParentConstraint() {
+    return new ConstraintFunction<ConstraintContext_CanBeParent, Boolean>() {
+      @NotNull
+      public Boolean invoke(@NotNull ConstraintContext_CanBeParent context, @Nullable CheckingNodeContext checkingNodeContext) {
+        boolean result = staticCanBeAParent(context.getNode(), context.getChildNode(), context.getChildConcept(), context.getLink());
+
+        if (!(result) && checkingNodeContext != null) {
+          checkingNodeContext.setBreakingNode(canBeParentBreakingPoint);
+        }
+
+        return result;
+      }
+    };
+  }
+  private static boolean staticCanBeAParent(SNode node, SNode childNode, SAbstractConcept childConcept, SContainmentLink link) {
+    // this assertion is allowed to reference arguments that point to model only. 
+    if (childNode != null && SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, "jetbrains.mps.lang.test.generator.structure.ArgumentReference"))) {
+      if (link.equals(MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346acL, "inputModel")) || link.equals(MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan"))) {
+        SNode arg = SLinkOperations.getTarget(SNodeOperations.as(childNode, MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, "jetbrains.mps.lang.test.generator.structure.ArgumentReference")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg"));
+        return (arg == null) || SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(arg)), MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf09c6eL, "jetbrains.mps.lang.test.generator.structure.ModelArgument"));
+      }
+      // fall through 
+    }
+    return true;
+  }
+  private static SNodePointer canBeParentBreakingPoint = new SNodePointer("r:d9fe9834-daa9-425b-9f8a-1debaf95f372(jetbrains.mps.lang.test.generator.constraints)", "7812943990232402938");
+}
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/aspectcps-descriptorclasses.mps b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/aspectcps-descriptorclasses.mps
index 9c16f69a8930..43bea5e70d54 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/aspectcps-descriptorclasses.mps
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/aspectcps-descriptorclasses.mps
@@ -243,42 +243,57 @@
             <ref role="3cqZAo" node="c" resolve="concept" />
           </node>
           <node concept="1pnPoh" id="i" role="1_3QMm">
-            <node concept="3clFbS" id="l" role="1pnPq1">
-              <node concept="3cpWs6" id="n" role="3cqZAp">
-                <node concept="1nCR9W" id="o" role="3cqZAk">
+            <node concept="3clFbS" id="m" role="1pnPq1">
+              <node concept="3cpWs6" id="o" role="3cqZAp">
+                <node concept="1nCR9W" id="p" role="3cqZAk">
                   <property role="1nD$Q0" value="jetbrains.mps.lang.test.generator.constraints.TransformationMatchAssertion_Constraints" />
-                  <node concept="3uibUv" id="p" role="2lIhxL">
+                  <node concept="3uibUv" id="q" role="2lIhxL">
                     <ref role="3uigEE" to="ze1i:~ConstraintsDescriptor" resolve="ConstraintsDescriptor" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3gn64h" id="m" role="1pnPq6">
+            <node concept="3gn64h" id="n" role="1pnPq6">
               <ref role="3gnhBz" to="lur:uLQNrGWd1n" resolve="TransformationMatchAssertion" />
             </node>
           </node>
           <node concept="1pnPoh" id="j" role="1_3QMm">
-            <node concept="3clFbS" id="q" role="1pnPq1">
-              <node concept="3cpWs6" id="s" role="3cqZAp">
-                <node concept="1nCR9W" id="t" role="3cqZAk">
+            <node concept="3clFbS" id="r" role="1pnPq1">
+              <node concept="3cpWs6" id="t" role="3cqZAp">
+                <node concept="1nCR9W" id="u" role="3cqZAk">
                   <property role="1nD$Q0" value="jetbrains.mps.lang.test.generator.constraints.TransformationMatchManyAssertion_Constraints" />
-                  <node concept="3uibUv" id="u" role="2lIhxL">
+                  <node concept="3uibUv" id="v" role="2lIhxL">
                     <ref role="3uigEE" to="ze1i:~ConstraintsDescriptor" resolve="ConstraintsDescriptor" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3gn64h" id="r" role="1pnPq6">
+            <node concept="3gn64h" id="s" role="1pnPq6">
               <ref role="3gnhBz" to="lur:5wiIlPAvMBp" resolve="TransformationMatchManyAssertion" />
             </node>
           </node>
-          <node concept="3clFbS" id="k" role="1prKM_" />
+          <node concept="1pnPoh" id="k" role="1_3QMm">
+            <node concept="3clFbS" id="w" role="1pnPq1">
+              <node concept="3cpWs6" id="y" role="3cqZAp">
+                <node concept="1nCR9W" id="z" role="3cqZAk">
+                  <property role="1nD$Q0" value="jetbrains.mps.lang.test.generator.constraints.TransformationMatchCustomConditions_Constraints" />
+                  <node concept="3uibUv" id="$" role="2lIhxL">
+                    <ref role="3uigEE" to="ze1i:~ConstraintsDescriptor" resolve="ConstraintsDescriptor" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3gn64h" id="x" role="1pnPq6">
+              <ref role="3gnhBz" to="lur:6LH9MCjOOqD" resolve="TransformationMatchCustomConditions" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="l" role="1prKM_" />
         </node>
         <node concept="3cpWs6" id="g" role="3cqZAp">
-          <node concept="2ShNRf" id="v" role="3cqZAk">
-            <node concept="1pGfFk" id="w" role="2ShVmc">
+          <node concept="2ShNRf" id="_" role="3cqZAk">
+            <node concept="1pGfFk" id="A" role="2ShVmc">
               <ref role="37wK5l" to="79pl:~BaseConstraintsDescriptor.&lt;init&gt;(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="BaseConstraintsDescriptor" />
-              <node concept="37vLTw" id="x" role="37wK5m">
+              <node concept="37vLTw" id="B" role="37wK5m">
                 <ref role="3cqZAo" node="c" resolve="concept" />
               </node>
             </node>
@@ -287,2127 +302,3150 @@
       </node>
     </node>
   </node>
-  <node concept="39dXUE" id="y" />
-  <node concept="312cEu" id="z">
+  <node concept="39dXUE" id="C" />
+  <node concept="312cEu" id="D">
     <property role="TrG5h" value="TransformationMatchAssertion_Constraints" />
-    <node concept="3Tm1VV" id="$" role="1B3o_S">
-      <node concept="cd27G" id="F" role="lGtFl">
-        <node concept="3u3nmq" id="G" role="cd27D">
+    <node concept="3Tm1VV" id="E" role="1B3o_S">
+      <node concept="cd27G" id="L" role="lGtFl">
+        <node concept="3u3nmq" id="M" role="cd27D">
           <property role="3u3nmv" value="7985317431306261563" />
         </node>
       </node>
     </node>
-    <node concept="3uibUv" id="_" role="1zkMxy">
+    <node concept="3uibUv" id="F" role="1zkMxy">
       <ref role="3uigEE" to="79pl:~BaseConstraintsDescriptor" resolve="BaseConstraintsDescriptor" />
-      <node concept="cd27G" id="H" role="lGtFl">
-        <node concept="3u3nmq" id="I" role="cd27D">
+      <node concept="cd27G" id="N" role="lGtFl">
+        <node concept="3u3nmq" id="O" role="cd27D">
           <property role="3u3nmv" value="7985317431306261563" />
         </node>
       </node>
     </node>
-    <node concept="3clFbW" id="A" role="jymVt">
-      <node concept="3cqZAl" id="J" role="3clF45">
-        <node concept="cd27G" id="N" role="lGtFl">
-          <node concept="3u3nmq" id="O" role="cd27D">
+    <node concept="3clFbW" id="G" role="jymVt">
+      <node concept="3cqZAl" id="P" role="3clF45">
+        <node concept="cd27G" id="T" role="lGtFl">
+          <node concept="3u3nmq" id="U" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="3clFbS" id="K" role="3clF47">
-        <node concept="XkiVB" id="P" role="3cqZAp">
+      <node concept="3clFbS" id="Q" role="3clF47">
+        <node concept="XkiVB" id="V" role="3cqZAp">
           <ref role="37wK5l" to="79pl:~BaseConstraintsDescriptor.&lt;init&gt;(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="BaseConstraintsDescriptor" />
-          <node concept="2YIFZM" id="R" role="37wK5m">
+          <node concept="2YIFZM" id="X" role="37wK5m">
             <ref role="1Pybhc" to="2k9e:~MetaAdapterFactory" resolve="MetaAdapterFactory" />
             <ref role="37wK5l" to="2k9e:~MetaAdapterFactory.getConcept(long,long,long,java.lang.String):org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
-            <node concept="1adDum" id="T" role="37wK5m">
+            <node concept="1adDum" id="Z" role="37wK5m">
               <property role="1adDun" value="0x68015e26cc4d49dbL" />
-              <node concept="cd27G" id="Y" role="lGtFl">
-                <node concept="3u3nmq" id="Z" role="cd27D">
+              <node concept="cd27G" id="14" role="lGtFl">
+                <node concept="3u3nmq" id="15" role="cd27D">
                   <property role="3u3nmv" value="7985317431306261563" />
                 </node>
               </node>
             </node>
-            <node concept="1adDum" id="U" role="37wK5m">
+            <node concept="1adDum" id="10" role="37wK5m">
               <property role="1adDun" value="0x8715b643faea1769L" />
-              <node concept="cd27G" id="10" role="lGtFl">
-                <node concept="3u3nmq" id="11" role="cd27D">
+              <node concept="cd27G" id="16" role="lGtFl">
+                <node concept="3u3nmq" id="17" role="cd27D">
                   <property role="3u3nmv" value="7985317431306261563" />
                 </node>
               </node>
             </node>
-            <node concept="1adDum" id="V" role="37wK5m">
+            <node concept="1adDum" id="11" role="37wK5m">
               <property role="1adDun" value="0x7b1db36ecf0d057L" />
-              <node concept="cd27G" id="12" role="lGtFl">
-                <node concept="3u3nmq" id="13" role="cd27D">
+              <node concept="cd27G" id="18" role="lGtFl">
+                <node concept="3u3nmq" id="19" role="cd27D">
                   <property role="3u3nmv" value="7985317431306261563" />
                 </node>
               </node>
             </node>
-            <node concept="Xl_RD" id="W" role="37wK5m">
+            <node concept="Xl_RD" id="12" role="37wK5m">
               <property role="Xl_RC" value="jetbrains.mps.lang.test.generator.structure.TransformationMatchAssertion" />
-              <node concept="cd27G" id="14" role="lGtFl">
-                <node concept="3u3nmq" id="15" role="cd27D">
+              <node concept="cd27G" id="1a" role="lGtFl">
+                <node concept="3u3nmq" id="1b" role="cd27D">
                   <property role="3u3nmv" value="7985317431306261563" />
                 </node>
               </node>
             </node>
-            <node concept="cd27G" id="X" role="lGtFl">
-              <node concept="3u3nmq" id="16" role="cd27D">
+            <node concept="cd27G" id="13" role="lGtFl">
+              <node concept="3u3nmq" id="1c" role="cd27D">
                 <property role="3u3nmv" value="7985317431306261563" />
               </node>
             </node>
           </node>
-          <node concept="cd27G" id="S" role="lGtFl">
-            <node concept="3u3nmq" id="17" role="cd27D">
+          <node concept="cd27G" id="Y" role="lGtFl">
+            <node concept="3u3nmq" id="1d" role="cd27D">
               <property role="3u3nmv" value="7985317431306261563" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="Q" role="lGtFl">
-          <node concept="3u3nmq" id="18" role="cd27D">
+        <node concept="cd27G" id="W" role="lGtFl">
+          <node concept="3u3nmq" id="1e" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="L" role="1B3o_S">
-        <node concept="cd27G" id="19" role="lGtFl">
-          <node concept="3u3nmq" id="1a" role="cd27D">
+      <node concept="3Tm1VV" id="R" role="1B3o_S">
+        <node concept="cd27G" id="1f" role="lGtFl">
+          <node concept="3u3nmq" id="1g" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="cd27G" id="M" role="lGtFl">
-        <node concept="3u3nmq" id="1b" role="cd27D">
+      <node concept="cd27G" id="S" role="lGtFl">
+        <node concept="3u3nmq" id="1h" role="cd27D">
           <property role="3u3nmv" value="7985317431306261563" />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="B" role="jymVt">
-      <node concept="cd27G" id="1c" role="lGtFl">
-        <node concept="3u3nmq" id="1d" role="cd27D">
+    <node concept="2tJIrI" id="H" role="jymVt">
+      <node concept="cd27G" id="1i" role="lGtFl">
+        <node concept="3u3nmq" id="1j" role="cd27D">
           <property role="3u3nmv" value="7985317431306261563" />
         </node>
       </node>
     </node>
-    <node concept="3clFb_" id="C" role="jymVt">
+    <node concept="3clFb_" id="I" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="calculateCanBeParentConstraint" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="3Tmbuc" id="1e" role="1B3o_S">
-        <node concept="cd27G" id="1j" role="lGtFl">
-          <node concept="3u3nmq" id="1k" role="cd27D">
+      <node concept="3Tmbuc" id="1k" role="1B3o_S">
+        <node concept="cd27G" id="1p" role="lGtFl">
+          <node concept="3u3nmq" id="1q" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="3uibUv" id="1f" role="3clF45">
+      <node concept="3uibUv" id="1l" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConstraintFunction" resolve="ConstraintFunction" />
-        <node concept="3uibUv" id="1l" role="11_B2D">
+        <node concept="3uibUv" id="1r" role="11_B2D">
           <ref role="3uigEE" to="ze1i:~ConstraintContext_CanBeParent" resolve="ConstraintContext_CanBeParent" />
-          <node concept="cd27G" id="1o" role="lGtFl">
-            <node concept="3u3nmq" id="1p" role="cd27D">
+          <node concept="cd27G" id="1u" role="lGtFl">
+            <node concept="3u3nmq" id="1v" role="cd27D">
               <property role="3u3nmv" value="7985317431306261563" />
             </node>
           </node>
         </node>
-        <node concept="3uibUv" id="1m" role="11_B2D">
+        <node concept="3uibUv" id="1s" role="11_B2D">
           <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-          <node concept="cd27G" id="1q" role="lGtFl">
-            <node concept="3u3nmq" id="1r" role="cd27D">
+          <node concept="cd27G" id="1w" role="lGtFl">
+            <node concept="3u3nmq" id="1x" role="cd27D">
               <property role="3u3nmv" value="7985317431306261563" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="1n" role="lGtFl">
-          <node concept="3u3nmq" id="1s" role="cd27D">
+        <node concept="cd27G" id="1t" role="lGtFl">
+          <node concept="3u3nmq" id="1y" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="3clFbS" id="1g" role="3clF47">
-        <node concept="3clFbF" id="1t" role="3cqZAp">
-          <node concept="2ShNRf" id="1v" role="3clFbG">
-            <node concept="YeOm9" id="1x" role="2ShVmc">
-              <node concept="1Y3b0j" id="1z" role="YeSDq">
+      <node concept="3clFbS" id="1m" role="3clF47">
+        <node concept="3clFbF" id="1z" role="3cqZAp">
+          <node concept="2ShNRf" id="1_" role="3clFbG">
+            <node concept="YeOm9" id="1B" role="2ShVmc">
+              <node concept="1Y3b0j" id="1D" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <ref role="1Y3XeK" to="ze1i:~ConstraintFunction" resolve="ConstraintFunction" />
                 <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                <node concept="3Tm1VV" id="1_" role="1B3o_S">
-                  <node concept="cd27G" id="1E" role="lGtFl">
-                    <node concept="3u3nmq" id="1F" role="cd27D">
+                <node concept="3Tm1VV" id="1F" role="1B3o_S">
+                  <node concept="cd27G" id="1K" role="lGtFl">
+                    <node concept="3u3nmq" id="1L" role="cd27D">
                       <property role="3u3nmv" value="7985317431306261563" />
                     </node>
                   </node>
                 </node>
-                <node concept="3clFb_" id="1A" role="jymVt">
+                <node concept="3clFb_" id="1G" role="jymVt">
                   <property role="1EzhhJ" value="false" />
                   <property role="TrG5h" value="invoke" />
                   <property role="DiZV1" value="false" />
                   <property role="od$2w" value="false" />
-                  <node concept="3Tm1VV" id="1G" role="1B3o_S">
-                    <node concept="cd27G" id="1N" role="lGtFl">
-                      <node concept="3u3nmq" id="1O" role="cd27D">
+                  <node concept="3Tm1VV" id="1M" role="1B3o_S">
+                    <node concept="cd27G" id="1T" role="lGtFl">
+                      <node concept="3u3nmq" id="1U" role="cd27D">
                         <property role="3u3nmv" value="7985317431306261563" />
                       </node>
                     </node>
                   </node>
-                  <node concept="2AHcQZ" id="1H" role="2AJF6D">
+                  <node concept="2AHcQZ" id="1N" role="2AJF6D">
                     <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-                    <node concept="cd27G" id="1P" role="lGtFl">
-                      <node concept="3u3nmq" id="1Q" role="cd27D">
+                    <node concept="cd27G" id="1V" role="lGtFl">
+                      <node concept="3u3nmq" id="1W" role="cd27D">
                         <property role="3u3nmv" value="7985317431306261563" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3uibUv" id="1I" role="3clF45">
+                  <node concept="3uibUv" id="1O" role="3clF45">
                     <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                    <node concept="cd27G" id="1R" role="lGtFl">
-                      <node concept="3u3nmq" id="1S" role="cd27D">
+                    <node concept="cd27G" id="1X" role="lGtFl">
+                      <node concept="3u3nmq" id="1Y" role="cd27D">
                         <property role="3u3nmv" value="7985317431306261563" />
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTG" id="1J" role="3clF46">
+                  <node concept="37vLTG" id="1P" role="3clF46">
                     <property role="TrG5h" value="context" />
-                    <node concept="3uibUv" id="1T" role="1tU5fm">
+                    <node concept="3uibUv" id="1Z" role="1tU5fm">
                       <ref role="3uigEE" to="ze1i:~ConstraintContext_CanBeParent" resolve="ConstraintContext_CanBeParent" />
-                      <node concept="cd27G" id="1W" role="lGtFl">
-                        <node concept="3u3nmq" id="1X" role="cd27D">
+                      <node concept="cd27G" id="22" role="lGtFl">
+                        <node concept="3u3nmq" id="23" role="cd27D">
                           <property role="3u3nmv" value="7985317431306261563" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2AHcQZ" id="1U" role="2AJF6D">
+                    <node concept="2AHcQZ" id="20" role="2AJF6D">
                       <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-                      <node concept="cd27G" id="1Y" role="lGtFl">
-                        <node concept="3u3nmq" id="1Z" role="cd27D">
+                      <node concept="cd27G" id="24" role="lGtFl">
+                        <node concept="3u3nmq" id="25" role="cd27D">
                           <property role="3u3nmv" value="7985317431306261563" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="1V" role="lGtFl">
-                      <node concept="3u3nmq" id="20" role="cd27D">
+                    <node concept="cd27G" id="21" role="lGtFl">
+                      <node concept="3u3nmq" id="26" role="cd27D">
                         <property role="3u3nmv" value="7985317431306261563" />
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTG" id="1K" role="3clF46">
+                  <node concept="37vLTG" id="1Q" role="3clF46">
                     <property role="TrG5h" value="checkingNodeContext" />
-                    <node concept="3uibUv" id="21" role="1tU5fm">
+                    <node concept="3uibUv" id="27" role="1tU5fm">
                       <ref role="3uigEE" to="ze1i:~CheckingNodeContext" resolve="CheckingNodeContext" />
-                      <node concept="cd27G" id="24" role="lGtFl">
-                        <node concept="3u3nmq" id="25" role="cd27D">
+                      <node concept="cd27G" id="2a" role="lGtFl">
+                        <node concept="3u3nmq" id="2b" role="cd27D">
                           <property role="3u3nmv" value="7985317431306261563" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2AHcQZ" id="22" role="2AJF6D">
+                    <node concept="2AHcQZ" id="28" role="2AJF6D">
                       <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
-                      <node concept="cd27G" id="26" role="lGtFl">
-                        <node concept="3u3nmq" id="27" role="cd27D">
+                      <node concept="cd27G" id="2c" role="lGtFl">
+                        <node concept="3u3nmq" id="2d" role="cd27D">
                           <property role="3u3nmv" value="7985317431306261563" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="23" role="lGtFl">
-                      <node concept="3u3nmq" id="28" role="cd27D">
+                    <node concept="cd27G" id="29" role="lGtFl">
+                      <node concept="3u3nmq" id="2e" role="cd27D">
                         <property role="3u3nmv" value="7985317431306261563" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbS" id="1L" role="3clF47">
-                    <node concept="3cpWs8" id="29" role="3cqZAp">
-                      <node concept="3cpWsn" id="2f" role="3cpWs9">
+                  <node concept="3clFbS" id="1R" role="3clF47">
+                    <node concept="3cpWs8" id="2f" role="3cqZAp">
+                      <node concept="3cpWsn" id="2l" role="3cpWs9">
                         <property role="TrG5h" value="result" />
-                        <node concept="10P_77" id="2h" role="1tU5fm">
-                          <node concept="cd27G" id="2k" role="lGtFl">
-                            <node concept="3u3nmq" id="2l" role="cd27D">
+                        <node concept="10P_77" id="2n" role="1tU5fm">
+                          <node concept="cd27G" id="2q" role="lGtFl">
+                            <node concept="3u3nmq" id="2r" role="cd27D">
                               <property role="3u3nmv" value="7985317431306261563" />
                             </node>
                           </node>
                         </node>
-                        <node concept="1rXfSq" id="2i" role="33vP2m">
-                          <ref role="37wK5l" node="D" resolve="staticCanBeAParent" />
-                          <node concept="2OqwBi" id="2m" role="37wK5m">
-                            <node concept="37vLTw" id="2r" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1J" resolve="context" />
-                              <node concept="cd27G" id="2u" role="lGtFl">
-                                <node concept="3u3nmq" id="2v" role="cd27D">
+                        <node concept="1rXfSq" id="2o" role="33vP2m">
+                          <ref role="37wK5l" node="J" resolve="staticCanBeAParent" />
+                          <node concept="2OqwBi" id="2s" role="37wK5m">
+                            <node concept="37vLTw" id="2x" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1P" resolve="context" />
+                              <node concept="cd27G" id="2$" role="lGtFl">
+                                <node concept="3u3nmq" id="2_" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="2s" role="2OqNvi">
+                            <node concept="liA8E" id="2y" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getNode():org.jetbrains.mps.openapi.model.SNode" resolve="getNode" />
-                              <node concept="cd27G" id="2w" role="lGtFl">
-                                <node concept="3u3nmq" id="2x" role="cd27D">
+                              <node concept="cd27G" id="2A" role="lGtFl">
+                                <node concept="3u3nmq" id="2B" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="2t" role="lGtFl">
-                              <node concept="3u3nmq" id="2y" role="cd27D">
+                            <node concept="cd27G" id="2z" role="lGtFl">
+                              <node concept="3u3nmq" id="2C" role="cd27D">
                                 <property role="3u3nmv" value="7985317431306261563" />
                               </node>
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="2n" role="37wK5m">
-                            <node concept="37vLTw" id="2z" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1J" resolve="context" />
-                              <node concept="cd27G" id="2A" role="lGtFl">
-                                <node concept="3u3nmq" id="2B" role="cd27D">
+                          <node concept="2OqwBi" id="2t" role="37wK5m">
+                            <node concept="37vLTw" id="2D" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1P" resolve="context" />
+                              <node concept="cd27G" id="2G" role="lGtFl">
+                                <node concept="3u3nmq" id="2H" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="2$" role="2OqNvi">
+                            <node concept="liA8E" id="2E" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getChildNode():org.jetbrains.mps.openapi.model.SNode" resolve="getChildNode" />
-                              <node concept="cd27G" id="2C" role="lGtFl">
-                                <node concept="3u3nmq" id="2D" role="cd27D">
+                              <node concept="cd27G" id="2I" role="lGtFl">
+                                <node concept="3u3nmq" id="2J" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="2_" role="lGtFl">
-                              <node concept="3u3nmq" id="2E" role="cd27D">
+                            <node concept="cd27G" id="2F" role="lGtFl">
+                              <node concept="3u3nmq" id="2K" role="cd27D">
                                 <property role="3u3nmv" value="7985317431306261563" />
                               </node>
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="2o" role="37wK5m">
-                            <node concept="37vLTw" id="2F" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1J" resolve="context" />
-                              <node concept="cd27G" id="2I" role="lGtFl">
-                                <node concept="3u3nmq" id="2J" role="cd27D">
+                          <node concept="2OqwBi" id="2u" role="37wK5m">
+                            <node concept="37vLTw" id="2L" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1P" resolve="context" />
+                              <node concept="cd27G" id="2O" role="lGtFl">
+                                <node concept="3u3nmq" id="2P" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="2G" role="2OqNvi">
+                            <node concept="liA8E" id="2M" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getChildConcept():org.jetbrains.mps.openapi.language.SAbstractConcept" resolve="getChildConcept" />
-                              <node concept="cd27G" id="2K" role="lGtFl">
-                                <node concept="3u3nmq" id="2L" role="cd27D">
+                              <node concept="cd27G" id="2Q" role="lGtFl">
+                                <node concept="3u3nmq" id="2R" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="2H" role="lGtFl">
-                              <node concept="3u3nmq" id="2M" role="cd27D">
+                            <node concept="cd27G" id="2N" role="lGtFl">
+                              <node concept="3u3nmq" id="2S" role="cd27D">
                                 <property role="3u3nmv" value="7985317431306261563" />
                               </node>
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="2p" role="37wK5m">
-                            <node concept="37vLTw" id="2N" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1J" resolve="context" />
-                              <node concept="cd27G" id="2Q" role="lGtFl">
-                                <node concept="3u3nmq" id="2R" role="cd27D">
+                          <node concept="2OqwBi" id="2v" role="37wK5m">
+                            <node concept="37vLTw" id="2T" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1P" resolve="context" />
+                              <node concept="cd27G" id="2W" role="lGtFl">
+                                <node concept="3u3nmq" id="2X" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="2O" role="2OqNvi">
+                            <node concept="liA8E" id="2U" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getLink():org.jetbrains.mps.openapi.language.SContainmentLink" resolve="getLink" />
-                              <node concept="cd27G" id="2S" role="lGtFl">
-                                <node concept="3u3nmq" id="2T" role="cd27D">
+                              <node concept="cd27G" id="2Y" role="lGtFl">
+                                <node concept="3u3nmq" id="2Z" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="2P" role="lGtFl">
-                              <node concept="3u3nmq" id="2U" role="cd27D">
+                            <node concept="cd27G" id="2V" role="lGtFl">
+                              <node concept="3u3nmq" id="30" role="cd27D">
                                 <property role="3u3nmv" value="7985317431306261563" />
                               </node>
                             </node>
                           </node>
-                          <node concept="cd27G" id="2q" role="lGtFl">
-                            <node concept="3u3nmq" id="2V" role="cd27D">
+                          <node concept="cd27G" id="2w" role="lGtFl">
+                            <node concept="3u3nmq" id="31" role="cd27D">
                               <property role="3u3nmv" value="7985317431306261563" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="2j" role="lGtFl">
-                          <node concept="3u3nmq" id="2W" role="cd27D">
+                        <node concept="cd27G" id="2p" role="lGtFl">
+                          <node concept="3u3nmq" id="32" role="cd27D">
                             <property role="3u3nmv" value="7985317431306261563" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="2g" role="lGtFl">
-                        <node concept="3u3nmq" id="2X" role="cd27D">
+                      <node concept="cd27G" id="2m" role="lGtFl">
+                        <node concept="3u3nmq" id="33" role="cd27D">
                           <property role="3u3nmv" value="7985317431306261563" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="2a" role="3cqZAp">
-                      <node concept="cd27G" id="2Y" role="lGtFl">
-                        <node concept="3u3nmq" id="2Z" role="cd27D">
+                    <node concept="3clFbH" id="2g" role="3cqZAp">
+                      <node concept="cd27G" id="34" role="lGtFl">
+                        <node concept="3u3nmq" id="35" role="cd27D">
                           <property role="3u3nmv" value="7985317431306261563" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbJ" id="2b" role="3cqZAp">
-                      <node concept="3clFbS" id="30" role="3clFbx">
-                        <node concept="3clFbF" id="33" role="3cqZAp">
-                          <node concept="2OqwBi" id="35" role="3clFbG">
-                            <node concept="37vLTw" id="37" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1K" resolve="checkingNodeContext" />
-                              <node concept="cd27G" id="3a" role="lGtFl">
-                                <node concept="3u3nmq" id="3b" role="cd27D">
+                    <node concept="3clFbJ" id="2h" role="3cqZAp">
+                      <node concept="3clFbS" id="36" role="3clFbx">
+                        <node concept="3clFbF" id="39" role="3cqZAp">
+                          <node concept="2OqwBi" id="3b" role="3clFbG">
+                            <node concept="37vLTw" id="3d" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1Q" resolve="checkingNodeContext" />
+                              <node concept="cd27G" id="3g" role="lGtFl">
+                                <node concept="3u3nmq" id="3h" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="38" role="2OqNvi">
+                            <node concept="liA8E" id="3e" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~CheckingNodeContext.setBreakingNode(org.jetbrains.mps.openapi.model.SNodeReference):void" resolve="setBreakingNode" />
-                              <node concept="1dyn4i" id="3c" role="37wK5m">
+                              <node concept="1dyn4i" id="3i" role="37wK5m">
                                 <property role="1dyqJU" value="canBeParentBreakingPoint" />
-                                <node concept="2ShNRf" id="3e" role="1dyrYi">
-                                  <node concept="1pGfFk" id="3g" role="2ShVmc">
+                                <node concept="2ShNRf" id="3k" role="1dyrYi">
+                                  <node concept="1pGfFk" id="3m" role="2ShVmc">
                                     <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(java.lang.String,java.lang.String)" resolve="SNodePointer" />
-                                    <node concept="Xl_RD" id="3i" role="37wK5m">
+                                    <node concept="Xl_RD" id="3o" role="37wK5m">
                                       <property role="Xl_RC" value="r:d9fe9834-daa9-425b-9f8a-1debaf95f372(jetbrains.mps.lang.test.generator.constraints)" />
-                                      <node concept="cd27G" id="3l" role="lGtFl">
-                                        <node concept="3u3nmq" id="3m" role="cd27D">
+                                      <node concept="cd27G" id="3r" role="lGtFl">
+                                        <node concept="3u3nmq" id="3s" role="cd27D">
                                           <property role="3u3nmv" value="7985317431306261563" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Xl_RD" id="3j" role="37wK5m">
+                                    <node concept="Xl_RD" id="3p" role="37wK5m">
                                       <property role="Xl_RC" value="7985317431306261564" />
-                                      <node concept="cd27G" id="3n" role="lGtFl">
-                                        <node concept="3u3nmq" id="3o" role="cd27D">
+                                      <node concept="cd27G" id="3t" role="lGtFl">
+                                        <node concept="3u3nmq" id="3u" role="cd27D">
                                           <property role="3u3nmv" value="7985317431306261563" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="cd27G" id="3k" role="lGtFl">
-                                      <node concept="3u3nmq" id="3p" role="cd27D">
+                                    <node concept="cd27G" id="3q" role="lGtFl">
+                                      <node concept="3u3nmq" id="3v" role="cd27D">
                                         <property role="3u3nmv" value="7985317431306261563" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="cd27G" id="3h" role="lGtFl">
-                                    <node concept="3u3nmq" id="3q" role="cd27D">
+                                  <node concept="cd27G" id="3n" role="lGtFl">
+                                    <node concept="3u3nmq" id="3w" role="cd27D">
                                       <property role="3u3nmv" value="7985317431306261563" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="cd27G" id="3f" role="lGtFl">
-                                  <node concept="3u3nmq" id="3r" role="cd27D">
+                                <node concept="cd27G" id="3l" role="lGtFl">
+                                  <node concept="3u3nmq" id="3x" role="cd27D">
                                     <property role="3u3nmv" value="7985317431306261563" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="cd27G" id="3d" role="lGtFl">
-                                <node concept="3u3nmq" id="3s" role="cd27D">
+                              <node concept="cd27G" id="3j" role="lGtFl">
+                                <node concept="3u3nmq" id="3y" role="cd27D">
                                   <property role="3u3nmv" value="7985317431306261563" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="39" role="lGtFl">
-                              <node concept="3u3nmq" id="3t" role="cd27D">
+                            <node concept="cd27G" id="3f" role="lGtFl">
+                              <node concept="3u3nmq" id="3z" role="cd27D">
                                 <property role="3u3nmv" value="7985317431306261563" />
                               </node>
                             </node>
                           </node>
-                          <node concept="cd27G" id="36" role="lGtFl">
-                            <node concept="3u3nmq" id="3u" role="cd27D">
+                          <node concept="cd27G" id="3c" role="lGtFl">
+                            <node concept="3u3nmq" id="3$" role="cd27D">
                               <property role="3u3nmv" value="7985317431306261563" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="34" role="lGtFl">
-                          <node concept="3u3nmq" id="3v" role="cd27D">
+                        <node concept="cd27G" id="3a" role="lGtFl">
+                          <node concept="3u3nmq" id="3_" role="cd27D">
                             <property role="3u3nmv" value="7985317431306261563" />
                           </node>
                         </node>
                       </node>
-                      <node concept="1Wc70l" id="31" role="3clFbw">
-                        <node concept="3y3z36" id="3w" role="3uHU7w">
-                          <node concept="10Nm6u" id="3z" role="3uHU7w">
-                            <node concept="cd27G" id="3A" role="lGtFl">
-                              <node concept="3u3nmq" id="3B" role="cd27D">
+                      <node concept="1Wc70l" id="37" role="3clFbw">
+                        <node concept="3y3z36" id="3A" role="3uHU7w">
+                          <node concept="10Nm6u" id="3D" role="3uHU7w">
+                            <node concept="cd27G" id="3G" role="lGtFl">
+                              <node concept="3u3nmq" id="3H" role="cd27D">
                                 <property role="3u3nmv" value="7985317431306261563" />
                               </node>
                             </node>
                           </node>
-                          <node concept="37vLTw" id="3$" role="3uHU7B">
-                            <ref role="3cqZAo" node="1K" resolve="checkingNodeContext" />
-                            <node concept="cd27G" id="3C" role="lGtFl">
-                              <node concept="3u3nmq" id="3D" role="cd27D">
+                          <node concept="37vLTw" id="3E" role="3uHU7B">
+                            <ref role="3cqZAo" node="1Q" resolve="checkingNodeContext" />
+                            <node concept="cd27G" id="3I" role="lGtFl">
+                              <node concept="3u3nmq" id="3J" role="cd27D">
                                 <property role="3u3nmv" value="7985317431306261563" />
                               </node>
                             </node>
                           </node>
-                          <node concept="cd27G" id="3_" role="lGtFl">
-                            <node concept="3u3nmq" id="3E" role="cd27D">
+                          <node concept="cd27G" id="3F" role="lGtFl">
+                            <node concept="3u3nmq" id="3K" role="cd27D">
                               <property role="3u3nmv" value="7985317431306261563" />
                             </node>
                           </node>
                         </node>
-                        <node concept="3fqX7Q" id="3x" role="3uHU7B">
-                          <node concept="37vLTw" id="3F" role="3fr31v">
-                            <ref role="3cqZAo" node="2f" resolve="result" />
-                            <node concept="cd27G" id="3H" role="lGtFl">
-                              <node concept="3u3nmq" id="3I" role="cd27D">
+                        <node concept="3fqX7Q" id="3B" role="3uHU7B">
+                          <node concept="37vLTw" id="3L" role="3fr31v">
+                            <ref role="3cqZAo" node="2l" resolve="result" />
+                            <node concept="cd27G" id="3N" role="lGtFl">
+                              <node concept="3u3nmq" id="3O" role="cd27D">
                                 <property role="3u3nmv" value="7985317431306261563" />
                               </node>
                             </node>
                           </node>
-                          <node concept="cd27G" id="3G" role="lGtFl">
-                            <node concept="3u3nmq" id="3J" role="cd27D">
+                          <node concept="cd27G" id="3M" role="lGtFl">
+                            <node concept="3u3nmq" id="3P" role="cd27D">
                               <property role="3u3nmv" value="7985317431306261563" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="3y" role="lGtFl">
-                          <node concept="3u3nmq" id="3K" role="cd27D">
+                        <node concept="cd27G" id="3C" role="lGtFl">
+                          <node concept="3u3nmq" id="3Q" role="cd27D">
                             <property role="3u3nmv" value="7985317431306261563" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="32" role="lGtFl">
-                        <node concept="3u3nmq" id="3L" role="cd27D">
+                      <node concept="cd27G" id="38" role="lGtFl">
+                        <node concept="3u3nmq" id="3R" role="cd27D">
                           <property role="3u3nmv" value="7985317431306261563" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="2c" role="3cqZAp">
-                      <node concept="cd27G" id="3M" role="lGtFl">
-                        <node concept="3u3nmq" id="3N" role="cd27D">
+                    <node concept="3clFbH" id="2i" role="3cqZAp">
+                      <node concept="cd27G" id="3S" role="lGtFl">
+                        <node concept="3u3nmq" id="3T" role="cd27D">
                           <property role="3u3nmv" value="7985317431306261563" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbF" id="2d" role="3cqZAp">
-                      <node concept="37vLTw" id="3O" role="3clFbG">
-                        <ref role="3cqZAo" node="2f" resolve="result" />
-                        <node concept="cd27G" id="3Q" role="lGtFl">
-                          <node concept="3u3nmq" id="3R" role="cd27D">
+                    <node concept="3clFbF" id="2j" role="3cqZAp">
+                      <node concept="37vLTw" id="3U" role="3clFbG">
+                        <ref role="3cqZAo" node="2l" resolve="result" />
+                        <node concept="cd27G" id="3W" role="lGtFl">
+                          <node concept="3u3nmq" id="3X" role="cd27D">
                             <property role="3u3nmv" value="7985317431306261563" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="3P" role="lGtFl">
-                        <node concept="3u3nmq" id="3S" role="cd27D">
+                      <node concept="cd27G" id="3V" role="lGtFl">
+                        <node concept="3u3nmq" id="3Y" role="cd27D">
                           <property role="3u3nmv" value="7985317431306261563" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="2e" role="lGtFl">
-                      <node concept="3u3nmq" id="3T" role="cd27D">
+                    <node concept="cd27G" id="2k" role="lGtFl">
+                      <node concept="3u3nmq" id="3Z" role="cd27D">
                         <property role="3u3nmv" value="7985317431306261563" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="1M" role="lGtFl">
-                    <node concept="3u3nmq" id="3U" role="cd27D">
+                  <node concept="cd27G" id="1S" role="lGtFl">
+                    <node concept="3u3nmq" id="40" role="cd27D">
                       <property role="3u3nmv" value="7985317431306261563" />
                     </node>
                   </node>
                 </node>
-                <node concept="3uibUv" id="1B" role="2Ghqu4">
+                <node concept="3uibUv" id="1H" role="2Ghqu4">
                   <ref role="3uigEE" to="ze1i:~ConstraintContext_CanBeParent" resolve="ConstraintContext_CanBeParent" />
-                  <node concept="cd27G" id="3V" role="lGtFl">
-                    <node concept="3u3nmq" id="3W" role="cd27D">
+                  <node concept="cd27G" id="41" role="lGtFl">
+                    <node concept="3u3nmq" id="42" role="cd27D">
                       <property role="3u3nmv" value="7985317431306261563" />
                     </node>
                   </node>
                 </node>
-                <node concept="3uibUv" id="1C" role="2Ghqu4">
+                <node concept="3uibUv" id="1I" role="2Ghqu4">
                   <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                  <node concept="cd27G" id="3X" role="lGtFl">
-                    <node concept="3u3nmq" id="3Y" role="cd27D">
+                  <node concept="cd27G" id="43" role="lGtFl">
+                    <node concept="3u3nmq" id="44" role="cd27D">
                       <property role="3u3nmv" value="7985317431306261563" />
                     </node>
                   </node>
                 </node>
-                <node concept="cd27G" id="1D" role="lGtFl">
-                  <node concept="3u3nmq" id="3Z" role="cd27D">
+                <node concept="cd27G" id="1J" role="lGtFl">
+                  <node concept="3u3nmq" id="45" role="cd27D">
                     <property role="3u3nmv" value="7985317431306261563" />
                   </node>
                 </node>
               </node>
-              <node concept="cd27G" id="1$" role="lGtFl">
-                <node concept="3u3nmq" id="40" role="cd27D">
+              <node concept="cd27G" id="1E" role="lGtFl">
+                <node concept="3u3nmq" id="46" role="cd27D">
                   <property role="3u3nmv" value="7985317431306261563" />
                 </node>
               </node>
             </node>
-            <node concept="cd27G" id="1y" role="lGtFl">
-              <node concept="3u3nmq" id="41" role="cd27D">
+            <node concept="cd27G" id="1C" role="lGtFl">
+              <node concept="3u3nmq" id="47" role="cd27D">
                 <property role="3u3nmv" value="7985317431306261563" />
               </node>
             </node>
           </node>
-          <node concept="cd27G" id="1w" role="lGtFl">
-            <node concept="3u3nmq" id="42" role="cd27D">
+          <node concept="cd27G" id="1A" role="lGtFl">
+            <node concept="3u3nmq" id="48" role="cd27D">
               <property role="3u3nmv" value="7985317431306261563" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="1u" role="lGtFl">
-          <node concept="3u3nmq" id="43" role="cd27D">
+        <node concept="cd27G" id="1$" role="lGtFl">
+          <node concept="3u3nmq" id="49" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="1h" role="2AJF6D">
+      <node concept="2AHcQZ" id="1n" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        <node concept="cd27G" id="44" role="lGtFl">
-          <node concept="3u3nmq" id="45" role="cd27D">
+        <node concept="cd27G" id="4a" role="lGtFl">
+          <node concept="3u3nmq" id="4b" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="cd27G" id="1i" role="lGtFl">
-        <node concept="3u3nmq" id="46" role="cd27D">
+      <node concept="cd27G" id="1o" role="lGtFl">
+        <node concept="3u3nmq" id="4c" role="cd27D">
           <property role="3u3nmv" value="7985317431306261563" />
         </node>
       </node>
     </node>
-    <node concept="2YIFZL" id="D" role="jymVt">
+    <node concept="2YIFZL" id="J" role="jymVt">
       <property role="TrG5h" value="staticCanBeAParent" />
-      <node concept="10P_77" id="47" role="3clF45">
-        <node concept="cd27G" id="4f" role="lGtFl">
-          <node concept="3u3nmq" id="4g" role="cd27D">
+      <node concept="10P_77" id="4d" role="3clF45">
+        <node concept="cd27G" id="4l" role="lGtFl">
+          <node concept="3u3nmq" id="4m" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="48" role="1B3o_S">
-        <node concept="cd27G" id="4h" role="lGtFl">
-          <node concept="3u3nmq" id="4i" role="cd27D">
+      <node concept="3Tm6S6" id="4e" role="1B3o_S">
+        <node concept="cd27G" id="4n" role="lGtFl">
+          <node concept="3u3nmq" id="4o" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="3clFbS" id="49" role="3clF47">
-        <node concept="3SKdUt" id="4j" role="3cqZAp">
-          <node concept="3SKdUq" id="4n" role="3SKWNk">
+      <node concept="3clFbS" id="4f" role="3clF47">
+        <node concept="3SKdUt" id="4p" role="3cqZAp">
+          <node concept="3SKdUq" id="4t" role="3SKWNk">
             <property role="3SKdUp" value="this assertion is allowed to reference arguments that point to model only." />
-            <node concept="cd27G" id="4p" role="lGtFl">
-              <node concept="3u3nmq" id="4q" role="cd27D">
+            <node concept="cd27G" id="4v" role="lGtFl">
+              <node concept="3u3nmq" id="4w" role="cd27D">
                 <property role="3u3nmv" value="7985317431306318367" />
               </node>
             </node>
           </node>
-          <node concept="cd27G" id="4o" role="lGtFl">
-            <node concept="3u3nmq" id="4r" role="cd27D">
+          <node concept="cd27G" id="4u" role="lGtFl">
+            <node concept="3u3nmq" id="4x" role="cd27D">
               <property role="3u3nmv" value="7985317431306318365" />
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="4k" role="3cqZAp">
-          <node concept="3clFbS" id="4s" role="3clFbx">
-            <node concept="3clFbJ" id="4v" role="3cqZAp">
-              <node concept="3clFbS" id="4y" role="3clFbx">
-                <node concept="3cpWs8" id="4_" role="3cqZAp">
-                  <node concept="3cpWsn" id="4C" role="3cpWs9">
+        <node concept="3clFbJ" id="4q" role="3cqZAp">
+          <node concept="3clFbS" id="4y" role="3clFbx">
+            <node concept="3clFbJ" id="4_" role="3cqZAp">
+              <node concept="3clFbS" id="4C" role="3clFbx">
+                <node concept="3cpWs8" id="4F" role="3cqZAp">
+                  <node concept="3cpWsn" id="4I" role="3cpWs9">
                     <property role="TrG5h" value="arg" />
-                    <node concept="3Tqbb2" id="4E" role="1tU5fm">
+                    <node concept="3Tqbb2" id="4K" role="1tU5fm">
                       <ref role="ehGHo" to="lur:uLQNrGW9LE" resolve="TestArgument" />
-                      <node concept="cd27G" id="4H" role="lGtFl">
-                        <node concept="3u3nmq" id="4I" role="cd27D">
+                      <node concept="cd27G" id="4N" role="lGtFl">
+                        <node concept="3u3nmq" id="4O" role="cd27D">
                           <property role="3u3nmv" value="2681075272524284108" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="4F" role="33vP2m">
-                      <node concept="1PxgMI" id="4J" role="2Oq$k0">
+                    <node concept="2OqwBi" id="4L" role="33vP2m">
+                      <node concept="1PxgMI" id="4P" role="2Oq$k0">
                         <property role="1BlNFB" value="true" />
-                        <node concept="chp4Y" id="4M" role="3oSUPX">
+                        <node concept="chp4Y" id="4S" role="3oSUPX">
                           <ref role="cht4Q" to="lur:uLQNrGWd1r" resolve="ArgumentReference" />
-                          <node concept="cd27G" id="4P" role="lGtFl">
-                            <node concept="3u3nmq" id="4Q" role="cd27D">
+                          <node concept="cd27G" id="4V" role="lGtFl">
+                            <node concept="3u3nmq" id="4W" role="cd27D">
                               <property role="3u3nmv" value="2681075272524284117" />
                             </node>
                           </node>
                         </node>
-                        <node concept="37vLTw" id="4N" role="1m5AlR">
-                          <ref role="3cqZAo" node="4b" resolve="childNode" />
-                          <node concept="cd27G" id="4R" role="lGtFl">
-                            <node concept="3u3nmq" id="4S" role="cd27D">
+                        <node concept="37vLTw" id="4T" role="1m5AlR">
+                          <ref role="3cqZAo" node="4h" resolve="childNode" />
+                          <node concept="cd27G" id="4X" role="lGtFl">
+                            <node concept="3u3nmq" id="4Y" role="cd27D">
                               <property role="3u3nmv" value="2681075272524284118" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="4O" role="lGtFl">
-                          <node concept="3u3nmq" id="4T" role="cd27D">
+                        <node concept="cd27G" id="4U" role="lGtFl">
+                          <node concept="3u3nmq" id="4Z" role="cd27D">
                             <property role="3u3nmv" value="2681075272524284116" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3TrEf2" id="4K" role="2OqNvi">
+                      <node concept="3TrEf2" id="4Q" role="2OqNvi">
                         <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
-                        <node concept="cd27G" id="4U" role="lGtFl">
-                          <node concept="3u3nmq" id="4V" role="cd27D">
+                        <node concept="cd27G" id="50" role="lGtFl">
+                          <node concept="3u3nmq" id="51" role="cd27D">
                             <property role="3u3nmv" value="2681075272524284119" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="4L" role="lGtFl">
-                        <node concept="3u3nmq" id="4W" role="cd27D">
+                      <node concept="cd27G" id="4R" role="lGtFl">
+                        <node concept="3u3nmq" id="52" role="cd27D">
                           <property role="3u3nmv" value="2681075272524284115" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="4G" role="lGtFl">
-                      <node concept="3u3nmq" id="4X" role="cd27D">
+                    <node concept="cd27G" id="4M" role="lGtFl">
+                      <node concept="3u3nmq" id="53" role="cd27D">
                         <property role="3u3nmv" value="2681075272524284114" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="4D" role="lGtFl">
-                    <node concept="3u3nmq" id="4Y" role="cd27D">
+                  <node concept="cd27G" id="4J" role="lGtFl">
+                    <node concept="3u3nmq" id="54" role="cd27D">
                       <property role="3u3nmv" value="2681075272524284113" />
                     </node>
                   </node>
                 </node>
-                <node concept="3cpWs6" id="4A" role="3cqZAp">
-                  <node concept="22lmx$" id="4Z" role="3cqZAk">
-                    <node concept="2OqwBi" id="51" role="3uHU7B">
-                      <node concept="37vLTw" id="54" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4C" resolve="arg" />
-                        <node concept="cd27G" id="57" role="lGtFl">
-                          <node concept="3u3nmq" id="58" role="cd27D">
+                <node concept="3cpWs6" id="4G" role="3cqZAp">
+                  <node concept="22lmx$" id="55" role="3cqZAk">
+                    <node concept="2OqwBi" id="57" role="3uHU7B">
+                      <node concept="37vLTw" id="5a" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4I" resolve="arg" />
+                        <node concept="cd27G" id="5d" role="lGtFl">
+                          <node concept="3u3nmq" id="5e" role="cd27D">
                             <property role="3u3nmv" value="2681075272524286381" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3w_OXm" id="55" role="2OqNvi">
-                        <node concept="cd27G" id="59" role="lGtFl">
-                          <node concept="3u3nmq" id="5a" role="cd27D">
+                      <node concept="3w_OXm" id="5b" role="2OqNvi">
+                        <node concept="cd27G" id="5f" role="lGtFl">
+                          <node concept="3u3nmq" id="5g" role="cd27D">
                             <property role="3u3nmv" value="2681075272524289638" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="56" role="lGtFl">
-                        <node concept="3u3nmq" id="5b" role="cd27D">
+                      <node concept="cd27G" id="5c" role="lGtFl">
+                        <node concept="3u3nmq" id="5h" role="cd27D">
                           <property role="3u3nmv" value="2681075272524287835" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="52" role="3uHU7w">
-                      <node concept="2OqwBi" id="5c" role="2Oq$k0">
-                        <node concept="37vLTw" id="5f" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4C" resolve="arg" />
-                          <node concept="cd27G" id="5i" role="lGtFl">
-                            <node concept="3u3nmq" id="5j" role="cd27D">
+                    <node concept="2OqwBi" id="58" role="3uHU7w">
+                      <node concept="2OqwBi" id="5i" role="2Oq$k0">
+                        <node concept="37vLTw" id="5l" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4I" resolve="arg" />
+                          <node concept="cd27G" id="5o" role="lGtFl">
+                            <node concept="3u3nmq" id="5p" role="cd27D">
                               <property role="3u3nmv" value="2681075272524284120" />
                             </node>
                           </node>
                         </node>
-                        <node concept="2yIwOk" id="5g" role="2OqNvi">
-                          <node concept="cd27G" id="5k" role="lGtFl">
-                            <node concept="3u3nmq" id="5l" role="cd27D">
+                        <node concept="2yIwOk" id="5m" role="2OqNvi">
+                          <node concept="cd27G" id="5q" role="lGtFl">
+                            <node concept="3u3nmq" id="5r" role="cd27D">
                               <property role="3u3nmv" value="2681075272524272700" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="5h" role="lGtFl">
-                          <node concept="3u3nmq" id="5m" role="cd27D">
+                        <node concept="cd27G" id="5n" role="lGtFl">
+                          <node concept="3u3nmq" id="5s" role="cd27D">
                             <property role="3u3nmv" value="2681075272524270923" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3O6GUB" id="5d" role="2OqNvi">
-                        <node concept="chp4Y" id="5n" role="3QVz_e">
+                      <node concept="3O6GUB" id="5j" role="2OqNvi">
+                        <node concept="chp4Y" id="5t" role="3QVz_e">
                           <ref role="cht4Q" to="lur:uLQNrGW9LI" resolve="ModelArgument" />
-                          <node concept="cd27G" id="5p" role="lGtFl">
-                            <node concept="3u3nmq" id="5q" role="cd27D">
+                          <node concept="cd27G" id="5v" role="lGtFl">
+                            <node concept="3u3nmq" id="5w" role="cd27D">
                               <property role="3u3nmv" value="2681075272524278003" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="5o" role="lGtFl">
-                          <node concept="3u3nmq" id="5r" role="cd27D">
+                        <node concept="cd27G" id="5u" role="lGtFl">
+                          <node concept="3u3nmq" id="5x" role="cd27D">
                             <property role="3u3nmv" value="2681075272524276677" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="5e" role="lGtFl">
-                        <node concept="3u3nmq" id="5s" role="cd27D">
+                      <node concept="cd27G" id="5k" role="lGtFl">
+                        <node concept="3u3nmq" id="5y" role="cd27D">
                           <property role="3u3nmv" value="2681075272524274825" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="53" role="lGtFl">
-                      <node concept="3u3nmq" id="5t" role="cd27D">
+                    <node concept="cd27G" id="59" role="lGtFl">
+                      <node concept="3u3nmq" id="5z" role="cd27D">
                         <property role="3u3nmv" value="2681075272524285464" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="50" role="lGtFl">
-                    <node concept="3u3nmq" id="5u" role="cd27D">
+                  <node concept="cd27G" id="56" role="lGtFl">
+                    <node concept="3u3nmq" id="5$" role="cd27D">
                       <property role="3u3nmv" value="2681075272524279859" />
                     </node>
                   </node>
                 </node>
-                <node concept="cd27G" id="4B" role="lGtFl">
-                  <node concept="3u3nmq" id="5v" role="cd27D">
+                <node concept="cd27G" id="4H" role="lGtFl">
+                  <node concept="3u3nmq" id="5_" role="cd27D">
                     <property role="3u3nmv" value="6346338635721168383" />
                   </node>
                 </node>
               </node>
-              <node concept="22lmx$" id="4z" role="3clFbw">
-                <node concept="2OqwBi" id="5w" role="3uHU7w">
-                  <node concept="37vLTw" id="5z" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4d" resolve="link" />
-                    <node concept="cd27G" id="5A" role="lGtFl">
-                      <node concept="3u3nmq" id="5B" role="cd27D">
+              <node concept="22lmx$" id="4D" role="3clFbw">
+                <node concept="2OqwBi" id="5A" role="3uHU7w">
+                  <node concept="37vLTw" id="5D" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4j" resolve="link" />
+                    <node concept="cd27G" id="5G" role="lGtFl">
+                      <node concept="3u3nmq" id="5H" role="cd27D">
                         <property role="3u3nmv" value="7985317431306280015" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="5$" role="2OqNvi">
+                  <node concept="liA8E" id="5E" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                    <node concept="359W_D" id="5C" role="37wK5m">
+                    <node concept="359W_D" id="5I" role="37wK5m">
                       <ref role="359W_E" to="lur:uLQNrGWd1n" resolve="TransformationMatchAssertion" />
                       <ref role="359W_F" to="lur:uLQNrGWd1z" resolve="transformationPlan" />
-                      <node concept="cd27G" id="5E" role="lGtFl">
-                        <node concept="3u3nmq" id="5F" role="cd27D">
+                      <node concept="cd27G" id="5K" role="lGtFl">
+                        <node concept="3u3nmq" id="5L" role="cd27D">
                           <property role="3u3nmv" value="7985317431306300461" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="5D" role="lGtFl">
-                      <node concept="3u3nmq" id="5G" role="cd27D">
+                    <node concept="cd27G" id="5J" role="lGtFl">
+                      <node concept="3u3nmq" id="5M" role="cd27D">
                         <property role="3u3nmv" value="7985317431306299911" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="5_" role="lGtFl">
-                    <node concept="3u3nmq" id="5H" role="cd27D">
+                  <node concept="cd27G" id="5F" role="lGtFl">
+                    <node concept="3u3nmq" id="5N" role="cd27D">
                       <property role="3u3nmv" value="7985317431306297819" />
                     </node>
                   </node>
                 </node>
-                <node concept="22lmx$" id="5x" role="3uHU7B">
-                  <node concept="2OqwBi" id="5I" role="3uHU7w">
-                    <node concept="37vLTw" id="5L" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4d" resolve="link" />
-                      <node concept="cd27G" id="5O" role="lGtFl">
-                        <node concept="3u3nmq" id="5P" role="cd27D">
+                <node concept="22lmx$" id="5B" role="3uHU7B">
+                  <node concept="2OqwBi" id="5O" role="3uHU7w">
+                    <node concept="37vLTw" id="5R" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4j" resolve="link" />
+                      <node concept="cd27G" id="5U" role="lGtFl">
+                        <node concept="3u3nmq" id="5V" role="cd27D">
                           <property role="3u3nmv" value="7985317431306291007" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="5M" role="2OqNvi">
+                    <node concept="liA8E" id="5S" role="2OqNvi">
                       <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                      <node concept="359W_D" id="5Q" role="37wK5m">
+                      <node concept="359W_D" id="5W" role="37wK5m">
                         <ref role="359W_E" to="lur:uLQNrGWd1n" resolve="TransformationMatchAssertion" />
                         <ref role="359W_F" to="lur:uLQNrGWd1w" resolve="referenceModel" />
-                        <node concept="cd27G" id="5S" role="lGtFl">
-                          <node concept="3u3nmq" id="5T" role="cd27D">
+                        <node concept="cd27G" id="5Y" role="lGtFl">
+                          <node concept="3u3nmq" id="5Z" role="cd27D">
                             <property role="3u3nmv" value="7985317431306295452" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="5R" role="lGtFl">
-                        <node concept="3u3nmq" id="5U" role="cd27D">
+                      <node concept="cd27G" id="5X" role="lGtFl">
+                        <node concept="3u3nmq" id="60" role="cd27D">
                           <property role="3u3nmv" value="7985317431306294670" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="5N" role="lGtFl">
-                      <node concept="3u3nmq" id="5V" role="cd27D">
+                    <node concept="cd27G" id="5T" role="lGtFl">
+                      <node concept="3u3nmq" id="61" role="cd27D">
                         <property role="3u3nmv" value="7985317431306292346" />
                       </node>
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="5J" role="3uHU7B">
-                    <node concept="37vLTw" id="5W" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4d" resolve="link" />
-                      <node concept="cd27G" id="5Z" role="lGtFl">
-                        <node concept="3u3nmq" id="60" role="cd27D">
+                  <node concept="2OqwBi" id="5P" role="3uHU7B">
+                    <node concept="37vLTw" id="62" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4j" resolve="link" />
+                      <node concept="cd27G" id="65" role="lGtFl">
+                        <node concept="3u3nmq" id="66" role="cd27D">
                           <property role="3u3nmv" value="7985317431306272478" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="5X" role="2OqNvi">
+                    <node concept="liA8E" id="63" role="2OqNvi">
                       <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                      <node concept="359W_D" id="61" role="37wK5m">
+                      <node concept="359W_D" id="67" role="37wK5m">
                         <ref role="359W_E" to="lur:uLQNrGWd1n" resolve="TransformationMatchAssertion" />
                         <ref role="359W_F" to="lur:uLQNrGWd1u" resolve="inputModel" />
-                        <node concept="cd27G" id="63" role="lGtFl">
-                          <node concept="3u3nmq" id="64" role="cd27D">
+                        <node concept="cd27G" id="69" role="lGtFl">
+                          <node concept="3u3nmq" id="6a" role="cd27D">
                             <property role="3u3nmv" value="7985317431306274481" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="62" role="lGtFl">
-                        <node concept="3u3nmq" id="65" role="cd27D">
+                      <node concept="cd27G" id="68" role="lGtFl">
+                        <node concept="3u3nmq" id="6b" role="cd27D">
                           <property role="3u3nmv" value="7985317431306285454" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="5Y" role="lGtFl">
-                      <node concept="3u3nmq" id="66" role="cd27D">
+                    <node concept="cd27G" id="64" role="lGtFl">
+                      <node concept="3u3nmq" id="6c" role="cd27D">
                         <property role="3u3nmv" value="7985317431306283639" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="5K" role="lGtFl">
-                    <node concept="3u3nmq" id="67" role="cd27D">
+                  <node concept="cd27G" id="5Q" role="lGtFl">
+                    <node concept="3u3nmq" id="6d" role="cd27D">
                       <property role="3u3nmv" value="6346338635721175445" />
                     </node>
                   </node>
                 </node>
-                <node concept="cd27G" id="5y" role="lGtFl">
-                  <node concept="3u3nmq" id="68" role="cd27D">
+                <node concept="cd27G" id="5C" role="lGtFl">
+                  <node concept="3u3nmq" id="6e" role="cd27D">
                     <property role="3u3nmv" value="6346338635721170394" />
                   </node>
                 </node>
               </node>
-              <node concept="cd27G" id="4$" role="lGtFl">
-                <node concept="3u3nmq" id="69" role="cd27D">
+              <node concept="cd27G" id="4E" role="lGtFl">
+                <node concept="3u3nmq" id="6f" role="cd27D">
                   <property role="3u3nmv" value="6346338635721168381" />
                 </node>
               </node>
             </node>
-            <node concept="3SKdUt" id="4w" role="3cqZAp">
-              <node concept="3SKdUq" id="6a" role="3SKWNk">
+            <node concept="3SKdUt" id="4A" role="3cqZAp">
+              <node concept="3SKdUq" id="6g" role="3SKWNk">
                 <property role="3SKdUp" value="fall through" />
-                <node concept="cd27G" id="6c" role="lGtFl">
-                  <node concept="3u3nmq" id="6d" role="cd27D">
+                <node concept="cd27G" id="6i" role="lGtFl">
+                  <node concept="3u3nmq" id="6j" role="cd27D">
                     <property role="3u3nmv" value="6346338635721187649" />
                   </node>
                 </node>
               </node>
-              <node concept="cd27G" id="6b" role="lGtFl">
-                <node concept="3u3nmq" id="6e" role="cd27D">
+              <node concept="cd27G" id="6h" role="lGtFl">
+                <node concept="3u3nmq" id="6k" role="cd27D">
                   <property role="3u3nmv" value="6346338635721187647" />
                 </node>
               </node>
             </node>
-            <node concept="cd27G" id="4x" role="lGtFl">
-              <node concept="3u3nmq" id="6f" role="cd27D">
+            <node concept="cd27G" id="4B" role="lGtFl">
+              <node concept="3u3nmq" id="6l" role="cd27D">
                 <property role="3u3nmv" value="7985317431306272012" />
               </node>
             </node>
           </node>
-          <node concept="1Wc70l" id="4t" role="3clFbw">
-            <node concept="3y3z36" id="6g" role="3uHU7B">
-              <node concept="10Nm6u" id="6j" role="3uHU7w">
-                <node concept="cd27G" id="6m" role="lGtFl">
-                  <node concept="3u3nmq" id="6n" role="cd27D">
+          <node concept="1Wc70l" id="4z" role="3clFbw">
+            <node concept="3y3z36" id="6m" role="3uHU7B">
+              <node concept="10Nm6u" id="6p" role="3uHU7w">
+                <node concept="cd27G" id="6s" role="lGtFl">
+                  <node concept="3u3nmq" id="6t" role="cd27D">
                     <property role="3u3nmv" value="2681075272524260516" />
                   </node>
                 </node>
               </node>
-              <node concept="37vLTw" id="6k" role="3uHU7B">
-                <ref role="3cqZAo" node="4b" resolve="childNode" />
-                <node concept="cd27G" id="6o" role="lGtFl">
-                  <node concept="3u3nmq" id="6p" role="cd27D">
+              <node concept="37vLTw" id="6q" role="3uHU7B">
+                <ref role="3cqZAo" node="4h" resolve="childNode" />
+                <node concept="cd27G" id="6u" role="lGtFl">
+                  <node concept="3u3nmq" id="6v" role="cd27D">
                     <property role="3u3nmv" value="2681075272524257616" />
                   </node>
                 </node>
               </node>
-              <node concept="cd27G" id="6l" role="lGtFl">
-                <node concept="3u3nmq" id="6q" role="cd27D">
+              <node concept="cd27G" id="6r" role="lGtFl">
+                <node concept="3u3nmq" id="6w" role="cd27D">
                   <property role="3u3nmv" value="2681075272524259511" />
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="6h" role="3uHU7w">
-              <node concept="37vLTw" id="6r" role="2Oq$k0">
-                <ref role="3cqZAo" node="4c" resolve="childConcept" />
-                <node concept="cd27G" id="6u" role="lGtFl">
-                  <node concept="3u3nmq" id="6v" role="cd27D">
+            <node concept="2OqwBi" id="6n" role="3uHU7w">
+              <node concept="37vLTw" id="6x" role="2Oq$k0">
+                <ref role="3cqZAo" node="4i" resolve="childConcept" />
+                <node concept="cd27G" id="6$" role="lGtFl">
+                  <node concept="3u3nmq" id="6_" role="cd27D">
                     <property role="3u3nmv" value="2681075272524245156" />
                   </node>
                 </node>
               </node>
-              <node concept="3O6GUB" id="6s" role="2OqNvi">
-                <node concept="chp4Y" id="6w" role="3QVz_e">
+              <node concept="3O6GUB" id="6y" role="2OqNvi">
+                <node concept="chp4Y" id="6A" role="3QVz_e">
                   <ref role="cht4Q" to="lur:uLQNrGWd1r" resolve="ArgumentReference" />
-                  <node concept="cd27G" id="6y" role="lGtFl">
-                    <node concept="3u3nmq" id="6z" role="cd27D">
+                  <node concept="cd27G" id="6C" role="lGtFl">
+                    <node concept="3u3nmq" id="6D" role="cd27D">
                       <property role="3u3nmv" value="2681075272524249509" />
                     </node>
                   </node>
                 </node>
-                <node concept="cd27G" id="6x" role="lGtFl">
-                  <node concept="3u3nmq" id="6$" role="cd27D">
+                <node concept="cd27G" id="6B" role="lGtFl">
+                  <node concept="3u3nmq" id="6E" role="cd27D">
                     <property role="3u3nmv" value="2681075272524248514" />
                   </node>
                 </node>
               </node>
-              <node concept="cd27G" id="6t" role="lGtFl">
-                <node concept="3u3nmq" id="6_" role="cd27D">
+              <node concept="cd27G" id="6z" role="lGtFl">
+                <node concept="3u3nmq" id="6F" role="cd27D">
                   <property role="3u3nmv" value="2681075272524246656" />
                 </node>
               </node>
             </node>
-            <node concept="cd27G" id="6i" role="lGtFl">
-              <node concept="3u3nmq" id="6A" role="cd27D">
+            <node concept="cd27G" id="6o" role="lGtFl">
+              <node concept="3u3nmq" id="6G" role="cd27D">
                 <property role="3u3nmv" value="2681075272524256596" />
               </node>
             </node>
           </node>
-          <node concept="cd27G" id="4u" role="lGtFl">
-            <node concept="3u3nmq" id="6B" role="cd27D">
+          <node concept="cd27G" id="4$" role="lGtFl">
+            <node concept="3u3nmq" id="6H" role="cd27D">
               <property role="3u3nmv" value="7985317431306272010" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="4l" role="3cqZAp">
-          <node concept="3clFbT" id="6C" role="3cqZAk">
+        <node concept="3cpWs6" id="4r" role="3cqZAp">
+          <node concept="3clFbT" id="6I" role="3cqZAk">
             <property role="3clFbU" value="true" />
-            <node concept="cd27G" id="6E" role="lGtFl">
-              <node concept="3u3nmq" id="6F" role="cd27D">
+            <node concept="cd27G" id="6K" role="lGtFl">
+              <node concept="3u3nmq" id="6L" role="cd27D">
                 <property role="3u3nmv" value="7985317431306316632" />
               </node>
             </node>
           </node>
-          <node concept="cd27G" id="6D" role="lGtFl">
-            <node concept="3u3nmq" id="6G" role="cd27D">
+          <node concept="cd27G" id="6J" role="lGtFl">
+            <node concept="3u3nmq" id="6M" role="cd27D">
               <property role="3u3nmv" value="7985317431306314909" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="4m" role="lGtFl">
-          <node concept="3u3nmq" id="6H" role="cd27D">
+        <node concept="cd27G" id="4s" role="lGtFl">
+          <node concept="3u3nmq" id="6N" role="cd27D">
             <property role="3u3nmv" value="7985317431306261565" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="4a" role="3clF46">
+      <node concept="37vLTG" id="4g" role="3clF46">
         <property role="TrG5h" value="node" />
-        <node concept="3uibUv" id="6I" role="1tU5fm">
+        <node concept="3uibUv" id="6O" role="1tU5fm">
           <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-          <node concept="cd27G" id="6K" role="lGtFl">
-            <node concept="3u3nmq" id="6L" role="cd27D">
+          <node concept="cd27G" id="6Q" role="lGtFl">
+            <node concept="3u3nmq" id="6R" role="cd27D">
               <property role="3u3nmv" value="7985317431306261563" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="6J" role="lGtFl">
-          <node concept="3u3nmq" id="6M" role="cd27D">
+        <node concept="cd27G" id="6P" role="lGtFl">
+          <node concept="3u3nmq" id="6S" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="4b" role="3clF46">
+      <node concept="37vLTG" id="4h" role="3clF46">
         <property role="TrG5h" value="childNode" />
-        <node concept="3uibUv" id="6N" role="1tU5fm">
+        <node concept="3uibUv" id="6T" role="1tU5fm">
           <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-          <node concept="cd27G" id="6P" role="lGtFl">
-            <node concept="3u3nmq" id="6Q" role="cd27D">
+          <node concept="cd27G" id="6V" role="lGtFl">
+            <node concept="3u3nmq" id="6W" role="cd27D">
               <property role="3u3nmv" value="7985317431306261563" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="6O" role="lGtFl">
-          <node concept="3u3nmq" id="6R" role="cd27D">
+        <node concept="cd27G" id="6U" role="lGtFl">
+          <node concept="3u3nmq" id="6X" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="4c" role="3clF46">
+      <node concept="37vLTG" id="4i" role="3clF46">
         <property role="TrG5h" value="childConcept" />
-        <node concept="3uibUv" id="6S" role="1tU5fm">
+        <node concept="3uibUv" id="6Y" role="1tU5fm">
           <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
-          <node concept="cd27G" id="6U" role="lGtFl">
-            <node concept="3u3nmq" id="6V" role="cd27D">
+          <node concept="cd27G" id="70" role="lGtFl">
+            <node concept="3u3nmq" id="71" role="cd27D">
               <property role="3u3nmv" value="7985317431306261563" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="6T" role="lGtFl">
-          <node concept="3u3nmq" id="6W" role="cd27D">
+        <node concept="cd27G" id="6Z" role="lGtFl">
+          <node concept="3u3nmq" id="72" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="4d" role="3clF46">
+      <node concept="37vLTG" id="4j" role="3clF46">
         <property role="TrG5h" value="link" />
-        <node concept="3uibUv" id="6X" role="1tU5fm">
+        <node concept="3uibUv" id="73" role="1tU5fm">
           <ref role="3uigEE" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
-          <node concept="cd27G" id="6Z" role="lGtFl">
-            <node concept="3u3nmq" id="70" role="cd27D">
+          <node concept="cd27G" id="75" role="lGtFl">
+            <node concept="3u3nmq" id="76" role="cd27D">
               <property role="3u3nmv" value="7985317431306261563" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="6Y" role="lGtFl">
-          <node concept="3u3nmq" id="71" role="cd27D">
+        <node concept="cd27G" id="74" role="lGtFl">
+          <node concept="3u3nmq" id="77" role="cd27D">
             <property role="3u3nmv" value="7985317431306261563" />
           </node>
         </node>
       </node>
-      <node concept="cd27G" id="4e" role="lGtFl">
-        <node concept="3u3nmq" id="72" role="cd27D">
+      <node concept="cd27G" id="4k" role="lGtFl">
+        <node concept="3u3nmq" id="78" role="cd27D">
           <property role="3u3nmv" value="7985317431306261563" />
         </node>
       </node>
     </node>
-    <node concept="cd27G" id="E" role="lGtFl">
-      <node concept="3u3nmq" id="73" role="cd27D">
+    <node concept="cd27G" id="K" role="lGtFl">
+      <node concept="3u3nmq" id="79" role="cd27D">
         <property role="3u3nmv" value="7985317431306261563" />
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="74">
-    <property role="TrG5h" value="TransformationMatchManyAssertion_Constraints" />
-    <node concept="3Tm1VV" id="75" role="1B3o_S">
-      <node concept="cd27G" id="7c" role="lGtFl">
-        <node concept="3u3nmq" id="7d" role="cd27D">
-          <property role="3u3nmv" value="6346338635721157190" />
+  <node concept="312cEu" id="7a">
+    <property role="TrG5h" value="TransformationMatchCustomConditions_Constraints" />
+    <node concept="3Tm1VV" id="7b" role="1B3o_S">
+      <node concept="cd27G" id="7i" role="lGtFl">
+        <node concept="3u3nmq" id="7j" role="cd27D">
+          <property role="3u3nmv" value="7812943990232402911" />
         </node>
       </node>
     </node>
-    <node concept="3uibUv" id="76" role="1zkMxy">
+    <node concept="3uibUv" id="7c" role="1zkMxy">
       <ref role="3uigEE" to="79pl:~BaseConstraintsDescriptor" resolve="BaseConstraintsDescriptor" />
-      <node concept="cd27G" id="7e" role="lGtFl">
-        <node concept="3u3nmq" id="7f" role="cd27D">
-          <property role="3u3nmv" value="6346338635721157190" />
+      <node concept="cd27G" id="7k" role="lGtFl">
+        <node concept="3u3nmq" id="7l" role="cd27D">
+          <property role="3u3nmv" value="7812943990232402911" />
         </node>
       </node>
     </node>
-    <node concept="3clFbW" id="77" role="jymVt">
-      <node concept="3cqZAl" id="7g" role="3clF45">
-        <node concept="cd27G" id="7k" role="lGtFl">
-          <node concept="3u3nmq" id="7l" role="cd27D">
-            <property role="3u3nmv" value="6346338635721157190" />
+    <node concept="3clFbW" id="7d" role="jymVt">
+      <node concept="3cqZAl" id="7m" role="3clF45">
+        <node concept="cd27G" id="7q" role="lGtFl">
+          <node concept="3u3nmq" id="7r" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
           </node>
         </node>
       </node>
-      <node concept="3clFbS" id="7h" role="3clF47">
-        <node concept="XkiVB" id="7m" role="3cqZAp">
+      <node concept="3clFbS" id="7n" role="3clF47">
+        <node concept="XkiVB" id="7s" role="3cqZAp">
           <ref role="37wK5l" to="79pl:~BaseConstraintsDescriptor.&lt;init&gt;(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="BaseConstraintsDescriptor" />
-          <node concept="2YIFZM" id="7o" role="37wK5m">
+          <node concept="2YIFZM" id="7u" role="37wK5m">
             <ref role="1Pybhc" to="2k9e:~MetaAdapterFactory" resolve="MetaAdapterFactory" />
             <ref role="37wK5l" to="2k9e:~MetaAdapterFactory.getConcept(long,long,long,java.lang.String):org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
-            <node concept="1adDum" id="7q" role="37wK5m">
+            <node concept="1adDum" id="7w" role="37wK5m">
               <property role="1adDun" value="0x68015e26cc4d49dbL" />
-              <node concept="cd27G" id="7v" role="lGtFl">
-                <node concept="3u3nmq" id="7w" role="cd27D">
-                  <property role="3u3nmv" value="6346338635721157190" />
+              <node concept="cd27G" id="7_" role="lGtFl">
+                <node concept="3u3nmq" id="7A" role="cd27D">
+                  <property role="3u3nmv" value="7812943990232402911" />
                 </node>
               </node>
             </node>
-            <node concept="1adDum" id="7r" role="37wK5m">
+            <node concept="1adDum" id="7x" role="37wK5m">
               <property role="1adDun" value="0x8715b643faea1769L" />
-              <node concept="cd27G" id="7x" role="lGtFl">
-                <node concept="3u3nmq" id="7y" role="cd27D">
-                  <property role="3u3nmv" value="6346338635721157190" />
+              <node concept="cd27G" id="7B" role="lGtFl">
+                <node concept="3u3nmq" id="7C" role="cd27D">
+                  <property role="3u3nmv" value="7812943990232402911" />
                 </node>
               </node>
             </node>
-            <node concept="1adDum" id="7s" role="37wK5m">
-              <property role="1adDun" value="0x5812b95d667f29d9L" />
-              <node concept="cd27G" id="7z" role="lGtFl">
-                <node concept="3u3nmq" id="7$" role="cd27D">
-                  <property role="3u3nmv" value="6346338635721157190" />
+            <node concept="1adDum" id="7y" role="37wK5m">
+              <property role="1adDun" value="0x6c6d272a13d346a9L" />
+              <node concept="cd27G" id="7D" role="lGtFl">
+                <node concept="3u3nmq" id="7E" role="cd27D">
+                  <property role="3u3nmv" value="7812943990232402911" />
                 </node>
               </node>
             </node>
-            <node concept="Xl_RD" id="7t" role="37wK5m">
-              <property role="Xl_RC" value="jetbrains.mps.lang.test.generator.structure.TransformationMatchManyAssertion" />
-              <node concept="cd27G" id="7_" role="lGtFl">
-                <node concept="3u3nmq" id="7A" role="cd27D">
-                  <property role="3u3nmv" value="6346338635721157190" />
+            <node concept="Xl_RD" id="7z" role="37wK5m">
+              <property role="Xl_RC" value="jetbrains.mps.lang.test.generator.structure.TransformationMatchCustomConditions" />
+              <node concept="cd27G" id="7F" role="lGtFl">
+                <node concept="3u3nmq" id="7G" role="cd27D">
+                  <property role="3u3nmv" value="7812943990232402911" />
                 </node>
               </node>
             </node>
-            <node concept="cd27G" id="7u" role="lGtFl">
-              <node concept="3u3nmq" id="7B" role="cd27D">
-                <property role="3u3nmv" value="6346338635721157190" />
+            <node concept="cd27G" id="7$" role="lGtFl">
+              <node concept="3u3nmq" id="7H" role="cd27D">
+                <property role="3u3nmv" value="7812943990232402911" />
               </node>
             </node>
           </node>
-          <node concept="cd27G" id="7p" role="lGtFl">
-            <node concept="3u3nmq" id="7C" role="cd27D">
-              <property role="3u3nmv" value="6346338635721157190" />
+          <node concept="cd27G" id="7v" role="lGtFl">
+            <node concept="3u3nmq" id="7I" role="cd27D">
+              <property role="3u3nmv" value="7812943990232402911" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="7n" role="lGtFl">
-          <node concept="3u3nmq" id="7D" role="cd27D">
-            <property role="3u3nmv" value="6346338635721157190" />
+        <node concept="cd27G" id="7t" role="lGtFl">
+          <node concept="3u3nmq" id="7J" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="7i" role="1B3o_S">
-        <node concept="cd27G" id="7E" role="lGtFl">
-          <node concept="3u3nmq" id="7F" role="cd27D">
-            <property role="3u3nmv" value="6346338635721157190" />
+      <node concept="3Tm1VV" id="7o" role="1B3o_S">
+        <node concept="cd27G" id="7K" role="lGtFl">
+          <node concept="3u3nmq" id="7L" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
           </node>
         </node>
       </node>
-      <node concept="cd27G" id="7j" role="lGtFl">
-        <node concept="3u3nmq" id="7G" role="cd27D">
-          <property role="3u3nmv" value="6346338635721157190" />
+      <node concept="cd27G" id="7p" role="lGtFl">
+        <node concept="3u3nmq" id="7M" role="cd27D">
+          <property role="3u3nmv" value="7812943990232402911" />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="78" role="jymVt">
-      <node concept="cd27G" id="7H" role="lGtFl">
-        <node concept="3u3nmq" id="7I" role="cd27D">
-          <property role="3u3nmv" value="6346338635721157190" />
+    <node concept="2tJIrI" id="7e" role="jymVt">
+      <node concept="cd27G" id="7N" role="lGtFl">
+        <node concept="3u3nmq" id="7O" role="cd27D">
+          <property role="3u3nmv" value="7812943990232402911" />
         </node>
       </node>
     </node>
-    <node concept="3clFb_" id="79" role="jymVt">
+    <node concept="3clFb_" id="7f" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="calculateCanBeParentConstraint" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="3Tmbuc" id="7J" role="1B3o_S">
-        <node concept="cd27G" id="7O" role="lGtFl">
-          <node concept="3u3nmq" id="7P" role="cd27D">
-            <property role="3u3nmv" value="6346338635721157190" />
+      <node concept="3Tmbuc" id="7P" role="1B3o_S">
+        <node concept="cd27G" id="7U" role="lGtFl">
+          <node concept="3u3nmq" id="7V" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
           </node>
         </node>
       </node>
-      <node concept="3uibUv" id="7K" role="3clF45">
+      <node concept="3uibUv" id="7Q" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConstraintFunction" resolve="ConstraintFunction" />
-        <node concept="3uibUv" id="7Q" role="11_B2D">
+        <node concept="3uibUv" id="7W" role="11_B2D">
           <ref role="3uigEE" to="ze1i:~ConstraintContext_CanBeParent" resolve="ConstraintContext_CanBeParent" />
-          <node concept="cd27G" id="7T" role="lGtFl">
-            <node concept="3u3nmq" id="7U" role="cd27D">
-              <property role="3u3nmv" value="6346338635721157190" />
+          <node concept="cd27G" id="7Z" role="lGtFl">
+            <node concept="3u3nmq" id="80" role="cd27D">
+              <property role="3u3nmv" value="7812943990232402911" />
             </node>
           </node>
         </node>
-        <node concept="3uibUv" id="7R" role="11_B2D">
+        <node concept="3uibUv" id="7X" role="11_B2D">
           <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-          <node concept="cd27G" id="7V" role="lGtFl">
-            <node concept="3u3nmq" id="7W" role="cd27D">
-              <property role="3u3nmv" value="6346338635721157190" />
+          <node concept="cd27G" id="81" role="lGtFl">
+            <node concept="3u3nmq" id="82" role="cd27D">
+              <property role="3u3nmv" value="7812943990232402911" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="7S" role="lGtFl">
-          <node concept="3u3nmq" id="7X" role="cd27D">
-            <property role="3u3nmv" value="6346338635721157190" />
+        <node concept="cd27G" id="7Y" role="lGtFl">
+          <node concept="3u3nmq" id="83" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
           </node>
         </node>
       </node>
-      <node concept="3clFbS" id="7L" role="3clF47">
-        <node concept="3clFbF" id="7Y" role="3cqZAp">
-          <node concept="2ShNRf" id="80" role="3clFbG">
-            <node concept="YeOm9" id="82" role="2ShVmc">
-              <node concept="1Y3b0j" id="84" role="YeSDq">
+      <node concept="3clFbS" id="7R" role="3clF47">
+        <node concept="3clFbF" id="84" role="3cqZAp">
+          <node concept="2ShNRf" id="86" role="3clFbG">
+            <node concept="YeOm9" id="88" role="2ShVmc">
+              <node concept="1Y3b0j" id="8a" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <ref role="1Y3XeK" to="ze1i:~ConstraintFunction" resolve="ConstraintFunction" />
                 <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                <node concept="3Tm1VV" id="86" role="1B3o_S">
-                  <node concept="cd27G" id="8b" role="lGtFl">
-                    <node concept="3u3nmq" id="8c" role="cd27D">
-                      <property role="3u3nmv" value="6346338635721157190" />
+                <node concept="3Tm1VV" id="8c" role="1B3o_S">
+                  <node concept="cd27G" id="8h" role="lGtFl">
+                    <node concept="3u3nmq" id="8i" role="cd27D">
+                      <property role="3u3nmv" value="7812943990232402911" />
                     </node>
                   </node>
                 </node>
-                <node concept="3clFb_" id="87" role="jymVt">
+                <node concept="3clFb_" id="8d" role="jymVt">
                   <property role="1EzhhJ" value="false" />
                   <property role="TrG5h" value="invoke" />
                   <property role="DiZV1" value="false" />
                   <property role="od$2w" value="false" />
-                  <node concept="3Tm1VV" id="8d" role="1B3o_S">
-                    <node concept="cd27G" id="8k" role="lGtFl">
-                      <node concept="3u3nmq" id="8l" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157190" />
+                  <node concept="3Tm1VV" id="8j" role="1B3o_S">
+                    <node concept="cd27G" id="8q" role="lGtFl">
+                      <node concept="3u3nmq" id="8r" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232402911" />
                       </node>
                     </node>
                   </node>
-                  <node concept="2AHcQZ" id="8e" role="2AJF6D">
+                  <node concept="2AHcQZ" id="8k" role="2AJF6D">
                     <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-                    <node concept="cd27G" id="8m" role="lGtFl">
-                      <node concept="3u3nmq" id="8n" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157190" />
+                    <node concept="cd27G" id="8s" role="lGtFl">
+                      <node concept="3u3nmq" id="8t" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232402911" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3uibUv" id="8f" role="3clF45">
+                  <node concept="3uibUv" id="8l" role="3clF45">
                     <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                    <node concept="cd27G" id="8o" role="lGtFl">
-                      <node concept="3u3nmq" id="8p" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157190" />
+                    <node concept="cd27G" id="8u" role="lGtFl">
+                      <node concept="3u3nmq" id="8v" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232402911" />
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTG" id="8g" role="3clF46">
+                  <node concept="37vLTG" id="8m" role="3clF46">
                     <property role="TrG5h" value="context" />
-                    <node concept="3uibUv" id="8q" role="1tU5fm">
+                    <node concept="3uibUv" id="8w" role="1tU5fm">
                       <ref role="3uigEE" to="ze1i:~ConstraintContext_CanBeParent" resolve="ConstraintContext_CanBeParent" />
-                      <node concept="cd27G" id="8t" role="lGtFl">
-                        <node concept="3u3nmq" id="8u" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157190" />
+                      <node concept="cd27G" id="8z" role="lGtFl">
+                        <node concept="3u3nmq" id="8$" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232402911" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2AHcQZ" id="8r" role="2AJF6D">
+                    <node concept="2AHcQZ" id="8x" role="2AJF6D">
                       <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-                      <node concept="cd27G" id="8v" role="lGtFl">
-                        <node concept="3u3nmq" id="8w" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157190" />
+                      <node concept="cd27G" id="8_" role="lGtFl">
+                        <node concept="3u3nmq" id="8A" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232402911" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="8s" role="lGtFl">
-                      <node concept="3u3nmq" id="8x" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157190" />
+                    <node concept="cd27G" id="8y" role="lGtFl">
+                      <node concept="3u3nmq" id="8B" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232402911" />
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTG" id="8h" role="3clF46">
+                  <node concept="37vLTG" id="8n" role="3clF46">
                     <property role="TrG5h" value="checkingNodeContext" />
-                    <node concept="3uibUv" id="8y" role="1tU5fm">
+                    <node concept="3uibUv" id="8C" role="1tU5fm">
                       <ref role="3uigEE" to="ze1i:~CheckingNodeContext" resolve="CheckingNodeContext" />
-                      <node concept="cd27G" id="8_" role="lGtFl">
-                        <node concept="3u3nmq" id="8A" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157190" />
+                      <node concept="cd27G" id="8F" role="lGtFl">
+                        <node concept="3u3nmq" id="8G" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232402911" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2AHcQZ" id="8z" role="2AJF6D">
+                    <node concept="2AHcQZ" id="8D" role="2AJF6D">
                       <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
-                      <node concept="cd27G" id="8B" role="lGtFl">
-                        <node concept="3u3nmq" id="8C" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157190" />
+                      <node concept="cd27G" id="8H" role="lGtFl">
+                        <node concept="3u3nmq" id="8I" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232402911" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="8$" role="lGtFl">
-                      <node concept="3u3nmq" id="8D" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157190" />
+                    <node concept="cd27G" id="8E" role="lGtFl">
+                      <node concept="3u3nmq" id="8J" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232402911" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbS" id="8i" role="3clF47">
-                    <node concept="3cpWs8" id="8E" role="3cqZAp">
-                      <node concept="3cpWsn" id="8K" role="3cpWs9">
+                  <node concept="3clFbS" id="8o" role="3clF47">
+                    <node concept="3cpWs8" id="8K" role="3cqZAp">
+                      <node concept="3cpWsn" id="8Q" role="3cpWs9">
                         <property role="TrG5h" value="result" />
-                        <node concept="10P_77" id="8M" role="1tU5fm">
-                          <node concept="cd27G" id="8P" role="lGtFl">
-                            <node concept="3u3nmq" id="8Q" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157190" />
+                        <node concept="10P_77" id="8S" role="1tU5fm">
+                          <node concept="cd27G" id="8V" role="lGtFl">
+                            <node concept="3u3nmq" id="8W" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232402911" />
                             </node>
                           </node>
                         </node>
-                        <node concept="1rXfSq" id="8N" role="33vP2m">
-                          <ref role="37wK5l" node="7a" resolve="staticCanBeAParent" />
-                          <node concept="2OqwBi" id="8R" role="37wK5m">
-                            <node concept="37vLTw" id="8W" role="2Oq$k0">
-                              <ref role="3cqZAo" node="8g" resolve="context" />
-                              <node concept="cd27G" id="8Z" role="lGtFl">
-                                <node concept="3u3nmq" id="90" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                        <node concept="1rXfSq" id="8T" role="33vP2m">
+                          <ref role="37wK5l" node="7g" resolve="staticCanBeAParent" />
+                          <node concept="2OqwBi" id="8X" role="37wK5m">
+                            <node concept="37vLTw" id="92" role="2Oq$k0">
+                              <ref role="3cqZAo" node="8m" resolve="context" />
+                              <node concept="cd27G" id="95" role="lGtFl">
+                                <node concept="3u3nmq" id="96" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="8X" role="2OqNvi">
+                            <node concept="liA8E" id="93" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getNode():org.jetbrains.mps.openapi.model.SNode" resolve="getNode" />
-                              <node concept="cd27G" id="91" role="lGtFl">
-                                <node concept="3u3nmq" id="92" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                              <node concept="cd27G" id="97" role="lGtFl">
+                                <node concept="3u3nmq" id="98" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="8Y" role="lGtFl">
-                              <node concept="3u3nmq" id="93" role="cd27D">
-                                <property role="3u3nmv" value="6346338635721157190" />
+                            <node concept="cd27G" id="94" role="lGtFl">
+                              <node concept="3u3nmq" id="99" role="cd27D">
+                                <property role="3u3nmv" value="7812943990232402911" />
                               </node>
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="8S" role="37wK5m">
-                            <node concept="37vLTw" id="94" role="2Oq$k0">
-                              <ref role="3cqZAo" node="8g" resolve="context" />
-                              <node concept="cd27G" id="97" role="lGtFl">
-                                <node concept="3u3nmq" id="98" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                          <node concept="2OqwBi" id="8Y" role="37wK5m">
+                            <node concept="37vLTw" id="9a" role="2Oq$k0">
+                              <ref role="3cqZAo" node="8m" resolve="context" />
+                              <node concept="cd27G" id="9d" role="lGtFl">
+                                <node concept="3u3nmq" id="9e" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="95" role="2OqNvi">
+                            <node concept="liA8E" id="9b" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getChildNode():org.jetbrains.mps.openapi.model.SNode" resolve="getChildNode" />
-                              <node concept="cd27G" id="99" role="lGtFl">
-                                <node concept="3u3nmq" id="9a" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                              <node concept="cd27G" id="9f" role="lGtFl">
+                                <node concept="3u3nmq" id="9g" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="96" role="lGtFl">
-                              <node concept="3u3nmq" id="9b" role="cd27D">
-                                <property role="3u3nmv" value="6346338635721157190" />
+                            <node concept="cd27G" id="9c" role="lGtFl">
+                              <node concept="3u3nmq" id="9h" role="cd27D">
+                                <property role="3u3nmv" value="7812943990232402911" />
                               </node>
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="8T" role="37wK5m">
-                            <node concept="37vLTw" id="9c" role="2Oq$k0">
-                              <ref role="3cqZAo" node="8g" resolve="context" />
-                              <node concept="cd27G" id="9f" role="lGtFl">
-                                <node concept="3u3nmq" id="9g" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                          <node concept="2OqwBi" id="8Z" role="37wK5m">
+                            <node concept="37vLTw" id="9i" role="2Oq$k0">
+                              <ref role="3cqZAo" node="8m" resolve="context" />
+                              <node concept="cd27G" id="9l" role="lGtFl">
+                                <node concept="3u3nmq" id="9m" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="9d" role="2OqNvi">
+                            <node concept="liA8E" id="9j" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getChildConcept():org.jetbrains.mps.openapi.language.SAbstractConcept" resolve="getChildConcept" />
-                              <node concept="cd27G" id="9h" role="lGtFl">
-                                <node concept="3u3nmq" id="9i" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                              <node concept="cd27G" id="9n" role="lGtFl">
+                                <node concept="3u3nmq" id="9o" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="9e" role="lGtFl">
-                              <node concept="3u3nmq" id="9j" role="cd27D">
-                                <property role="3u3nmv" value="6346338635721157190" />
+                            <node concept="cd27G" id="9k" role="lGtFl">
+                              <node concept="3u3nmq" id="9p" role="cd27D">
+                                <property role="3u3nmv" value="7812943990232402911" />
                               </node>
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="8U" role="37wK5m">
-                            <node concept="37vLTw" id="9k" role="2Oq$k0">
-                              <ref role="3cqZAo" node="8g" resolve="context" />
-                              <node concept="cd27G" id="9n" role="lGtFl">
-                                <node concept="3u3nmq" id="9o" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                          <node concept="2OqwBi" id="90" role="37wK5m">
+                            <node concept="37vLTw" id="9q" role="2Oq$k0">
+                              <ref role="3cqZAo" node="8m" resolve="context" />
+                              <node concept="cd27G" id="9t" role="lGtFl">
+                                <node concept="3u3nmq" id="9u" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="9l" role="2OqNvi">
+                            <node concept="liA8E" id="9r" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getLink():org.jetbrains.mps.openapi.language.SContainmentLink" resolve="getLink" />
-                              <node concept="cd27G" id="9p" role="lGtFl">
-                                <node concept="3u3nmq" id="9q" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                              <node concept="cd27G" id="9v" role="lGtFl">
+                                <node concept="3u3nmq" id="9w" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="9m" role="lGtFl">
-                              <node concept="3u3nmq" id="9r" role="cd27D">
-                                <property role="3u3nmv" value="6346338635721157190" />
+                            <node concept="cd27G" id="9s" role="lGtFl">
+                              <node concept="3u3nmq" id="9x" role="cd27D">
+                                <property role="3u3nmv" value="7812943990232402911" />
                               </node>
                             </node>
                           </node>
-                          <node concept="cd27G" id="8V" role="lGtFl">
-                            <node concept="3u3nmq" id="9s" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157190" />
+                          <node concept="cd27G" id="91" role="lGtFl">
+                            <node concept="3u3nmq" id="9y" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232402911" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="8O" role="lGtFl">
-                          <node concept="3u3nmq" id="9t" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157190" />
+                        <node concept="cd27G" id="8U" role="lGtFl">
+                          <node concept="3u3nmq" id="9z" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232402911" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="8L" role="lGtFl">
-                        <node concept="3u3nmq" id="9u" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157190" />
+                      <node concept="cd27G" id="8R" role="lGtFl">
+                        <node concept="3u3nmq" id="9$" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232402911" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="8F" role="3cqZAp">
-                      <node concept="cd27G" id="9v" role="lGtFl">
-                        <node concept="3u3nmq" id="9w" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157190" />
+                    <node concept="3clFbH" id="8L" role="3cqZAp">
+                      <node concept="cd27G" id="9_" role="lGtFl">
+                        <node concept="3u3nmq" id="9A" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232402911" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbJ" id="8G" role="3cqZAp">
-                      <node concept="3clFbS" id="9x" role="3clFbx">
-                        <node concept="3clFbF" id="9$" role="3cqZAp">
-                          <node concept="2OqwBi" id="9A" role="3clFbG">
-                            <node concept="37vLTw" id="9C" role="2Oq$k0">
-                              <ref role="3cqZAo" node="8h" resolve="checkingNodeContext" />
-                              <node concept="cd27G" id="9F" role="lGtFl">
-                                <node concept="3u3nmq" id="9G" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                    <node concept="3clFbJ" id="8M" role="3cqZAp">
+                      <node concept="3clFbS" id="9B" role="3clFbx">
+                        <node concept="3clFbF" id="9E" role="3cqZAp">
+                          <node concept="2OqwBi" id="9G" role="3clFbG">
+                            <node concept="37vLTw" id="9I" role="2Oq$k0">
+                              <ref role="3cqZAo" node="8n" resolve="checkingNodeContext" />
+                              <node concept="cd27G" id="9L" role="lGtFl">
+                                <node concept="3u3nmq" id="9M" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="9D" role="2OqNvi">
+                            <node concept="liA8E" id="9J" role="2OqNvi">
                               <ref role="37wK5l" to="ze1i:~CheckingNodeContext.setBreakingNode(org.jetbrains.mps.openapi.model.SNodeReference):void" resolve="setBreakingNode" />
-                              <node concept="1dyn4i" id="9H" role="37wK5m">
+                              <node concept="1dyn4i" id="9N" role="37wK5m">
                                 <property role="1dyqJU" value="canBeParentBreakingPoint" />
-                                <node concept="2ShNRf" id="9J" role="1dyrYi">
-                                  <node concept="1pGfFk" id="9L" role="2ShVmc">
+                                <node concept="2ShNRf" id="9P" role="1dyrYi">
+                                  <node concept="1pGfFk" id="9R" role="2ShVmc">
                                     <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(java.lang.String,java.lang.String)" resolve="SNodePointer" />
-                                    <node concept="Xl_RD" id="9N" role="37wK5m">
+                                    <node concept="Xl_RD" id="9T" role="37wK5m">
                                       <property role="Xl_RC" value="r:d9fe9834-daa9-425b-9f8a-1debaf95f372(jetbrains.mps.lang.test.generator.constraints)" />
-                                      <node concept="cd27G" id="9Q" role="lGtFl">
-                                        <node concept="3u3nmq" id="9R" role="cd27D">
-                                          <property role="3u3nmv" value="6346338635721157190" />
+                                      <node concept="cd27G" id="9W" role="lGtFl">
+                                        <node concept="3u3nmq" id="9X" role="cd27D">
+                                          <property role="3u3nmv" value="7812943990232402911" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Xl_RD" id="9O" role="37wK5m">
-                                      <property role="Xl_RC" value="6346338635721157191" />
-                                      <node concept="cd27G" id="9S" role="lGtFl">
-                                        <node concept="3u3nmq" id="9T" role="cd27D">
-                                          <property role="3u3nmv" value="6346338635721157190" />
+                                    <node concept="Xl_RD" id="9U" role="37wK5m">
+                                      <property role="Xl_RC" value="7812943990232402938" />
+                                      <node concept="cd27G" id="9Y" role="lGtFl">
+                                        <node concept="3u3nmq" id="9Z" role="cd27D">
+                                          <property role="3u3nmv" value="7812943990232402911" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="cd27G" id="9P" role="lGtFl">
-                                      <node concept="3u3nmq" id="9U" role="cd27D">
-                                        <property role="3u3nmv" value="6346338635721157190" />
+                                    <node concept="cd27G" id="9V" role="lGtFl">
+                                      <node concept="3u3nmq" id="a0" role="cd27D">
+                                        <property role="3u3nmv" value="7812943990232402911" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="cd27G" id="9M" role="lGtFl">
-                                    <node concept="3u3nmq" id="9V" role="cd27D">
-                                      <property role="3u3nmv" value="6346338635721157190" />
+                                  <node concept="cd27G" id="9S" role="lGtFl">
+                                    <node concept="3u3nmq" id="a1" role="cd27D">
+                                      <property role="3u3nmv" value="7812943990232402911" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="cd27G" id="9K" role="lGtFl">
-                                  <node concept="3u3nmq" id="9W" role="cd27D">
-                                    <property role="3u3nmv" value="6346338635721157190" />
+                                <node concept="cd27G" id="9Q" role="lGtFl">
+                                  <node concept="3u3nmq" id="a2" role="cd27D">
+                                    <property role="3u3nmv" value="7812943990232402911" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="cd27G" id="9I" role="lGtFl">
-                                <node concept="3u3nmq" id="9X" role="cd27D">
-                                  <property role="3u3nmv" value="6346338635721157190" />
+                              <node concept="cd27G" id="9O" role="lGtFl">
+                                <node concept="3u3nmq" id="a3" role="cd27D">
+                                  <property role="3u3nmv" value="7812943990232402911" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="cd27G" id="9E" role="lGtFl">
-                              <node concept="3u3nmq" id="9Y" role="cd27D">
-                                <property role="3u3nmv" value="6346338635721157190" />
+                            <node concept="cd27G" id="9K" role="lGtFl">
+                              <node concept="3u3nmq" id="a4" role="cd27D">
+                                <property role="3u3nmv" value="7812943990232402911" />
                               </node>
                             </node>
                           </node>
-                          <node concept="cd27G" id="9B" role="lGtFl">
-                            <node concept="3u3nmq" id="9Z" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157190" />
+                          <node concept="cd27G" id="9H" role="lGtFl">
+                            <node concept="3u3nmq" id="a5" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232402911" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="9_" role="lGtFl">
-                          <node concept="3u3nmq" id="a0" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157190" />
+                        <node concept="cd27G" id="9F" role="lGtFl">
+                          <node concept="3u3nmq" id="a6" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232402911" />
                           </node>
                         </node>
                       </node>
-                      <node concept="1Wc70l" id="9y" role="3clFbw">
-                        <node concept="3y3z36" id="a1" role="3uHU7w">
-                          <node concept="10Nm6u" id="a4" role="3uHU7w">
-                            <node concept="cd27G" id="a7" role="lGtFl">
-                              <node concept="3u3nmq" id="a8" role="cd27D">
-                                <property role="3u3nmv" value="6346338635721157190" />
+                      <node concept="1Wc70l" id="9C" role="3clFbw">
+                        <node concept="3y3z36" id="a7" role="3uHU7w">
+                          <node concept="10Nm6u" id="aa" role="3uHU7w">
+                            <node concept="cd27G" id="ad" role="lGtFl">
+                              <node concept="3u3nmq" id="ae" role="cd27D">
+                                <property role="3u3nmv" value="7812943990232402911" />
                               </node>
                             </node>
                           </node>
-                          <node concept="37vLTw" id="a5" role="3uHU7B">
-                            <ref role="3cqZAo" node="8h" resolve="checkingNodeContext" />
-                            <node concept="cd27G" id="a9" role="lGtFl">
-                              <node concept="3u3nmq" id="aa" role="cd27D">
-                                <property role="3u3nmv" value="6346338635721157190" />
+                          <node concept="37vLTw" id="ab" role="3uHU7B">
+                            <ref role="3cqZAo" node="8n" resolve="checkingNodeContext" />
+                            <node concept="cd27G" id="af" role="lGtFl">
+                              <node concept="3u3nmq" id="ag" role="cd27D">
+                                <property role="3u3nmv" value="7812943990232402911" />
                               </node>
                             </node>
                           </node>
-                          <node concept="cd27G" id="a6" role="lGtFl">
-                            <node concept="3u3nmq" id="ab" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157190" />
+                          <node concept="cd27G" id="ac" role="lGtFl">
+                            <node concept="3u3nmq" id="ah" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232402911" />
                             </node>
                           </node>
                         </node>
-                        <node concept="3fqX7Q" id="a2" role="3uHU7B">
-                          <node concept="37vLTw" id="ac" role="3fr31v">
-                            <ref role="3cqZAo" node="8K" resolve="result" />
-                            <node concept="cd27G" id="ae" role="lGtFl">
-                              <node concept="3u3nmq" id="af" role="cd27D">
-                                <property role="3u3nmv" value="6346338635721157190" />
+                        <node concept="3fqX7Q" id="a8" role="3uHU7B">
+                          <node concept="37vLTw" id="ai" role="3fr31v">
+                            <ref role="3cqZAo" node="8Q" resolve="result" />
+                            <node concept="cd27G" id="ak" role="lGtFl">
+                              <node concept="3u3nmq" id="al" role="cd27D">
+                                <property role="3u3nmv" value="7812943990232402911" />
                               </node>
                             </node>
                           </node>
-                          <node concept="cd27G" id="ad" role="lGtFl">
-                            <node concept="3u3nmq" id="ag" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157190" />
+                          <node concept="cd27G" id="aj" role="lGtFl">
+                            <node concept="3u3nmq" id="am" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232402911" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="a3" role="lGtFl">
-                          <node concept="3u3nmq" id="ah" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157190" />
+                        <node concept="cd27G" id="a9" role="lGtFl">
+                          <node concept="3u3nmq" id="an" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232402911" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="9z" role="lGtFl">
-                        <node concept="3u3nmq" id="ai" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157190" />
+                      <node concept="cd27G" id="9D" role="lGtFl">
+                        <node concept="3u3nmq" id="ao" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232402911" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="8H" role="3cqZAp">
-                      <node concept="cd27G" id="aj" role="lGtFl">
-                        <node concept="3u3nmq" id="ak" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157190" />
+                    <node concept="3clFbH" id="8N" role="3cqZAp">
+                      <node concept="cd27G" id="ap" role="lGtFl">
+                        <node concept="3u3nmq" id="aq" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232402911" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbF" id="8I" role="3cqZAp">
-                      <node concept="37vLTw" id="al" role="3clFbG">
-                        <ref role="3cqZAo" node="8K" resolve="result" />
-                        <node concept="cd27G" id="an" role="lGtFl">
-                          <node concept="3u3nmq" id="ao" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157190" />
+                    <node concept="3clFbF" id="8O" role="3cqZAp">
+                      <node concept="37vLTw" id="ar" role="3clFbG">
+                        <ref role="3cqZAo" node="8Q" resolve="result" />
+                        <node concept="cd27G" id="at" role="lGtFl">
+                          <node concept="3u3nmq" id="au" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232402911" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="am" role="lGtFl">
-                        <node concept="3u3nmq" id="ap" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157190" />
+                      <node concept="cd27G" id="as" role="lGtFl">
+                        <node concept="3u3nmq" id="av" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232402911" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="8J" role="lGtFl">
-                      <node concept="3u3nmq" id="aq" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157190" />
+                    <node concept="cd27G" id="8P" role="lGtFl">
+                      <node concept="3u3nmq" id="aw" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232402911" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="8j" role="lGtFl">
-                    <node concept="3u3nmq" id="ar" role="cd27D">
-                      <property role="3u3nmv" value="6346338635721157190" />
+                  <node concept="cd27G" id="8p" role="lGtFl">
+                    <node concept="3u3nmq" id="ax" role="cd27D">
+                      <property role="3u3nmv" value="7812943990232402911" />
                     </node>
                   </node>
                 </node>
-                <node concept="3uibUv" id="88" role="2Ghqu4">
+                <node concept="3uibUv" id="8e" role="2Ghqu4">
                   <ref role="3uigEE" to="ze1i:~ConstraintContext_CanBeParent" resolve="ConstraintContext_CanBeParent" />
-                  <node concept="cd27G" id="as" role="lGtFl">
-                    <node concept="3u3nmq" id="at" role="cd27D">
-                      <property role="3u3nmv" value="6346338635721157190" />
+                  <node concept="cd27G" id="ay" role="lGtFl">
+                    <node concept="3u3nmq" id="az" role="cd27D">
+                      <property role="3u3nmv" value="7812943990232402911" />
                     </node>
                   </node>
                 </node>
-                <node concept="3uibUv" id="89" role="2Ghqu4">
+                <node concept="3uibUv" id="8f" role="2Ghqu4">
                   <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                  <node concept="cd27G" id="au" role="lGtFl">
-                    <node concept="3u3nmq" id="av" role="cd27D">
-                      <property role="3u3nmv" value="6346338635721157190" />
+                  <node concept="cd27G" id="a$" role="lGtFl">
+                    <node concept="3u3nmq" id="a_" role="cd27D">
+                      <property role="3u3nmv" value="7812943990232402911" />
                     </node>
                   </node>
                 </node>
-                <node concept="cd27G" id="8a" role="lGtFl">
-                  <node concept="3u3nmq" id="aw" role="cd27D">
-                    <property role="3u3nmv" value="6346338635721157190" />
+                <node concept="cd27G" id="8g" role="lGtFl">
+                  <node concept="3u3nmq" id="aA" role="cd27D">
+                    <property role="3u3nmv" value="7812943990232402911" />
                   </node>
                 </node>
               </node>
-              <node concept="cd27G" id="85" role="lGtFl">
-                <node concept="3u3nmq" id="ax" role="cd27D">
-                  <property role="3u3nmv" value="6346338635721157190" />
+              <node concept="cd27G" id="8b" role="lGtFl">
+                <node concept="3u3nmq" id="aB" role="cd27D">
+                  <property role="3u3nmv" value="7812943990232402911" />
                 </node>
               </node>
             </node>
-            <node concept="cd27G" id="83" role="lGtFl">
-              <node concept="3u3nmq" id="ay" role="cd27D">
-                <property role="3u3nmv" value="6346338635721157190" />
+            <node concept="cd27G" id="89" role="lGtFl">
+              <node concept="3u3nmq" id="aC" role="cd27D">
+                <property role="3u3nmv" value="7812943990232402911" />
               </node>
             </node>
           </node>
-          <node concept="cd27G" id="81" role="lGtFl">
-            <node concept="3u3nmq" id="az" role="cd27D">
-              <property role="3u3nmv" value="6346338635721157190" />
+          <node concept="cd27G" id="87" role="lGtFl">
+            <node concept="3u3nmq" id="aD" role="cd27D">
+              <property role="3u3nmv" value="7812943990232402911" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="7Z" role="lGtFl">
-          <node concept="3u3nmq" id="a$" role="cd27D">
-            <property role="3u3nmv" value="6346338635721157190" />
+        <node concept="cd27G" id="85" role="lGtFl">
+          <node concept="3u3nmq" id="aE" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="7M" role="2AJF6D">
+      <node concept="2AHcQZ" id="7S" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        <node concept="cd27G" id="a_" role="lGtFl">
-          <node concept="3u3nmq" id="aA" role="cd27D">
-            <property role="3u3nmv" value="6346338635721157190" />
+        <node concept="cd27G" id="aF" role="lGtFl">
+          <node concept="3u3nmq" id="aG" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
           </node>
         </node>
       </node>
-      <node concept="cd27G" id="7N" role="lGtFl">
-        <node concept="3u3nmq" id="aB" role="cd27D">
-          <property role="3u3nmv" value="6346338635721157190" />
+      <node concept="cd27G" id="7T" role="lGtFl">
+        <node concept="3u3nmq" id="aH" role="cd27D">
+          <property role="3u3nmv" value="7812943990232402911" />
         </node>
       </node>
     </node>
-    <node concept="2YIFZL" id="7a" role="jymVt">
+    <node concept="2YIFZL" id="7g" role="jymVt">
       <property role="TrG5h" value="staticCanBeAParent" />
-      <node concept="10P_77" id="aC" role="3clF45">
-        <node concept="cd27G" id="aK" role="lGtFl">
-          <node concept="3u3nmq" id="aL" role="cd27D">
-            <property role="3u3nmv" value="6346338635721157190" />
+      <node concept="10P_77" id="aI" role="3clF45">
+        <node concept="cd27G" id="aQ" role="lGtFl">
+          <node concept="3u3nmq" id="aR" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="aD" role="1B3o_S">
-        <node concept="cd27G" id="aM" role="lGtFl">
-          <node concept="3u3nmq" id="aN" role="cd27D">
-            <property role="3u3nmv" value="6346338635721157190" />
+      <node concept="3Tm6S6" id="aJ" role="1B3o_S">
+        <node concept="cd27G" id="aS" role="lGtFl">
+          <node concept="3u3nmq" id="aT" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
           </node>
         </node>
       </node>
-      <node concept="3clFbS" id="aE" role="3clF47">
-        <node concept="3SKdUt" id="aO" role="3cqZAp">
-          <node concept="3SKdUq" id="aT" role="3SKWNk">
-            <property role="3SKdUp" value="this assertion is allowed to reference arguments that point to model only." />
-            <node concept="cd27G" id="aV" role="lGtFl">
-              <node concept="3u3nmq" id="aW" role="cd27D">
-                <property role="3u3nmv" value="6346338635721157659" />
-              </node>
-            </node>
-          </node>
-          <node concept="cd27G" id="aU" role="lGtFl">
-            <node concept="3u3nmq" id="aX" role="cd27D">
-              <property role="3u3nmv" value="6346338635721157658" />
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="aP" role="3cqZAp">
+      <node concept="3clFbS" id="aK" role="3clF47">
+        <node concept="3SKdUt" id="aU" role="3cqZAp">
           <node concept="3SKdUq" id="aY" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME introduce an argument kind to hold collection of models and allow to reference it from referenceModels" />
+            <property role="3SKdUp" value="this assertion is allowed to reference arguments that point to model only." />
             <node concept="cd27G" id="b0" role="lGtFl">
               <node concept="3u3nmq" id="b1" role="cd27D">
-                <property role="3u3nmv" value="6346338635721160460" />
+                <property role="3u3nmv" value="7812943990232403406" />
               </node>
             </node>
           </node>
           <node concept="cd27G" id="aZ" role="lGtFl">
             <node concept="3u3nmq" id="b2" role="cd27D">
-              <property role="3u3nmv" value="6346338635721160458" />
+              <property role="3u3nmv" value="7812943990232403405" />
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="aQ" role="3cqZAp">
+        <node concept="3clFbJ" id="aV" role="3cqZAp">
           <node concept="3clFbS" id="b3" role="3clFbx">
             <node concept="3clFbJ" id="b6" role="3cqZAp">
-              <node concept="3clFbS" id="b8" role="3clFbx">
-                <node concept="3cpWs8" id="bb" role="3cqZAp">
-                  <node concept="3cpWsn" id="be" role="3cpWs9">
+              <node concept="3clFbS" id="b9" role="3clFbx">
+                <node concept="3cpWs8" id="bc" role="3cqZAp">
+                  <node concept="3cpWsn" id="bf" role="3cpWs9">
                     <property role="TrG5h" value="arg" />
-                    <node concept="3Tqbb2" id="bg" role="1tU5fm">
+                    <node concept="3Tqbb2" id="bh" role="1tU5fm">
                       <ref role="ehGHo" to="lur:uLQNrGW9LE" resolve="TestArgument" />
-                      <node concept="cd27G" id="bj" role="lGtFl">
-                        <node concept="3u3nmq" id="bk" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157664" />
+                      <node concept="cd27G" id="bk" role="lGtFl">
+                        <node concept="3u3nmq" id="bl" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232403413" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="bh" role="33vP2m">
-                      <node concept="1PxgMI" id="bl" role="2Oq$k0">
+                    <node concept="2OqwBi" id="bi" role="33vP2m">
+                      <node concept="1PxgMI" id="bm" role="2Oq$k0">
                         <property role="1BlNFB" value="true" />
-                        <node concept="chp4Y" id="bo" role="3oSUPX">
+                        <node concept="chp4Y" id="bp" role="3oSUPX">
                           <ref role="cht4Q" to="lur:uLQNrGWd1r" resolve="ArgumentReference" />
-                          <node concept="cd27G" id="br" role="lGtFl">
-                            <node concept="3u3nmq" id="bs" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157667" />
+                          <node concept="cd27G" id="bs" role="lGtFl">
+                            <node concept="3u3nmq" id="bt" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232403416" />
                             </node>
                           </node>
                         </node>
-                        <node concept="37vLTw" id="bp" role="1m5AlR">
-                          <ref role="3cqZAo" node="aG" resolve="childNode" />
-                          <node concept="cd27G" id="bt" role="lGtFl">
-                            <node concept="3u3nmq" id="bu" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157668" />
+                        <node concept="37vLTw" id="bq" role="1m5AlR">
+                          <ref role="3cqZAo" node="aM" resolve="childNode" />
+                          <node concept="cd27G" id="bu" role="lGtFl">
+                            <node concept="3u3nmq" id="bv" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232403417" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="bq" role="lGtFl">
-                          <node concept="3u3nmq" id="bv" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157666" />
+                        <node concept="cd27G" id="br" role="lGtFl">
+                          <node concept="3u3nmq" id="bw" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232403415" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3TrEf2" id="bm" role="2OqNvi">
+                      <node concept="3TrEf2" id="bn" role="2OqNvi">
                         <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
-                        <node concept="cd27G" id="bw" role="lGtFl">
-                          <node concept="3u3nmq" id="bx" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157669" />
+                        <node concept="cd27G" id="bx" role="lGtFl">
+                          <node concept="3u3nmq" id="by" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232403418" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="bn" role="lGtFl">
-                        <node concept="3u3nmq" id="by" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157665" />
+                      <node concept="cd27G" id="bo" role="lGtFl">
+                        <node concept="3u3nmq" id="bz" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232403414" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="bi" role="lGtFl">
-                      <node concept="3u3nmq" id="bz" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157663" />
+                    <node concept="cd27G" id="bj" role="lGtFl">
+                      <node concept="3u3nmq" id="b$" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232403412" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="bf" role="lGtFl">
-                    <node concept="3u3nmq" id="b$" role="cd27D">
-                      <property role="3u3nmv" value="6346338635721157662" />
+                  <node concept="cd27G" id="bg" role="lGtFl">
+                    <node concept="3u3nmq" id="b_" role="cd27D">
+                      <property role="3u3nmv" value="7812943990232403411" />
                     </node>
                   </node>
                 </node>
-                <node concept="3cpWs6" id="bc" role="3cqZAp">
-                  <node concept="22lmx$" id="b_" role="3cqZAk">
-                    <node concept="2OqwBi" id="bB" role="3uHU7B">
-                      <node concept="37vLTw" id="bE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="be" resolve="arg" />
-                        <node concept="cd27G" id="bH" role="lGtFl">
-                          <node concept="3u3nmq" id="bI" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157673" />
+                <node concept="3cpWs6" id="bd" role="3cqZAp">
+                  <node concept="22lmx$" id="bA" role="3cqZAk">
+                    <node concept="2OqwBi" id="bC" role="3uHU7B">
+                      <node concept="37vLTw" id="bF" role="2Oq$k0">
+                        <ref role="3cqZAo" node="bf" resolve="arg" />
+                        <node concept="cd27G" id="bI" role="lGtFl">
+                          <node concept="3u3nmq" id="bJ" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232403422" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3w_OXm" id="bF" role="2OqNvi">
-                        <node concept="cd27G" id="bJ" role="lGtFl">
-                          <node concept="3u3nmq" id="bK" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157674" />
+                      <node concept="3w_OXm" id="bG" role="2OqNvi">
+                        <node concept="cd27G" id="bK" role="lGtFl">
+                          <node concept="3u3nmq" id="bL" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232403423" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="bG" role="lGtFl">
-                        <node concept="3u3nmq" id="bL" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157672" />
+                      <node concept="cd27G" id="bH" role="lGtFl">
+                        <node concept="3u3nmq" id="bM" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232403421" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="bC" role="3uHU7w">
-                      <node concept="2OqwBi" id="bM" role="2Oq$k0">
-                        <node concept="37vLTw" id="bP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="be" resolve="arg" />
-                          <node concept="cd27G" id="bS" role="lGtFl">
-                            <node concept="3u3nmq" id="bT" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157677" />
+                    <node concept="2OqwBi" id="bD" role="3uHU7w">
+                      <node concept="2OqwBi" id="bN" role="2Oq$k0">
+                        <node concept="37vLTw" id="bQ" role="2Oq$k0">
+                          <ref role="3cqZAo" node="bf" resolve="arg" />
+                          <node concept="cd27G" id="bT" role="lGtFl">
+                            <node concept="3u3nmq" id="bU" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232403426" />
                             </node>
                           </node>
                         </node>
-                        <node concept="2yIwOk" id="bQ" role="2OqNvi">
-                          <node concept="cd27G" id="bU" role="lGtFl">
-                            <node concept="3u3nmq" id="bV" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157678" />
+                        <node concept="2yIwOk" id="bR" role="2OqNvi">
+                          <node concept="cd27G" id="bV" role="lGtFl">
+                            <node concept="3u3nmq" id="bW" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232403427" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="bR" role="lGtFl">
-                          <node concept="3u3nmq" id="bW" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157676" />
+                        <node concept="cd27G" id="bS" role="lGtFl">
+                          <node concept="3u3nmq" id="bX" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232403425" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3O6GUB" id="bN" role="2OqNvi">
-                        <node concept="chp4Y" id="bX" role="3QVz_e">
+                      <node concept="3O6GUB" id="bO" role="2OqNvi">
+                        <node concept="chp4Y" id="bY" role="3QVz_e">
                           <ref role="cht4Q" to="lur:uLQNrGW9LI" resolve="ModelArgument" />
-                          <node concept="cd27G" id="bZ" role="lGtFl">
-                            <node concept="3u3nmq" id="c0" role="cd27D">
-                              <property role="3u3nmv" value="6346338635721157680" />
+                          <node concept="cd27G" id="c0" role="lGtFl">
+                            <node concept="3u3nmq" id="c1" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232403429" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="bY" role="lGtFl">
-                          <node concept="3u3nmq" id="c1" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157679" />
+                        <node concept="cd27G" id="bZ" role="lGtFl">
+                          <node concept="3u3nmq" id="c2" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232403428" />
                           </node>
                         </node>
                       </node>
-                      <node concept="cd27G" id="bO" role="lGtFl">
-                        <node concept="3u3nmq" id="c2" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157675" />
+                      <node concept="cd27G" id="bP" role="lGtFl">
+                        <node concept="3u3nmq" id="c3" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232403424" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="bD" role="lGtFl">
-                      <node concept="3u3nmq" id="c3" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157671" />
+                    <node concept="cd27G" id="bE" role="lGtFl">
+                      <node concept="3u3nmq" id="c4" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232403420" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="bA" role="lGtFl">
-                    <node concept="3u3nmq" id="c4" role="cd27D">
-                      <property role="3u3nmv" value="6346338635721157670" />
+                  <node concept="cd27G" id="bB" role="lGtFl">
+                    <node concept="3u3nmq" id="c5" role="cd27D">
+                      <property role="3u3nmv" value="7812943990232403419" />
                     </node>
                   </node>
                 </node>
-                <node concept="cd27G" id="bd" role="lGtFl">
-                  <node concept="3u3nmq" id="c5" role="cd27D">
-                    <property role="3u3nmv" value="6346338635721189778" />
+                <node concept="cd27G" id="be" role="lGtFl">
+                  <node concept="3u3nmq" id="c6" role="cd27D">
+                    <property role="3u3nmv" value="7812943990232403410" />
                   </node>
                 </node>
               </node>
-              <node concept="22lmx$" id="b9" role="3clFbw">
-                <node concept="22lmx$" id="c6" role="3uHU7B">
-                  <node concept="2OqwBi" id="c9" role="3uHU7B">
-                    <node concept="37vLTw" id="cc" role="2Oq$k0">
-                      <ref role="3cqZAo" node="aI" resolve="link" />
-                      <node concept="cd27G" id="cf" role="lGtFl">
-                        <node concept="3u3nmq" id="cg" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157697" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="cd" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                      <node concept="359W_D" id="ch" role="37wK5m">
-                        <ref role="359W_E" to="lur:5wiIlPAvMBp" resolve="TransformationMatchManyAssertion" />
-                        <ref role="359W_F" to="lur:5wiIlPAvMBr" resolve="inputModel" />
-                        <node concept="cd27G" id="cj" role="lGtFl">
-                          <node concept="3u3nmq" id="ck" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721157699" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="cd27G" id="ci" role="lGtFl">
-                        <node concept="3u3nmq" id="cl" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157698" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="cd27G" id="ce" role="lGtFl">
-                      <node concept="3u3nmq" id="cm" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157696" />
+              <node concept="22lmx$" id="ba" role="3clFbw">
+                <node concept="2OqwBi" id="c7" role="3uHU7w">
+                  <node concept="37vLTw" id="ca" role="2Oq$k0">
+                    <ref role="3cqZAo" node="aO" resolve="link" />
+                    <node concept="cd27G" id="cd" role="lGtFl">
+                      <node concept="3u3nmq" id="ce" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232403432" />
                       </node>
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="ca" role="3uHU7w">
-                    <node concept="37vLTw" id="cn" role="2Oq$k0">
-                      <ref role="3cqZAo" node="aI" resolve="link" />
-                      <node concept="cd27G" id="cq" role="lGtFl">
-                        <node concept="3u3nmq" id="cr" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721199119" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="co" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                      <node concept="359W_D" id="cs" role="37wK5m">
-                        <ref role="359W_E" to="lur:5wiIlPAvMBp" resolve="TransformationMatchManyAssertion" />
-                        <ref role="359W_F" to="lur:5wiIlPAvMBs" resolve="referenceModels" />
-                        <node concept="cd27G" id="cu" role="lGtFl">
-                          <node concept="3u3nmq" id="cv" role="cd27D">
-                            <property role="3u3nmv" value="6346338635721199121" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="cd27G" id="ct" role="lGtFl">
-                        <node concept="3u3nmq" id="cw" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721199120" />
+                  <node concept="liA8E" id="cb" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                    <node concept="359W_D" id="cf" role="37wK5m">
+                      <ref role="359W_E" to="lur:6LH9MCjOOqD" resolve="TransformationMatchCustomConditions" />
+                      <ref role="359W_F" to="lur:6LH9MCjOOqI" resolve="transformationPlan" />
+                      <node concept="cd27G" id="ch" role="lGtFl">
+                        <node concept="3u3nmq" id="ci" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232403434" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="cp" role="lGtFl">
-                      <node concept="3u3nmq" id="cx" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721199118" />
+                    <node concept="cd27G" id="cg" role="lGtFl">
+                      <node concept="3u3nmq" id="cj" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232403433" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="cb" role="lGtFl">
-                    <node concept="3u3nmq" id="cy" role="cd27D">
-                      <property role="3u3nmv" value="6346338635721214710" />
+                  <node concept="cd27G" id="cc" role="lGtFl">
+                    <node concept="3u3nmq" id="ck" role="cd27D">
+                      <property role="3u3nmv" value="7812943990232403431" />
                     </node>
                   </node>
                 </node>
-                <node concept="2OqwBi" id="c7" role="3uHU7w">
-                  <node concept="37vLTw" id="cz" role="2Oq$k0">
-                    <ref role="3cqZAo" node="aI" resolve="link" />
-                    <node concept="cd27G" id="cA" role="lGtFl">
-                      <node concept="3u3nmq" id="cB" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157683" />
+                <node concept="2OqwBi" id="c8" role="3uHU7B">
+                  <node concept="37vLTw" id="cl" role="2Oq$k0">
+                    <ref role="3cqZAo" node="aO" resolve="link" />
+                    <node concept="cd27G" id="co" role="lGtFl">
+                      <node concept="3u3nmq" id="cp" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232403441" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="c$" role="2OqNvi">
+                  <node concept="liA8E" id="cm" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                    <node concept="359W_D" id="cC" role="37wK5m">
-                      <ref role="359W_E" to="lur:uLQNrGWd1n" resolve="TransformationMatchAssertion" />
-                      <ref role="359W_F" to="lur:uLQNrGWd1z" resolve="transformationPlan" />
-                      <node concept="cd27G" id="cE" role="lGtFl">
-                        <node concept="3u3nmq" id="cF" role="cd27D">
-                          <property role="3u3nmv" value="6346338635721157685" />
+                    <node concept="359W_D" id="cq" role="37wK5m">
+                      <ref role="359W_E" to="lur:6LH9MCjOOqD" resolve="TransformationMatchCustomConditions" />
+                      <ref role="359W_F" to="lur:6LH9MCjOOqG" resolve="inputModel" />
+                      <node concept="cd27G" id="cs" role="lGtFl">
+                        <node concept="3u3nmq" id="ct" role="cd27D">
+                          <property role="3u3nmv" value="7812943990232403443" />
                         </node>
                       </node>
                     </node>
-                    <node concept="cd27G" id="cD" role="lGtFl">
-                      <node concept="3u3nmq" id="cG" role="cd27D">
-                        <property role="3u3nmv" value="6346338635721157684" />
+                    <node concept="cd27G" id="cr" role="lGtFl">
+                      <node concept="3u3nmq" id="cu" role="cd27D">
+                        <property role="3u3nmv" value="7812943990232403442" />
                       </node>
                     </node>
                   </node>
-                  <node concept="cd27G" id="c_" role="lGtFl">
-                    <node concept="3u3nmq" id="cH" role="cd27D">
-                      <property role="3u3nmv" value="6346338635721157682" />
+                  <node concept="cd27G" id="cn" role="lGtFl">
+                    <node concept="3u3nmq" id="cv" role="cd27D">
+                      <property role="3u3nmv" value="7812943990232403440" />
                     </node>
                   </node>
                 </node>
-                <node concept="cd27G" id="c8" role="lGtFl">
-                  <node concept="3u3nmq" id="cI" role="cd27D">
-                    <property role="3u3nmv" value="6346338635721193931" />
+                <node concept="cd27G" id="c9" role="lGtFl">
+                  <node concept="3u3nmq" id="cw" role="cd27D">
+                    <property role="3u3nmv" value="7812943990232403430" />
                   </node>
                 </node>
               </node>
-              <node concept="cd27G" id="ba" role="lGtFl">
-                <node concept="3u3nmq" id="cJ" role="cd27D">
-                  <property role="3u3nmv" value="6346338635721189776" />
+              <node concept="cd27G" id="bb" role="lGtFl">
+                <node concept="3u3nmq" id="cx" role="cd27D">
+                  <property role="3u3nmv" value="7812943990232403409" />
                 </node>
               </node>
             </node>
-            <node concept="cd27G" id="b7" role="lGtFl">
-              <node concept="3u3nmq" id="cK" role="cd27D">
-                <property role="3u3nmv" value="6346338635721157661" />
+            <node concept="3SKdUt" id="b7" role="3cqZAp">
+              <node concept="3SKdUq" id="cy" role="3SKWNk">
+                <property role="3SKdUp" value="fall through" />
+                <node concept="cd27G" id="c$" role="lGtFl">
+                  <node concept="3u3nmq" id="c_" role="cd27D">
+                    <property role="3u3nmv" value="7812943990232403445" />
+                  </node>
+                </node>
+              </node>
+              <node concept="cd27G" id="cz" role="lGtFl">
+                <node concept="3u3nmq" id="cA" role="cd27D">
+                  <property role="3u3nmv" value="7812943990232403444" />
+                </node>
+              </node>
+            </node>
+            <node concept="cd27G" id="b8" role="lGtFl">
+              <node concept="3u3nmq" id="cB" role="cd27D">
+                <property role="3u3nmv" value="7812943990232403408" />
               </node>
             </node>
           </node>
           <node concept="1Wc70l" id="b4" role="3clFbw">
-            <node concept="3y3z36" id="cL" role="3uHU7B">
-              <node concept="10Nm6u" id="cO" role="3uHU7w">
-                <node concept="cd27G" id="cR" role="lGtFl">
-                  <node concept="3u3nmq" id="cS" role="cd27D">
-                    <property role="3u3nmv" value="6346338635721157690" />
+            <node concept="3y3z36" id="cC" role="3uHU7B">
+              <node concept="10Nm6u" id="cF" role="3uHU7w">
+                <node concept="cd27G" id="cI" role="lGtFl">
+                  <node concept="3u3nmq" id="cJ" role="cd27D">
+                    <property role="3u3nmv" value="7812943990232403448" />
                   </node>
                 </node>
               </node>
-              <node concept="37vLTw" id="cP" role="3uHU7B">
-                <ref role="3cqZAo" node="aG" resolve="childNode" />
-                <node concept="cd27G" id="cT" role="lGtFl">
-                  <node concept="3u3nmq" id="cU" role="cd27D">
-                    <property role="3u3nmv" value="6346338635721157691" />
+              <node concept="37vLTw" id="cG" role="3uHU7B">
+                <ref role="3cqZAo" node="aM" resolve="childNode" />
+                <node concept="cd27G" id="cK" role="lGtFl">
+                  <node concept="3u3nmq" id="cL" role="cd27D">
+                    <property role="3u3nmv" value="7812943990232403449" />
                   </node>
                 </node>
               </node>
-              <node concept="cd27G" id="cQ" role="lGtFl">
-                <node concept="3u3nmq" id="cV" role="cd27D">
-                  <property role="3u3nmv" value="6346338635721157689" />
+              <node concept="cd27G" id="cH" role="lGtFl">
+                <node concept="3u3nmq" id="cM" role="cd27D">
+                  <property role="3u3nmv" value="7812943990232403447" />
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="cM" role="3uHU7w">
-              <node concept="37vLTw" id="cW" role="2Oq$k0">
-                <ref role="3cqZAo" node="aH" resolve="childConcept" />
-                <node concept="cd27G" id="cZ" role="lGtFl">
-                  <node concept="3u3nmq" id="d0" role="cd27D">
-                    <property role="3u3nmv" value="6346338635721157693" />
+            <node concept="2OqwBi" id="cD" role="3uHU7w">
+              <node concept="37vLTw" id="cN" role="2Oq$k0">
+                <ref role="3cqZAo" node="aN" resolve="childConcept" />
+                <node concept="cd27G" id="cQ" role="lGtFl">
+                  <node concept="3u3nmq" id="cR" role="cd27D">
+                    <property role="3u3nmv" value="7812943990232403451" />
                   </node>
                 </node>
               </node>
-              <node concept="3O6GUB" id="cX" role="2OqNvi">
-                <node concept="chp4Y" id="d1" role="3QVz_e">
+              <node concept="3O6GUB" id="cO" role="2OqNvi">
+                <node concept="chp4Y" id="cS" role="3QVz_e">
                   <ref role="cht4Q" to="lur:uLQNrGWd1r" resolve="ArgumentReference" />
-                  <node concept="cd27G" id="d3" role="lGtFl">
-                    <node concept="3u3nmq" id="d4" role="cd27D">
-                      <property role="3u3nmv" value="6346338635721157695" />
+                  <node concept="cd27G" id="cU" role="lGtFl">
+                    <node concept="3u3nmq" id="cV" role="cd27D">
+                      <property role="3u3nmv" value="7812943990232403453" />
                     </node>
                   </node>
                 </node>
-                <node concept="cd27G" id="d2" role="lGtFl">
-                  <node concept="3u3nmq" id="d5" role="cd27D">
-                    <property role="3u3nmv" value="6346338635721157694" />
+                <node concept="cd27G" id="cT" role="lGtFl">
+                  <node concept="3u3nmq" id="cW" role="cd27D">
+                    <property role="3u3nmv" value="7812943990232403452" />
                   </node>
                 </node>
               </node>
-              <node concept="cd27G" id="cY" role="lGtFl">
-                <node concept="3u3nmq" id="d6" role="cd27D">
-                  <property role="3u3nmv" value="6346338635721157692" />
+              <node concept="cd27G" id="cP" role="lGtFl">
+                <node concept="3u3nmq" id="cX" role="cd27D">
+                  <property role="3u3nmv" value="7812943990232403450" />
                 </node>
               </node>
             </node>
-            <node concept="cd27G" id="cN" role="lGtFl">
-              <node concept="3u3nmq" id="d7" role="cd27D">
-                <property role="3u3nmv" value="6346338635721157688" />
+            <node concept="cd27G" id="cE" role="lGtFl">
+              <node concept="3u3nmq" id="cY" role="cd27D">
+                <property role="3u3nmv" value="7812943990232403446" />
               </node>
             </node>
           </node>
           <node concept="cd27G" id="b5" role="lGtFl">
-            <node concept="3u3nmq" id="d8" role="cd27D">
-              <property role="3u3nmv" value="6346338635721157660" />
+            <node concept="3u3nmq" id="cZ" role="cd27D">
+              <property role="3u3nmv" value="7812943990232403407" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="aR" role="3cqZAp">
-          <node concept="3clFbT" id="d9" role="3cqZAk">
+        <node concept="3cpWs6" id="aW" role="3cqZAp">
+          <node concept="3clFbT" id="d0" role="3cqZAk">
             <property role="3clFbU" value="true" />
-            <node concept="cd27G" id="db" role="lGtFl">
-              <node concept="3u3nmq" id="dc" role="cd27D">
-                <property role="3u3nmv" value="6346338635721157705" />
+            <node concept="cd27G" id="d2" role="lGtFl">
+              <node concept="3u3nmq" id="d3" role="cd27D">
+                <property role="3u3nmv" value="7812943990232403455" />
               </node>
             </node>
           </node>
-          <node concept="cd27G" id="da" role="lGtFl">
-            <node concept="3u3nmq" id="dd" role="cd27D">
-              <property role="3u3nmv" value="6346338635721157704" />
+          <node concept="cd27G" id="d1" role="lGtFl">
+            <node concept="3u3nmq" id="d4" role="cd27D">
+              <property role="3u3nmv" value="7812943990232403454" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="aS" role="lGtFl">
-          <node concept="3u3nmq" id="de" role="cd27D">
+        <node concept="cd27G" id="aX" role="lGtFl">
+          <node concept="3u3nmq" id="d5" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402939" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="aL" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3uibUv" id="d6" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+          <node concept="cd27G" id="d8" role="lGtFl">
+            <node concept="3u3nmq" id="d9" role="cd27D">
+              <property role="3u3nmv" value="7812943990232402911" />
+            </node>
+          </node>
+        </node>
+        <node concept="cd27G" id="d7" role="lGtFl">
+          <node concept="3u3nmq" id="da" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="aM" role="3clF46">
+        <property role="TrG5h" value="childNode" />
+        <node concept="3uibUv" id="db" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+          <node concept="cd27G" id="dd" role="lGtFl">
+            <node concept="3u3nmq" id="de" role="cd27D">
+              <property role="3u3nmv" value="7812943990232402911" />
+            </node>
+          </node>
+        </node>
+        <node concept="cd27G" id="dc" role="lGtFl">
+          <node concept="3u3nmq" id="df" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="aN" role="3clF46">
+        <property role="TrG5h" value="childConcept" />
+        <node concept="3uibUv" id="dg" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
+          <node concept="cd27G" id="di" role="lGtFl">
+            <node concept="3u3nmq" id="dj" role="cd27D">
+              <property role="3u3nmv" value="7812943990232402911" />
+            </node>
+          </node>
+        </node>
+        <node concept="cd27G" id="dh" role="lGtFl">
+          <node concept="3u3nmq" id="dk" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="aO" role="3clF46">
+        <property role="TrG5h" value="link" />
+        <node concept="3uibUv" id="dl" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
+          <node concept="cd27G" id="dn" role="lGtFl">
+            <node concept="3u3nmq" id="do" role="cd27D">
+              <property role="3u3nmv" value="7812943990232402911" />
+            </node>
+          </node>
+        </node>
+        <node concept="cd27G" id="dm" role="lGtFl">
+          <node concept="3u3nmq" id="dp" role="cd27D">
+            <property role="3u3nmv" value="7812943990232402911" />
+          </node>
+        </node>
+      </node>
+      <node concept="cd27G" id="aP" role="lGtFl">
+        <node concept="3u3nmq" id="dq" role="cd27D">
+          <property role="3u3nmv" value="7812943990232402911" />
+        </node>
+      </node>
+    </node>
+    <node concept="cd27G" id="7h" role="lGtFl">
+      <node concept="3u3nmq" id="dr" role="cd27D">
+        <property role="3u3nmv" value="7812943990232402911" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="ds">
+    <property role="TrG5h" value="TransformationMatchManyAssertion_Constraints" />
+    <node concept="3Tm1VV" id="dt" role="1B3o_S">
+      <node concept="cd27G" id="d$" role="lGtFl">
+        <node concept="3u3nmq" id="d_" role="cd27D">
+          <property role="3u3nmv" value="6346338635721157190" />
+        </node>
+      </node>
+    </node>
+    <node concept="3uibUv" id="du" role="1zkMxy">
+      <ref role="3uigEE" to="79pl:~BaseConstraintsDescriptor" resolve="BaseConstraintsDescriptor" />
+      <node concept="cd27G" id="dA" role="lGtFl">
+        <node concept="3u3nmq" id="dB" role="cd27D">
+          <property role="3u3nmv" value="6346338635721157190" />
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbW" id="dv" role="jymVt">
+      <node concept="3cqZAl" id="dC" role="3clF45">
+        <node concept="cd27G" id="dG" role="lGtFl">
+          <node concept="3u3nmq" id="dH" role="cd27D">
+            <property role="3u3nmv" value="6346338635721157190" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="dD" role="3clF47">
+        <node concept="XkiVB" id="dI" role="3cqZAp">
+          <ref role="37wK5l" to="79pl:~BaseConstraintsDescriptor.&lt;init&gt;(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="BaseConstraintsDescriptor" />
+          <node concept="2YIFZM" id="dK" role="37wK5m">
+            <ref role="1Pybhc" to="2k9e:~MetaAdapterFactory" resolve="MetaAdapterFactory" />
+            <ref role="37wK5l" to="2k9e:~MetaAdapterFactory.getConcept(long,long,long,java.lang.String):org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
+            <node concept="1adDum" id="dM" role="37wK5m">
+              <property role="1adDun" value="0x68015e26cc4d49dbL" />
+              <node concept="cd27G" id="dR" role="lGtFl">
+                <node concept="3u3nmq" id="dS" role="cd27D">
+                  <property role="3u3nmv" value="6346338635721157190" />
+                </node>
+              </node>
+            </node>
+            <node concept="1adDum" id="dN" role="37wK5m">
+              <property role="1adDun" value="0x8715b643faea1769L" />
+              <node concept="cd27G" id="dT" role="lGtFl">
+                <node concept="3u3nmq" id="dU" role="cd27D">
+                  <property role="3u3nmv" value="6346338635721157190" />
+                </node>
+              </node>
+            </node>
+            <node concept="1adDum" id="dO" role="37wK5m">
+              <property role="1adDun" value="0x5812b95d667f29d9L" />
+              <node concept="cd27G" id="dV" role="lGtFl">
+                <node concept="3u3nmq" id="dW" role="cd27D">
+                  <property role="3u3nmv" value="6346338635721157190" />
+                </node>
+              </node>
+            </node>
+            <node concept="Xl_RD" id="dP" role="37wK5m">
+              <property role="Xl_RC" value="jetbrains.mps.lang.test.generator.structure.TransformationMatchManyAssertion" />
+              <node concept="cd27G" id="dX" role="lGtFl">
+                <node concept="3u3nmq" id="dY" role="cd27D">
+                  <property role="3u3nmv" value="6346338635721157190" />
+                </node>
+              </node>
+            </node>
+            <node concept="cd27G" id="dQ" role="lGtFl">
+              <node concept="3u3nmq" id="dZ" role="cd27D">
+                <property role="3u3nmv" value="6346338635721157190" />
+              </node>
+            </node>
+          </node>
+          <node concept="cd27G" id="dL" role="lGtFl">
+            <node concept="3u3nmq" id="e0" role="cd27D">
+              <property role="3u3nmv" value="6346338635721157190" />
+            </node>
+          </node>
+        </node>
+        <node concept="cd27G" id="dJ" role="lGtFl">
+          <node concept="3u3nmq" id="e1" role="cd27D">
+            <property role="3u3nmv" value="6346338635721157190" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="dE" role="1B3o_S">
+        <node concept="cd27G" id="e2" role="lGtFl">
+          <node concept="3u3nmq" id="e3" role="cd27D">
+            <property role="3u3nmv" value="6346338635721157190" />
+          </node>
+        </node>
+      </node>
+      <node concept="cd27G" id="dF" role="lGtFl">
+        <node concept="3u3nmq" id="e4" role="cd27D">
+          <property role="3u3nmv" value="6346338635721157190" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="dw" role="jymVt">
+      <node concept="cd27G" id="e5" role="lGtFl">
+        <node concept="3u3nmq" id="e6" role="cd27D">
+          <property role="3u3nmv" value="6346338635721157190" />
+        </node>
+      </node>
+    </node>
+    <node concept="3clFb_" id="dx" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="calculateCanBeParentConstraint" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tmbuc" id="e7" role="1B3o_S">
+        <node concept="cd27G" id="ec" role="lGtFl">
+          <node concept="3u3nmq" id="ed" role="cd27D">
+            <property role="3u3nmv" value="6346338635721157190" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="e8" role="3clF45">
+        <ref role="3uigEE" to="ze1i:~ConstraintFunction" resolve="ConstraintFunction" />
+        <node concept="3uibUv" id="ee" role="11_B2D">
+          <ref role="3uigEE" to="ze1i:~ConstraintContext_CanBeParent" resolve="ConstraintContext_CanBeParent" />
+          <node concept="cd27G" id="eh" role="lGtFl">
+            <node concept="3u3nmq" id="ei" role="cd27D">
+              <property role="3u3nmv" value="6346338635721157190" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="ef" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+          <node concept="cd27G" id="ej" role="lGtFl">
+            <node concept="3u3nmq" id="ek" role="cd27D">
+              <property role="3u3nmv" value="6346338635721157190" />
+            </node>
+          </node>
+        </node>
+        <node concept="cd27G" id="eg" role="lGtFl">
+          <node concept="3u3nmq" id="el" role="cd27D">
+            <property role="3u3nmv" value="6346338635721157190" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="e9" role="3clF47">
+        <node concept="3clFbF" id="em" role="3cqZAp">
+          <node concept="2ShNRf" id="eo" role="3clFbG">
+            <node concept="YeOm9" id="eq" role="2ShVmc">
+              <node concept="1Y3b0j" id="es" role="YeSDq">
+                <property role="2bfB8j" value="true" />
+                <ref role="1Y3XeK" to="ze1i:~ConstraintFunction" resolve="ConstraintFunction" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                <node concept="3Tm1VV" id="eu" role="1B3o_S">
+                  <node concept="cd27G" id="ez" role="lGtFl">
+                    <node concept="3u3nmq" id="e$" role="cd27D">
+                      <property role="3u3nmv" value="6346338635721157190" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFb_" id="ev" role="jymVt">
+                  <property role="1EzhhJ" value="false" />
+                  <property role="TrG5h" value="invoke" />
+                  <property role="DiZV1" value="false" />
+                  <property role="od$2w" value="false" />
+                  <node concept="3Tm1VV" id="e_" role="1B3o_S">
+                    <node concept="cd27G" id="eG" role="lGtFl">
+                      <node concept="3u3nmq" id="eH" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157190" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="eA" role="2AJF6D">
+                    <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+                    <node concept="cd27G" id="eI" role="lGtFl">
+                      <node concept="3u3nmq" id="eJ" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157190" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3uibUv" id="eB" role="3clF45">
+                    <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                    <node concept="cd27G" id="eK" role="lGtFl">
+                      <node concept="3u3nmq" id="eL" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157190" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="eC" role="3clF46">
+                    <property role="TrG5h" value="context" />
+                    <node concept="3uibUv" id="eM" role="1tU5fm">
+                      <ref role="3uigEE" to="ze1i:~ConstraintContext_CanBeParent" resolve="ConstraintContext_CanBeParent" />
+                      <node concept="cd27G" id="eP" role="lGtFl">
+                        <node concept="3u3nmq" id="eQ" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157190" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="eN" role="2AJF6D">
+                      <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+                      <node concept="cd27G" id="eR" role="lGtFl">
+                        <node concept="3u3nmq" id="eS" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157190" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="cd27G" id="eO" role="lGtFl">
+                      <node concept="3u3nmq" id="eT" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157190" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="eD" role="3clF46">
+                    <property role="TrG5h" value="checkingNodeContext" />
+                    <node concept="3uibUv" id="eU" role="1tU5fm">
+                      <ref role="3uigEE" to="ze1i:~CheckingNodeContext" resolve="CheckingNodeContext" />
+                      <node concept="cd27G" id="eX" role="lGtFl">
+                        <node concept="3u3nmq" id="eY" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157190" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="eV" role="2AJF6D">
+                      <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+                      <node concept="cd27G" id="eZ" role="lGtFl">
+                        <node concept="3u3nmq" id="f0" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157190" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="cd27G" id="eW" role="lGtFl">
+                      <node concept="3u3nmq" id="f1" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157190" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="eE" role="3clF47">
+                    <node concept="3cpWs8" id="f2" role="3cqZAp">
+                      <node concept="3cpWsn" id="f8" role="3cpWs9">
+                        <property role="TrG5h" value="result" />
+                        <node concept="10P_77" id="fa" role="1tU5fm">
+                          <node concept="cd27G" id="fd" role="lGtFl">
+                            <node concept="3u3nmq" id="fe" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157190" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1rXfSq" id="fb" role="33vP2m">
+                          <ref role="37wK5l" node="dy" resolve="staticCanBeAParent" />
+                          <node concept="2OqwBi" id="ff" role="37wK5m">
+                            <node concept="37vLTw" id="fk" role="2Oq$k0">
+                              <ref role="3cqZAo" node="eC" resolve="context" />
+                              <node concept="cd27G" id="fn" role="lGtFl">
+                                <node concept="3u3nmq" id="fo" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="fl" role="2OqNvi">
+                              <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getNode():org.jetbrains.mps.openapi.model.SNode" resolve="getNode" />
+                              <node concept="cd27G" id="fp" role="lGtFl">
+                                <node concept="3u3nmq" id="fq" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="cd27G" id="fm" role="lGtFl">
+                              <node concept="3u3nmq" id="fr" role="cd27D">
+                                <property role="3u3nmv" value="6346338635721157190" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="fg" role="37wK5m">
+                            <node concept="37vLTw" id="fs" role="2Oq$k0">
+                              <ref role="3cqZAo" node="eC" resolve="context" />
+                              <node concept="cd27G" id="fv" role="lGtFl">
+                                <node concept="3u3nmq" id="fw" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="ft" role="2OqNvi">
+                              <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getChildNode():org.jetbrains.mps.openapi.model.SNode" resolve="getChildNode" />
+                              <node concept="cd27G" id="fx" role="lGtFl">
+                                <node concept="3u3nmq" id="fy" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="cd27G" id="fu" role="lGtFl">
+                              <node concept="3u3nmq" id="fz" role="cd27D">
+                                <property role="3u3nmv" value="6346338635721157190" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="fh" role="37wK5m">
+                            <node concept="37vLTw" id="f$" role="2Oq$k0">
+                              <ref role="3cqZAo" node="eC" resolve="context" />
+                              <node concept="cd27G" id="fB" role="lGtFl">
+                                <node concept="3u3nmq" id="fC" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="f_" role="2OqNvi">
+                              <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getChildConcept():org.jetbrains.mps.openapi.language.SAbstractConcept" resolve="getChildConcept" />
+                              <node concept="cd27G" id="fD" role="lGtFl">
+                                <node concept="3u3nmq" id="fE" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="cd27G" id="fA" role="lGtFl">
+                              <node concept="3u3nmq" id="fF" role="cd27D">
+                                <property role="3u3nmv" value="6346338635721157190" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="fi" role="37wK5m">
+                            <node concept="37vLTw" id="fG" role="2Oq$k0">
+                              <ref role="3cqZAo" node="eC" resolve="context" />
+                              <node concept="cd27G" id="fJ" role="lGtFl">
+                                <node concept="3u3nmq" id="fK" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="fH" role="2OqNvi">
+                              <ref role="37wK5l" to="ze1i:~ConstraintContext_CanBeParent.getLink():org.jetbrains.mps.openapi.language.SContainmentLink" resolve="getLink" />
+                              <node concept="cd27G" id="fL" role="lGtFl">
+                                <node concept="3u3nmq" id="fM" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="cd27G" id="fI" role="lGtFl">
+                              <node concept="3u3nmq" id="fN" role="cd27D">
+                                <property role="3u3nmv" value="6346338635721157190" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="cd27G" id="fj" role="lGtFl">
+                            <node concept="3u3nmq" id="fO" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157190" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="cd27G" id="fc" role="lGtFl">
+                          <node concept="3u3nmq" id="fP" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157190" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="cd27G" id="f9" role="lGtFl">
+                        <node concept="3u3nmq" id="fQ" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157190" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="f3" role="3cqZAp">
+                      <node concept="cd27G" id="fR" role="lGtFl">
+                        <node concept="3u3nmq" id="fS" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157190" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbJ" id="f4" role="3cqZAp">
+                      <node concept="3clFbS" id="fT" role="3clFbx">
+                        <node concept="3clFbF" id="fW" role="3cqZAp">
+                          <node concept="2OqwBi" id="fY" role="3clFbG">
+                            <node concept="37vLTw" id="g0" role="2Oq$k0">
+                              <ref role="3cqZAo" node="eD" resolve="checkingNodeContext" />
+                              <node concept="cd27G" id="g3" role="lGtFl">
+                                <node concept="3u3nmq" id="g4" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="g1" role="2OqNvi">
+                              <ref role="37wK5l" to="ze1i:~CheckingNodeContext.setBreakingNode(org.jetbrains.mps.openapi.model.SNodeReference):void" resolve="setBreakingNode" />
+                              <node concept="1dyn4i" id="g5" role="37wK5m">
+                                <property role="1dyqJU" value="canBeParentBreakingPoint" />
+                                <node concept="2ShNRf" id="g7" role="1dyrYi">
+                                  <node concept="1pGfFk" id="g9" role="2ShVmc">
+                                    <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(java.lang.String,java.lang.String)" resolve="SNodePointer" />
+                                    <node concept="Xl_RD" id="gb" role="37wK5m">
+                                      <property role="Xl_RC" value="r:d9fe9834-daa9-425b-9f8a-1debaf95f372(jetbrains.mps.lang.test.generator.constraints)" />
+                                      <node concept="cd27G" id="ge" role="lGtFl">
+                                        <node concept="3u3nmq" id="gf" role="cd27D">
+                                          <property role="3u3nmv" value="6346338635721157190" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="Xl_RD" id="gc" role="37wK5m">
+                                      <property role="Xl_RC" value="6346338635721157191" />
+                                      <node concept="cd27G" id="gg" role="lGtFl">
+                                        <node concept="3u3nmq" id="gh" role="cd27D">
+                                          <property role="3u3nmv" value="6346338635721157190" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="cd27G" id="gd" role="lGtFl">
+                                      <node concept="3u3nmq" id="gi" role="cd27D">
+                                        <property role="3u3nmv" value="6346338635721157190" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="cd27G" id="ga" role="lGtFl">
+                                    <node concept="3u3nmq" id="gj" role="cd27D">
+                                      <property role="3u3nmv" value="6346338635721157190" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="cd27G" id="g8" role="lGtFl">
+                                  <node concept="3u3nmq" id="gk" role="cd27D">
+                                    <property role="3u3nmv" value="6346338635721157190" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="cd27G" id="g6" role="lGtFl">
+                                <node concept="3u3nmq" id="gl" role="cd27D">
+                                  <property role="3u3nmv" value="6346338635721157190" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="cd27G" id="g2" role="lGtFl">
+                              <node concept="3u3nmq" id="gm" role="cd27D">
+                                <property role="3u3nmv" value="6346338635721157190" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="cd27G" id="fZ" role="lGtFl">
+                            <node concept="3u3nmq" id="gn" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157190" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="cd27G" id="fX" role="lGtFl">
+                          <node concept="3u3nmq" id="go" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157190" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1Wc70l" id="fU" role="3clFbw">
+                        <node concept="3y3z36" id="gp" role="3uHU7w">
+                          <node concept="10Nm6u" id="gs" role="3uHU7w">
+                            <node concept="cd27G" id="gv" role="lGtFl">
+                              <node concept="3u3nmq" id="gw" role="cd27D">
+                                <property role="3u3nmv" value="6346338635721157190" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="gt" role="3uHU7B">
+                            <ref role="3cqZAo" node="eD" resolve="checkingNodeContext" />
+                            <node concept="cd27G" id="gx" role="lGtFl">
+                              <node concept="3u3nmq" id="gy" role="cd27D">
+                                <property role="3u3nmv" value="6346338635721157190" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="cd27G" id="gu" role="lGtFl">
+                            <node concept="3u3nmq" id="gz" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157190" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3fqX7Q" id="gq" role="3uHU7B">
+                          <node concept="37vLTw" id="g$" role="3fr31v">
+                            <ref role="3cqZAo" node="f8" resolve="result" />
+                            <node concept="cd27G" id="gA" role="lGtFl">
+                              <node concept="3u3nmq" id="gB" role="cd27D">
+                                <property role="3u3nmv" value="6346338635721157190" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="cd27G" id="g_" role="lGtFl">
+                            <node concept="3u3nmq" id="gC" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157190" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="cd27G" id="gr" role="lGtFl">
+                          <node concept="3u3nmq" id="gD" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157190" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="cd27G" id="fV" role="lGtFl">
+                        <node concept="3u3nmq" id="gE" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157190" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="f5" role="3cqZAp">
+                      <node concept="cd27G" id="gF" role="lGtFl">
+                        <node concept="3u3nmq" id="gG" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157190" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="f6" role="3cqZAp">
+                      <node concept="37vLTw" id="gH" role="3clFbG">
+                        <ref role="3cqZAo" node="f8" resolve="result" />
+                        <node concept="cd27G" id="gJ" role="lGtFl">
+                          <node concept="3u3nmq" id="gK" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157190" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="cd27G" id="gI" role="lGtFl">
+                        <node concept="3u3nmq" id="gL" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157190" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="cd27G" id="f7" role="lGtFl">
+                      <node concept="3u3nmq" id="gM" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157190" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="cd27G" id="eF" role="lGtFl">
+                    <node concept="3u3nmq" id="gN" role="cd27D">
+                      <property role="3u3nmv" value="6346338635721157190" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3uibUv" id="ew" role="2Ghqu4">
+                  <ref role="3uigEE" to="ze1i:~ConstraintContext_CanBeParent" resolve="ConstraintContext_CanBeParent" />
+                  <node concept="cd27G" id="gO" role="lGtFl">
+                    <node concept="3u3nmq" id="gP" role="cd27D">
+                      <property role="3u3nmv" value="6346338635721157190" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3uibUv" id="ex" role="2Ghqu4">
+                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                  <node concept="cd27G" id="gQ" role="lGtFl">
+                    <node concept="3u3nmq" id="gR" role="cd27D">
+                      <property role="3u3nmv" value="6346338635721157190" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="cd27G" id="ey" role="lGtFl">
+                  <node concept="3u3nmq" id="gS" role="cd27D">
+                    <property role="3u3nmv" value="6346338635721157190" />
+                  </node>
+                </node>
+              </node>
+              <node concept="cd27G" id="et" role="lGtFl">
+                <node concept="3u3nmq" id="gT" role="cd27D">
+                  <property role="3u3nmv" value="6346338635721157190" />
+                </node>
+              </node>
+            </node>
+            <node concept="cd27G" id="er" role="lGtFl">
+              <node concept="3u3nmq" id="gU" role="cd27D">
+                <property role="3u3nmv" value="6346338635721157190" />
+              </node>
+            </node>
+          </node>
+          <node concept="cd27G" id="ep" role="lGtFl">
+            <node concept="3u3nmq" id="gV" role="cd27D">
+              <property role="3u3nmv" value="6346338635721157190" />
+            </node>
+          </node>
+        </node>
+        <node concept="cd27G" id="en" role="lGtFl">
+          <node concept="3u3nmq" id="gW" role="cd27D">
+            <property role="3u3nmv" value="6346338635721157190" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="ea" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        <node concept="cd27G" id="gX" role="lGtFl">
+          <node concept="3u3nmq" id="gY" role="cd27D">
+            <property role="3u3nmv" value="6346338635721157190" />
+          </node>
+        </node>
+      </node>
+      <node concept="cd27G" id="eb" role="lGtFl">
+        <node concept="3u3nmq" id="gZ" role="cd27D">
+          <property role="3u3nmv" value="6346338635721157190" />
+        </node>
+      </node>
+    </node>
+    <node concept="2YIFZL" id="dy" role="jymVt">
+      <property role="TrG5h" value="staticCanBeAParent" />
+      <node concept="10P_77" id="h0" role="3clF45">
+        <node concept="cd27G" id="h8" role="lGtFl">
+          <node concept="3u3nmq" id="h9" role="cd27D">
+            <property role="3u3nmv" value="6346338635721157190" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="h1" role="1B3o_S">
+        <node concept="cd27G" id="ha" role="lGtFl">
+          <node concept="3u3nmq" id="hb" role="cd27D">
+            <property role="3u3nmv" value="6346338635721157190" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="h2" role="3clF47">
+        <node concept="3SKdUt" id="hc" role="3cqZAp">
+          <node concept="3SKdUq" id="hh" role="3SKWNk">
+            <property role="3SKdUp" value="this assertion is allowed to reference arguments that point to model only." />
+            <node concept="cd27G" id="hj" role="lGtFl">
+              <node concept="3u3nmq" id="hk" role="cd27D">
+                <property role="3u3nmv" value="6346338635721157659" />
+              </node>
+            </node>
+          </node>
+          <node concept="cd27G" id="hi" role="lGtFl">
+            <node concept="3u3nmq" id="hl" role="cd27D">
+              <property role="3u3nmv" value="6346338635721157658" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="hd" role="3cqZAp">
+          <node concept="3SKdUq" id="hm" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME introduce an argument kind to hold collection of models and allow to reference it from referenceModels" />
+            <node concept="cd27G" id="ho" role="lGtFl">
+              <node concept="3u3nmq" id="hp" role="cd27D">
+                <property role="3u3nmv" value="6346338635721160460" />
+              </node>
+            </node>
+          </node>
+          <node concept="cd27G" id="hn" role="lGtFl">
+            <node concept="3u3nmq" id="hq" role="cd27D">
+              <property role="3u3nmv" value="6346338635721160458" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="he" role="3cqZAp">
+          <node concept="3clFbS" id="hr" role="3clFbx">
+            <node concept="3clFbJ" id="hu" role="3cqZAp">
+              <node concept="3clFbS" id="hw" role="3clFbx">
+                <node concept="3cpWs8" id="hz" role="3cqZAp">
+                  <node concept="3cpWsn" id="hA" role="3cpWs9">
+                    <property role="TrG5h" value="arg" />
+                    <node concept="3Tqbb2" id="hC" role="1tU5fm">
+                      <ref role="ehGHo" to="lur:uLQNrGW9LE" resolve="TestArgument" />
+                      <node concept="cd27G" id="hF" role="lGtFl">
+                        <node concept="3u3nmq" id="hG" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157664" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="hD" role="33vP2m">
+                      <node concept="1PxgMI" id="hH" role="2Oq$k0">
+                        <property role="1BlNFB" value="true" />
+                        <node concept="chp4Y" id="hK" role="3oSUPX">
+                          <ref role="cht4Q" to="lur:uLQNrGWd1r" resolve="ArgumentReference" />
+                          <node concept="cd27G" id="hN" role="lGtFl">
+                            <node concept="3u3nmq" id="hO" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157667" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="hL" role="1m5AlR">
+                          <ref role="3cqZAo" node="h4" resolve="childNode" />
+                          <node concept="cd27G" id="hP" role="lGtFl">
+                            <node concept="3u3nmq" id="hQ" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157668" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="cd27G" id="hM" role="lGtFl">
+                          <node concept="3u3nmq" id="hR" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157666" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="hI" role="2OqNvi">
+                        <ref role="3Tt5mk" to="lur:uLQNrGWd1s" resolve="arg" />
+                        <node concept="cd27G" id="hS" role="lGtFl">
+                          <node concept="3u3nmq" id="hT" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157669" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="cd27G" id="hJ" role="lGtFl">
+                        <node concept="3u3nmq" id="hU" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157665" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="cd27G" id="hE" role="lGtFl">
+                      <node concept="3u3nmq" id="hV" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157663" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="cd27G" id="hB" role="lGtFl">
+                    <node concept="3u3nmq" id="hW" role="cd27D">
+                      <property role="3u3nmv" value="6346338635721157662" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs6" id="h$" role="3cqZAp">
+                  <node concept="22lmx$" id="hX" role="3cqZAk">
+                    <node concept="2OqwBi" id="hZ" role="3uHU7B">
+                      <node concept="37vLTw" id="i2" role="2Oq$k0">
+                        <ref role="3cqZAo" node="hA" resolve="arg" />
+                        <node concept="cd27G" id="i5" role="lGtFl">
+                          <node concept="3u3nmq" id="i6" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157673" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3w_OXm" id="i3" role="2OqNvi">
+                        <node concept="cd27G" id="i7" role="lGtFl">
+                          <node concept="3u3nmq" id="i8" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157674" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="cd27G" id="i4" role="lGtFl">
+                        <node concept="3u3nmq" id="i9" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157672" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="i0" role="3uHU7w">
+                      <node concept="2OqwBi" id="ia" role="2Oq$k0">
+                        <node concept="37vLTw" id="id" role="2Oq$k0">
+                          <ref role="3cqZAo" node="hA" resolve="arg" />
+                          <node concept="cd27G" id="ig" role="lGtFl">
+                            <node concept="3u3nmq" id="ih" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157677" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2yIwOk" id="ie" role="2OqNvi">
+                          <node concept="cd27G" id="ii" role="lGtFl">
+                            <node concept="3u3nmq" id="ij" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157678" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="cd27G" id="if" role="lGtFl">
+                          <node concept="3u3nmq" id="ik" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157676" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3O6GUB" id="ib" role="2OqNvi">
+                        <node concept="chp4Y" id="il" role="3QVz_e">
+                          <ref role="cht4Q" to="lur:uLQNrGW9LI" resolve="ModelArgument" />
+                          <node concept="cd27G" id="in" role="lGtFl">
+                            <node concept="3u3nmq" id="io" role="cd27D">
+                              <property role="3u3nmv" value="6346338635721157680" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="cd27G" id="im" role="lGtFl">
+                          <node concept="3u3nmq" id="ip" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157679" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="cd27G" id="ic" role="lGtFl">
+                        <node concept="3u3nmq" id="iq" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157675" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="cd27G" id="i1" role="lGtFl">
+                      <node concept="3u3nmq" id="ir" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157671" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="cd27G" id="hY" role="lGtFl">
+                    <node concept="3u3nmq" id="is" role="cd27D">
+                      <property role="3u3nmv" value="6346338635721157670" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="cd27G" id="h_" role="lGtFl">
+                  <node concept="3u3nmq" id="it" role="cd27D">
+                    <property role="3u3nmv" value="6346338635721189778" />
+                  </node>
+                </node>
+              </node>
+              <node concept="22lmx$" id="hx" role="3clFbw">
+                <node concept="22lmx$" id="iu" role="3uHU7B">
+                  <node concept="2OqwBi" id="ix" role="3uHU7B">
+                    <node concept="37vLTw" id="i$" role="2Oq$k0">
+                      <ref role="3cqZAo" node="h6" resolve="link" />
+                      <node concept="cd27G" id="iB" role="lGtFl">
+                        <node concept="3u3nmq" id="iC" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157697" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="i_" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                      <node concept="359W_D" id="iD" role="37wK5m">
+                        <ref role="359W_E" to="lur:5wiIlPAvMBp" resolve="TransformationMatchManyAssertion" />
+                        <ref role="359W_F" to="lur:5wiIlPAvMBr" resolve="inputModel" />
+                        <node concept="cd27G" id="iF" role="lGtFl">
+                          <node concept="3u3nmq" id="iG" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721157699" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="cd27G" id="iE" role="lGtFl">
+                        <node concept="3u3nmq" id="iH" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157698" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="cd27G" id="iA" role="lGtFl">
+                      <node concept="3u3nmq" id="iI" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157696" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="iy" role="3uHU7w">
+                    <node concept="37vLTw" id="iJ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="h6" resolve="link" />
+                      <node concept="cd27G" id="iM" role="lGtFl">
+                        <node concept="3u3nmq" id="iN" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721199119" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="iK" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                      <node concept="359W_D" id="iO" role="37wK5m">
+                        <ref role="359W_E" to="lur:5wiIlPAvMBp" resolve="TransformationMatchManyAssertion" />
+                        <ref role="359W_F" to="lur:5wiIlPAvMBs" resolve="referenceModels" />
+                        <node concept="cd27G" id="iQ" role="lGtFl">
+                          <node concept="3u3nmq" id="iR" role="cd27D">
+                            <property role="3u3nmv" value="6346338635721199121" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="cd27G" id="iP" role="lGtFl">
+                        <node concept="3u3nmq" id="iS" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721199120" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="cd27G" id="iL" role="lGtFl">
+                      <node concept="3u3nmq" id="iT" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721199118" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="cd27G" id="iz" role="lGtFl">
+                    <node concept="3u3nmq" id="iU" role="cd27D">
+                      <property role="3u3nmv" value="6346338635721214710" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="iv" role="3uHU7w">
+                  <node concept="37vLTw" id="iV" role="2Oq$k0">
+                    <ref role="3cqZAo" node="h6" resolve="link" />
+                    <node concept="cd27G" id="iY" role="lGtFl">
+                      <node concept="3u3nmq" id="iZ" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157683" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="iW" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                    <node concept="359W_D" id="j0" role="37wK5m">
+                      <ref role="359W_E" to="lur:uLQNrGWd1n" resolve="TransformationMatchAssertion" />
+                      <ref role="359W_F" to="lur:uLQNrGWd1z" resolve="transformationPlan" />
+                      <node concept="cd27G" id="j2" role="lGtFl">
+                        <node concept="3u3nmq" id="j3" role="cd27D">
+                          <property role="3u3nmv" value="6346338635721157685" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="cd27G" id="j1" role="lGtFl">
+                      <node concept="3u3nmq" id="j4" role="cd27D">
+                        <property role="3u3nmv" value="6346338635721157684" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="cd27G" id="iX" role="lGtFl">
+                    <node concept="3u3nmq" id="j5" role="cd27D">
+                      <property role="3u3nmv" value="6346338635721157682" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="cd27G" id="iw" role="lGtFl">
+                  <node concept="3u3nmq" id="j6" role="cd27D">
+                    <property role="3u3nmv" value="6346338635721193931" />
+                  </node>
+                </node>
+              </node>
+              <node concept="cd27G" id="hy" role="lGtFl">
+                <node concept="3u3nmq" id="j7" role="cd27D">
+                  <property role="3u3nmv" value="6346338635721189776" />
+                </node>
+              </node>
+            </node>
+            <node concept="cd27G" id="hv" role="lGtFl">
+              <node concept="3u3nmq" id="j8" role="cd27D">
+                <property role="3u3nmv" value="6346338635721157661" />
+              </node>
+            </node>
+          </node>
+          <node concept="1Wc70l" id="hs" role="3clFbw">
+            <node concept="3y3z36" id="j9" role="3uHU7B">
+              <node concept="10Nm6u" id="jc" role="3uHU7w">
+                <node concept="cd27G" id="jf" role="lGtFl">
+                  <node concept="3u3nmq" id="jg" role="cd27D">
+                    <property role="3u3nmv" value="6346338635721157690" />
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTw" id="jd" role="3uHU7B">
+                <ref role="3cqZAo" node="h4" resolve="childNode" />
+                <node concept="cd27G" id="jh" role="lGtFl">
+                  <node concept="3u3nmq" id="ji" role="cd27D">
+                    <property role="3u3nmv" value="6346338635721157691" />
+                  </node>
+                </node>
+              </node>
+              <node concept="cd27G" id="je" role="lGtFl">
+                <node concept="3u3nmq" id="jj" role="cd27D">
+                  <property role="3u3nmv" value="6346338635721157689" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="ja" role="3uHU7w">
+              <node concept="37vLTw" id="jk" role="2Oq$k0">
+                <ref role="3cqZAo" node="h5" resolve="childConcept" />
+                <node concept="cd27G" id="jn" role="lGtFl">
+                  <node concept="3u3nmq" id="jo" role="cd27D">
+                    <property role="3u3nmv" value="6346338635721157693" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3O6GUB" id="jl" role="2OqNvi">
+                <node concept="chp4Y" id="jp" role="3QVz_e">
+                  <ref role="cht4Q" to="lur:uLQNrGWd1r" resolve="ArgumentReference" />
+                  <node concept="cd27G" id="jr" role="lGtFl">
+                    <node concept="3u3nmq" id="js" role="cd27D">
+                      <property role="3u3nmv" value="6346338635721157695" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="cd27G" id="jq" role="lGtFl">
+                  <node concept="3u3nmq" id="jt" role="cd27D">
+                    <property role="3u3nmv" value="6346338635721157694" />
+                  </node>
+                </node>
+              </node>
+              <node concept="cd27G" id="jm" role="lGtFl">
+                <node concept="3u3nmq" id="ju" role="cd27D">
+                  <property role="3u3nmv" value="6346338635721157692" />
+                </node>
+              </node>
+            </node>
+            <node concept="cd27G" id="jb" role="lGtFl">
+              <node concept="3u3nmq" id="jv" role="cd27D">
+                <property role="3u3nmv" value="6346338635721157688" />
+              </node>
+            </node>
+          </node>
+          <node concept="cd27G" id="ht" role="lGtFl">
+            <node concept="3u3nmq" id="jw" role="cd27D">
+              <property role="3u3nmv" value="6346338635721157660" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="hf" role="3cqZAp">
+          <node concept="3clFbT" id="jx" role="3cqZAk">
+            <property role="3clFbU" value="true" />
+            <node concept="cd27G" id="jz" role="lGtFl">
+              <node concept="3u3nmq" id="j$" role="cd27D">
+                <property role="3u3nmv" value="6346338635721157705" />
+              </node>
+            </node>
+          </node>
+          <node concept="cd27G" id="jy" role="lGtFl">
+            <node concept="3u3nmq" id="j_" role="cd27D">
+              <property role="3u3nmv" value="6346338635721157704" />
+            </node>
+          </node>
+        </node>
+        <node concept="cd27G" id="hg" role="lGtFl">
+          <node concept="3u3nmq" id="jA" role="cd27D">
             <property role="3u3nmv" value="6346338635721157192" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="aF" role="3clF46">
+      <node concept="37vLTG" id="h3" role="3clF46">
         <property role="TrG5h" value="node" />
-        <node concept="3uibUv" id="df" role="1tU5fm">
+        <node concept="3uibUv" id="jB" role="1tU5fm">
           <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-          <node concept="cd27G" id="dh" role="lGtFl">
-            <node concept="3u3nmq" id="di" role="cd27D">
+          <node concept="cd27G" id="jD" role="lGtFl">
+            <node concept="3u3nmq" id="jE" role="cd27D">
               <property role="3u3nmv" value="6346338635721157190" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="dg" role="lGtFl">
-          <node concept="3u3nmq" id="dj" role="cd27D">
+        <node concept="cd27G" id="jC" role="lGtFl">
+          <node concept="3u3nmq" id="jF" role="cd27D">
             <property role="3u3nmv" value="6346338635721157190" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="aG" role="3clF46">
+      <node concept="37vLTG" id="h4" role="3clF46">
         <property role="TrG5h" value="childNode" />
-        <node concept="3uibUv" id="dk" role="1tU5fm">
+        <node concept="3uibUv" id="jG" role="1tU5fm">
           <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-          <node concept="cd27G" id="dm" role="lGtFl">
-            <node concept="3u3nmq" id="dn" role="cd27D">
+          <node concept="cd27G" id="jI" role="lGtFl">
+            <node concept="3u3nmq" id="jJ" role="cd27D">
               <property role="3u3nmv" value="6346338635721157190" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="dl" role="lGtFl">
-          <node concept="3u3nmq" id="do" role="cd27D">
+        <node concept="cd27G" id="jH" role="lGtFl">
+          <node concept="3u3nmq" id="jK" role="cd27D">
             <property role="3u3nmv" value="6346338635721157190" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="aH" role="3clF46">
+      <node concept="37vLTG" id="h5" role="3clF46">
         <property role="TrG5h" value="childConcept" />
-        <node concept="3uibUv" id="dp" role="1tU5fm">
+        <node concept="3uibUv" id="jL" role="1tU5fm">
           <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
-          <node concept="cd27G" id="dr" role="lGtFl">
-            <node concept="3u3nmq" id="ds" role="cd27D">
+          <node concept="cd27G" id="jN" role="lGtFl">
+            <node concept="3u3nmq" id="jO" role="cd27D">
               <property role="3u3nmv" value="6346338635721157190" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="dq" role="lGtFl">
-          <node concept="3u3nmq" id="dt" role="cd27D">
+        <node concept="cd27G" id="jM" role="lGtFl">
+          <node concept="3u3nmq" id="jP" role="cd27D">
             <property role="3u3nmv" value="6346338635721157190" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="aI" role="3clF46">
+      <node concept="37vLTG" id="h6" role="3clF46">
         <property role="TrG5h" value="link" />
-        <node concept="3uibUv" id="du" role="1tU5fm">
+        <node concept="3uibUv" id="jQ" role="1tU5fm">
           <ref role="3uigEE" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
-          <node concept="cd27G" id="dw" role="lGtFl">
-            <node concept="3u3nmq" id="dx" role="cd27D">
+          <node concept="cd27G" id="jS" role="lGtFl">
+            <node concept="3u3nmq" id="jT" role="cd27D">
               <property role="3u3nmv" value="6346338635721157190" />
             </node>
           </node>
         </node>
-        <node concept="cd27G" id="dv" role="lGtFl">
-          <node concept="3u3nmq" id="dy" role="cd27D">
+        <node concept="cd27G" id="jR" role="lGtFl">
+          <node concept="3u3nmq" id="jU" role="cd27D">
             <property role="3u3nmv" value="6346338635721157190" />
           </node>
         </node>
       </node>
-      <node concept="cd27G" id="aJ" role="lGtFl">
-        <node concept="3u3nmq" id="dz" role="cd27D">
+      <node concept="cd27G" id="h7" role="lGtFl">
+        <node concept="3u3nmq" id="jV" role="cd27D">
           <property role="3u3nmv" value="6346338635721157190" />
         </node>
       </node>
     </node>
-    <node concept="cd27G" id="7b" role="lGtFl">
-      <node concept="3u3nmq" id="d$" role="cd27D">
+    <node concept="cd27G" id="dz" role="lGtFl">
+      <node concept="3u3nmq" id="jW" role="cd27D">
         <property role="3u3nmv" value="6346338635721157190" />
       </node>
     </node>
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/trace.info b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/trace.info
index be1b26861c49..716556002f15 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/trace.info
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/trace.info
@@ -13,7 +13,7 @@
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1070475587102:jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" />
   <root>
     <file name="ConstraintsAspectDescriptor.java">
-      <unit at="13,0,31,0" name="jetbrains.mps.lang.test.generator.constraints.ConstraintsAspectDescriptor" />
+      <unit at="13,0,33,0" name="jetbrains.mps.lang.test.generator.constraints.ConstraintsAspectDescriptor" />
     </file>
   </root>
   <root nodeRef="r:d9fe9834-daa9-425b-9f8a-1debaf95f372(jetbrains.mps.lang.test.generator.constraints)/6346338635721157190">
@@ -65,6 +65,55 @@
       <unit id="6346338635721157190" at="20,0,53,0" name="jetbrains.mps.lang.test.generator.constraints.TransformationMatchManyAssertion_Constraints" />
     </file>
   </root>
+  <root nodeRef="r:d9fe9834-daa9-425b-9f8a-1debaf95f372(jetbrains.mps.lang.test.generator.constraints)/7812943990232402911">
+    <file name="TransformationMatchCustomConditions_Constraints.java">
+      <node id="7812943990232402911" at="21,60,22,187" concept="10" />
+      <node id="7812943990232402911" at="29,128,30,133" concept="4" />
+      <node id="7812943990232402911" at="30,133,31,0" concept="7" />
+      <node id="7812943990232402911" at="32,55,33,72" concept="1" />
+      <node id="7812943990232402911" at="34,9,35,0" concept="7" />
+      <node id="7812943990232402911" at="35,0,36,22" concept="5" />
+      <node id="7812943990232403405" at="40,128,41,82" concept="6" />
+      <node id="7812943990232403411" at="43,321,44,361" concept="4" />
+      <node id="7812943990232403419" at="44,361,45,276" concept="5" />
+      <node id="7812943990232403444" at="46,7,47,22" concept="6" />
+      <node id="7812943990232403454" at="48,5,49,16" concept="5" />
+      <node id="7812943990232402911" at="51,0,52,0" concept="8" trace="canBeParentBreakingPoint" />
+      <node id="7812943990232402911" at="21,0,24,0" concept="0" trace="TransformationMatchCustomConditions_Constraints#()V" />
+      <node id="7812943990232402911" at="31,0,34,9" concept="2" />
+      <node id="7812943990232403409" at="42,260,46,7" concept="2" />
+      <node id="7812943990232403407" at="41,82,48,5" concept="2" />
+      <node id="7812943990232402911" at="28,0,38,0" concept="3" trace="invoke#(Ljetbrains/mps/smodel/runtime/ConstraintContext_CanBeParent;Ljetbrains/mps/smodel/runtime/CheckingNodeContext;)Ljava/lang/Boolean;" />
+      <node id="7812943990232402911" at="40,0,51,0" concept="9" trace="staticCanBeAParent#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SAbstractConcept;Lorg/jetbrains/mps/openapi/language/SContainmentLink;)Z" />
+      <node id="7812943990232402911" at="26,105,38,6" concept="5" />
+      <node id="7812943990232402911" at="25,0,40,0" concept="3" trace="calculateCanBeParentConstraint#()Ljetbrains/mps/smodel/runtime/ConstraintFunction;" />
+      <scope id="7812943990232402911" at="21,60,22,187" />
+      <scope id="7812943990232402911" at="32,55,33,72" />
+      <scope id="7812943990232403410" at="43,321,45,276">
+        <var name="arg" id="7812943990232403412" />
+      </scope>
+      <scope id="7812943990232402911" at="21,0,24,0" />
+      <scope id="7812943990232403408" at="42,260,47,22" />
+      <scope id="7812943990232402911" at="29,128,36,22">
+        <var name="result" id="7812943990232402911" />
+      </scope>
+      <scope id="7812943990232402939" at="40,128,49,16" />
+      <scope id="7812943990232402911" at="28,0,38,0">
+        <var name="checkingNodeContext" id="7812943990232402911" />
+        <var name="context" id="7812943990232402911" />
+      </scope>
+      <scope id="7812943990232402911" at="40,0,51,0">
+        <var name="childConcept" id="7812943990232402911" />
+        <var name="childNode" id="7812943990232402911" />
+        <var name="link" id="7812943990232402911" />
+        <var name="node" id="7812943990232402911" />
+      </scope>
+      <scope id="7812943990232402911" at="26,105,38,6" />
+      <scope id="7812943990232402911" at="25,0,40,0" />
+      <unit id="7812943990232402911" at="27,15,38,5" name="jetbrains.mps.lang.test.generator.constraints.TransformationMatchCustomConditions_Constraints$1" />
+      <unit id="7812943990232402911" at="20,0,53,0" name="jetbrains.mps.lang.test.generator.constraints.TransformationMatchCustomConditions_Constraints" />
+    </file>
+  </root>
   <root nodeRef="r:d9fe9834-daa9-425b-9f8a-1debaf95f372(jetbrains.mps.lang.test.generator.constraints)/7985317431306261563">
     <file name="TransformationMatchAssertion_Constraints.java">
       <node id="7985317431306261563" at="21,53,22,179" concept="10" />
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/EditorAspectDescriptorImpl.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/EditorAspectDescriptorImpl.java
index 474970354ec0..385cd036e064 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/EditorAspectDescriptorImpl.java
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/EditorAspectDescriptorImpl.java
@@ -27,6 +27,8 @@ public Collection<ConceptEditor> getDeclaredEditors(SAbstractConcept concept) {
       case 3:
         return Collections.<ConceptEditor>singletonList(new TransformationMatchAssertion_Editor());
       case 4:
+        return Collections.<ConceptEditor>singletonList(new TransformationMatchCustomConditions_Editor());
+      case 5:
         return Collections.<ConceptEditor>singletonList(new TransformationMatchManyAssertion_Editor());
       default:
     }
@@ -46,6 +48,6 @@ public Collection<SubstituteMenu> getDeclaredDefaultSubstituteMenus(SAbstractCon
     return Collections.<SubstituteMenu>emptyList();
   }
 
-  private static final ConceptSwitchIndex conceptIndex = new ConceptSwitchIndexBuilder().put(MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf09c6eL), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L)).seal();
+  private static final ConceptSwitchIndex conceptIndex = new ConceptSwitchIndexBuilder().put(MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf09c6eL), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L)).seal();
   private static final ConceptSwitchIndex conceptIndex1 = new ConceptSwitchIndexBuilder().put(MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL)).seal();
 }
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/TransformationMatchCustomConditions_Editor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/TransformationMatchCustomConditions_Editor.java
new file mode 100644
index 000000000000..da7d288c91db
--- /dev/null
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/TransformationMatchCustomConditions_Editor.java
@@ -0,0 +1,14 @@
+package jetbrains.mps.lang.test.generator.editor;
+
+/*Generated by MPS */
+
+import jetbrains.mps.nodeEditor.DefaultNodeEditor;
+import jetbrains.mps.openapi.editor.cells.EditorCell;
+import jetbrains.mps.openapi.editor.EditorContext;
+import org.jetbrains.mps.openapi.model.SNode;
+
+public class TransformationMatchCustomConditions_Editor extends DefaultNodeEditor {
+  public EditorCell createEditorCell(EditorContext editorContext, SNode node) {
+    return new TransformationMatchCustomConditions_EditorBuilder_a(editorContext, node).createCell();
+  }
+}
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/TransformationMatchCustomConditions_EditorBuilder_a.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/TransformationMatchCustomConditions_EditorBuilder_a.java
new file mode 100644
index 000000000000..1bb6ffcfa7db
--- /dev/null
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/TransformationMatchCustomConditions_EditorBuilder_a.java
@@ -0,0 +1,238 @@
+package jetbrains.mps.lang.test.generator.editor;
+
+/*Generated by MPS */
+
+import jetbrains.mps.editor.runtime.descriptor.AbstractEditorBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.openapi.editor.EditorContext;
+import jetbrains.mps.openapi.editor.cells.EditorCell;
+import jetbrains.mps.nodeEditor.cells.EditorCell_Collection;
+import jetbrains.mps.nodeEditor.cellLayout.CellLayout_Horizontal;
+import jetbrains.mps.nodeEditor.cells.EditorCell_Constant;
+import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import org.jetbrains.mps.openapi.language.SContainmentLink;
+import jetbrains.mps.openapi.editor.cells.CellActionType;
+import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_DeleteSmart;
+import jetbrains.mps.openapi.editor.cells.DefaultSubstituteInfo;
+import jetbrains.mps.nodeEditor.cellMenu.SEmptyContainmentSubstituteInfo;
+import jetbrains.mps.nodeEditor.cellMenu.SChildSubstituteInfo;
+import jetbrains.mps.openapi.editor.menus.transformation.SNodeLocation;
+
+/*package*/ class TransformationMatchCustomConditions_EditorBuilder_a extends AbstractEditorBuilder {
+  @NotNull
+  private SNode myNode;
+
+  public TransformationMatchCustomConditions_EditorBuilder_a(@NotNull EditorContext context, @NotNull SNode node) {
+    super(context);
+    myNode = node;
+  }
+
+  @NotNull
+  @Override
+  public SNode getNode() {
+    return myNode;
+  }
+
+  /*package*/ EditorCell createCell() {
+    return createCollection_0();
+  }
+
+  private EditorCell createCollection_0() {
+    EditorCell_Collection editorCell = new EditorCell_Collection(getEditorContext(), myNode, new CellLayout_Horizontal());
+    editorCell.setCellId("Collection_moducj_a");
+    editorCell.setBig(true);
+    setCellContext(editorCell);
+    editorCell.addEditorCell(createConstant_0());
+    editorCell.addEditorCell(createRefNode_0());
+    editorCell.addEditorCell(createConstant_1());
+    editorCell.addEditorCell(createRefNode_1());
+    editorCell.addEditorCell(createConstant_2());
+    editorCell.addEditorCell(createRefNode_2());
+    return editorCell;
+  }
+  private EditorCell createConstant_0() {
+    EditorCell_Constant editorCell = new EditorCell_Constant(getEditorContext(), myNode, "transform model ");
+    editorCell.setCellId("Constant_moducj_a0");
+    editorCell.setDefaultText("");
+    return editorCell;
+  }
+  private EditorCell createRefNode_0() {
+    SingleRoleCellProvider provider = new TransformationMatchCustomConditions_EditorBuilder_a.inputModelSingleRoleHandler_moducj_b0(myNode, MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346acL, "inputModel"), getEditorContext());
+    return provider.createCell();
+  }
+  private static class inputModelSingleRoleHandler_moducj_b0 extends SingleRoleCellProvider {
+    @NotNull
+    private SNode myNode;
+
+    public inputModelSingleRoleHandler_moducj_b0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) {
+      super(containmentLink, context);
+      myNode = ownerNode;
+    }
+
+    @Override
+    @NotNull
+    public SNode getNode() {
+      return myNode;
+    }
+
+    protected EditorCell createChildCell(SNode child) {
+      EditorCell editorCell = getUpdateSession().updateChildNodeCell(child);
+      editorCell.setAction(CellActionType.DELETE, new CellAction_DeleteSmart(getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346acL, "inputModel"), child));
+      editorCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteSmart(getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346acL, "inputModel"), child));
+      installCellInfo(child, editorCell, false);
+      return editorCell;
+    }
+
+
+
+    private void installCellInfo(SNode child, EditorCell editorCell, boolean isEmpty) {
+      if (editorCell.getSubstituteInfo() == null || editorCell.getSubstituteInfo() instanceof DefaultSubstituteInfo) {
+        editorCell.setSubstituteInfo((isEmpty ? new SEmptyContainmentSubstituteInfo(editorCell) : new SChildSubstituteInfo(editorCell)));
+      }
+      if (editorCell.getSRole() == null) {
+        editorCell.setSRole(MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346acL, "inputModel"));
+      }
+    }
+    @Override
+    protected EditorCell createEmptyCell() {
+      getCellFactory().pushCellContext();
+      getCellFactory().setNodeLocation(new SNodeLocation.FromParentAndLink(getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346acL, "inputModel")));
+      try {
+        EditorCell editorCell = super.createEmptyCell();
+        editorCell.setCellId("empty_inputModel");
+        installCellInfo(null, editorCell, true);
+        setCellContext(editorCell);
+        return editorCell;
+      } finally {
+        getCellFactory().popCellContext();
+      }
+    }
+    protected String getNoTargetText() {
+      return "<no inputModel>";
+    }
+  }
+  private EditorCell createConstant_1() {
+    EditorCell_Constant editorCell = new EditorCell_Constant(getEditorContext(), myNode, " with plan ");
+    editorCell.setCellId("Constant_moducj_c0");
+    editorCell.setDefaultText("");
+    return editorCell;
+  }
+  private EditorCell createRefNode_1() {
+    SingleRoleCellProvider provider = new TransformationMatchCustomConditions_EditorBuilder_a.transformationPlanSingleRoleHandler_moducj_d0(myNode, MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan"), getEditorContext());
+    return provider.createCell();
+  }
+  private static class transformationPlanSingleRoleHandler_moducj_d0 extends SingleRoleCellProvider {
+    @NotNull
+    private SNode myNode;
+
+    public transformationPlanSingleRoleHandler_moducj_d0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) {
+      super(containmentLink, context);
+      myNode = ownerNode;
+    }
+
+    @Override
+    @NotNull
+    public SNode getNode() {
+      return myNode;
+    }
+
+    protected EditorCell createChildCell(SNode child) {
+      EditorCell editorCell = getUpdateSession().updateChildNodeCell(child);
+      editorCell.setAction(CellActionType.DELETE, new CellAction_DeleteSmart(getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan"), child));
+      editorCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteSmart(getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan"), child));
+      installCellInfo(child, editorCell, false);
+      return editorCell;
+    }
+
+
+
+    private void installCellInfo(SNode child, EditorCell editorCell, boolean isEmpty) {
+      if (editorCell.getSubstituteInfo() == null || editorCell.getSubstituteInfo() instanceof DefaultSubstituteInfo) {
+        editorCell.setSubstituteInfo((isEmpty ? new SEmptyContainmentSubstituteInfo(editorCell) : new SChildSubstituteInfo(editorCell)));
+      }
+      if (editorCell.getSRole() == null) {
+        editorCell.setSRole(MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan"));
+      }
+    }
+    @Override
+    protected EditorCell createEmptyCell() {
+      getCellFactory().pushCellContext();
+      getCellFactory().setNodeLocation(new SNodeLocation.FromParentAndLink(getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan")));
+      try {
+        EditorCell editorCell = super.createEmptyCell();
+        editorCell.setCellId("empty_transformationPlan");
+        installCellInfo(null, editorCell, true);
+        setCellContext(editorCell);
+        return editorCell;
+      } finally {
+        getCellFactory().popCellContext();
+      }
+    }
+    protected String getNoTargetText() {
+      return "<no transformationPlan>";
+    }
+  }
+  private EditorCell createConstant_2() {
+    EditorCell_Constant editorCell = new EditorCell_Constant(getEditorContext(), myNode, "and match ");
+    editorCell.setCellId("Constant_moducj_e0");
+    editorCell.setDefaultText("");
+    return editorCell;
+  }
+  private EditorCell createRefNode_2() {
+    SingleRoleCellProvider provider = new TransformationMatchCustomConditions_EditorBuilder_a.assertionsSingleRoleHandler_moducj_f0(myNode, MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d36ef9L, "assertions"), getEditorContext());
+    return provider.createCell();
+  }
+  private static class assertionsSingleRoleHandler_moducj_f0 extends SingleRoleCellProvider {
+    @NotNull
+    private SNode myNode;
+
+    public assertionsSingleRoleHandler_moducj_f0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) {
+      super(containmentLink, context);
+      myNode = ownerNode;
+    }
+
+    @Override
+    @NotNull
+    public SNode getNode() {
+      return myNode;
+    }
+
+    protected EditorCell createChildCell(SNode child) {
+      EditorCell editorCell = getUpdateSession().updateChildNodeCell(child);
+      editorCell.setAction(CellActionType.DELETE, new CellAction_DeleteSmart(getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d36ef9L, "assertions"), child));
+      editorCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteSmart(getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d36ef9L, "assertions"), child));
+      installCellInfo(child, editorCell, false);
+      return editorCell;
+    }
+
+
+
+    private void installCellInfo(SNode child, EditorCell editorCell, boolean isEmpty) {
+      if (editorCell.getSubstituteInfo() == null || editorCell.getSubstituteInfo() instanceof DefaultSubstituteInfo) {
+        editorCell.setSubstituteInfo((isEmpty ? new SEmptyContainmentSubstituteInfo(editorCell) : new SChildSubstituteInfo(editorCell)));
+      }
+      if (editorCell.getSRole() == null) {
+        editorCell.setSRole(MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d36ef9L, "assertions"));
+      }
+    }
+    @Override
+    protected EditorCell createEmptyCell() {
+      getCellFactory().pushCellContext();
+      getCellFactory().setNodeLocation(new SNodeLocation.FromParentAndLink(getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d36ef9L, "assertions")));
+      try {
+        EditorCell editorCell = super.createEmptyCell();
+        editorCell.setCellId("empty_assertions");
+        installCellInfo(null, editorCell, true);
+        setCellContext(editorCell);
+        return editorCell;
+      } finally {
+        getCellFactory().popCellContext();
+      }
+    }
+    protected String getNoTargetText() {
+      return "<no assertions>";
+    }
+  }
+}
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/trace.info b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/trace.info
index 4faa64461726..d1e805bd93bb 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/trace.info
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/trace.info
@@ -17,7 +17,7 @@
       <unit at="24,0,87,0" name="jetbrains.mps.lang.test.generator.editor.ArgumentReference_SubstituteMenu" />
     </file>
     <file name="EditorAspectDescriptorImpl.java">
-      <unit at="16,0,52,0" name="jetbrains.mps.lang.test.generator.editor.EditorAspectDescriptorImpl" />
+      <unit at="16,0,54,0" name="jetbrains.mps.lang.test.generator.editor.EditorAspectDescriptorImpl" />
     </file>
   </root>
   <root nodeRef="r:b1fae8f3-e29e-439c-9379-32f038b5d44d(jetbrains.mps.lang.test.generator.editor)/6346338635721157111">
@@ -330,6 +330,282 @@
       <unit id="6346338635721157111" at="32,0,266,0" name="jetbrains.mps.lang.test.generator.editor.TransformationMatchManyAssertion_EditorBuilder_a" />
     </file>
   </root>
+  <root nodeRef="r:b1fae8f3-e29e-439c-9379-32f038b5d44d(jetbrains.mps.lang.test.generator.editor)/7812943990232411879">
+    <file name="TransformationMatchCustomConditions_Editor.java">
+      <node id="7812943990232411879" at="11,79,12,101" concept="6" />
+      <node id="7812943990232411879" at="11,0,14,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <scope id="7812943990232411879" at="11,79,12,101" />
+      <scope id="7812943990232411879" at="11,0,14,0">
+        <var name="editorContext" id="7812943990232411879" />
+        <var name="node" id="7812943990232411879" />
+      </scope>
+      <unit id="7812943990232411879" at="10,0,15,0" name="jetbrains.mps.lang.test.generator.editor.TransformationMatchCustomConditions_Editor" />
+    </file>
+    <file name="TransformationMatchCustomConditions_EditorBuilder_a.java">
+      <node id="7812943990232411879" at="27,115,28,19" concept="8" />
+      <node id="7812943990232411879" at="28,19,29,18" concept="1" />
+      <node id="7812943990232411879" at="34,26,35,18" concept="6" />
+      <node id="7812943990232411879" at="38,39,39,32" concept="6" />
+      <node id="7812943990232411879" at="42,43,43,122" concept="5" />
+      <node id="7812943990232411879" at="43,122,44,48" concept="1" />
+      <node id="7812943990232411879" at="44,48,45,28" concept="1" />
+      <node id="7812943990232411879" at="45,28,46,31" concept="1" />
+      <node id="7812943990232411882" at="46,31,47,49" concept="1" />
+      <node id="7812943990232411883" at="47,49,48,48" concept="1" />
+      <node id="7812943990232411885" at="48,48,49,49" concept="1" />
+      <node id="7812943990232411886" at="49,49,50,48" concept="1" />
+      <node id="7812943990232411887" at="50,48,51,49" concept="1" />
+      <node id="7812943990232414822" at="51,49,52,48" concept="1" />
+      <node id="7812943990232411879" at="52,48,53,22" concept="6" />
+      <node id="7812943990232411882" at="55,41,56,109" concept="5" />
+      <node id="7812943990232411882" at="56,109,57,47" concept="1" />
+      <node id="7812943990232411882" at="57,47,58,34" concept="1" />
+      <node id="7812943990232411882" at="58,34,59,22" concept="6" />
+      <node id="7812943990232411879" at="61,40,62,297" concept="5" />
+      <node id="7812943990232411879" at="62,297,63,33" concept="6" />
+      <node id="7812943990232411879" at="69,124,70,38" concept="8" />
+      <node id="7812943990232411879" at="70,38,71,25" concept="1" />
+      <node id="7812943990232411879" at="76,28,77,20" concept="6" />
+      <node id="7812943990232411879" at="80,55,81,76" concept="5" />
+      <node id="7812943990232411879" at="81,76,82,233" concept="1" />
+      <node id="7812943990232411879" at="82,233,83,236" concept="1" />
+      <node id="7812943990232411879" at="83,236,84,48" concept="1" />
+      <node id="7812943990232411879" at="84,48,85,24" concept="6" />
+      <node id="7812943990232411879" at="91,118,92,137" concept="1" />
+      <node id="7812943990232411879" at="94,42,95,165" concept="1" />
+      <node id="7812943990232411879" at="99,44,100,41" concept="1" />
+      <node id="7812943990232411879" at="100,41,101,224" concept="1" />
+      <node id="7812943990232411879" at="102,11,103,56" concept="5" />
+      <node id="7812943990232411879" at="103,56,104,49" concept="1" />
+      <node id="7812943990232411879" at="104,49,105,48" concept="1" />
+      <node id="7812943990232411879" at="105,48,106,35" concept="1" />
+      <node id="7812943990232411879" at="106,35,107,26" concept="6" />
+      <node id="7812943990232411879" at="108,17,109,42" concept="1" />
+      <node id="7812943990232411879" at="112,40,113,31" concept="6" />
+      <node id="7812943990232411885" at="116,41,117,104" concept="5" />
+      <node id="7812943990232411885" at="117,104,118,47" concept="1" />
+      <node id="7812943990232411885" at="118,47,119,34" concept="1" />
+      <node id="7812943990232411885" at="119,34,120,22" concept="6" />
+      <node id="7812943990232411879" at="122,40,123,313" concept="5" />
+      <node id="7812943990232411879" at="123,313,124,33" concept="6" />
+      <node id="7812943990232411879" at="130,132,131,38" concept="8" />
+      <node id="7812943990232411879" at="131,38,132,25" concept="1" />
+      <node id="7812943990232411879" at="137,28,138,20" concept="6" />
+      <node id="7812943990232411879" at="141,55,142,76" concept="5" />
+      <node id="7812943990232411879" at="142,76,143,241" concept="1" />
+      <node id="7812943990232411879" at="143,241,144,244" concept="1" />
+      <node id="7812943990232411879" at="144,244,145,48" concept="1" />
+      <node id="7812943990232411879" at="145,48,146,24" concept="6" />
+      <node id="7812943990232411879" at="152,118,153,137" concept="1" />
+      <node id="7812943990232411879" at="155,42,156,173" concept="1" />
+      <node id="7812943990232411879" at="160,44,161,41" concept="1" />
+      <node id="7812943990232411879" at="161,41,162,232" concept="1" />
+      <node id="7812943990232411879" at="163,11,164,56" concept="5" />
+      <node id="7812943990232411879" at="164,56,165,57" concept="1" />
+      <node id="7812943990232411879" at="165,57,166,48" concept="1" />
+      <node id="7812943990232411879" at="166,48,167,35" concept="1" />
+      <node id="7812943990232411879" at="167,35,168,26" concept="6" />
+      <node id="7812943990232411879" at="169,17,170,42" concept="1" />
+      <node id="7812943990232411879" at="173,40,174,39" concept="6" />
+      <node id="7812943990232411887" at="177,41,178,103" concept="5" />
+      <node id="7812943990232411887" at="178,103,179,47" concept="1" />
+      <node id="7812943990232411887" at="179,47,180,34" concept="1" />
+      <node id="7812943990232411887" at="180,34,181,22" concept="6" />
+      <node id="7812943990232411879" at="183,40,184,297" concept="5" />
+      <node id="7812943990232411879" at="184,297,185,33" concept="6" />
+      <node id="7812943990232411879" at="191,124,192,38" concept="8" />
+      <node id="7812943990232411879" at="192,38,193,25" concept="1" />
+      <node id="7812943990232411879" at="198,28,199,20" concept="6" />
+      <node id="7812943990232411879" at="202,55,203,76" concept="5" />
+      <node id="7812943990232411879" at="203,76,204,233" concept="1" />
+      <node id="7812943990232411879" at="204,233,205,236" concept="1" />
+      <node id="7812943990232411879" at="205,236,206,48" concept="1" />
+      <node id="7812943990232411879" at="206,48,207,24" concept="6" />
+      <node id="7812943990232411879" at="213,118,214,137" concept="1" />
+      <node id="7812943990232411879" at="216,42,217,165" concept="1" />
+      <node id="7812943990232411879" at="221,44,222,41" concept="1" />
+      <node id="7812943990232411879" at="222,41,223,224" concept="1" />
+      <node id="7812943990232411879" at="224,11,225,56" concept="5" />
+      <node id="7812943990232411879" at="225,56,226,49" concept="1" />
+      <node id="7812943990232411879" at="226,49,227,48" concept="1" />
+      <node id="7812943990232411879" at="227,48,228,35" concept="1" />
+      <node id="7812943990232411879" at="228,35,229,26" concept="6" />
+      <node id="7812943990232411879" at="230,17,231,42" concept="1" />
+      <node id="7812943990232411879" at="234,40,235,31" concept="6" />
+      <node id="7812943990232411879" at="24,0,26,0" concept="2" trace="myNode" />
+      <node id="7812943990232411879" at="66,0,68,0" concept="2" trace="myNode" />
+      <node id="7812943990232411879" at="127,0,129,0" concept="2" trace="myNode" />
+      <node id="7812943990232411879" at="188,0,190,0" concept="2" trace="myNode" />
+      <node id="7812943990232411879" at="38,0,41,0" concept="4" trace="createCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="90,87,93,7" concept="3" />
+      <node id="7812943990232411879" at="93,7,96,7" concept="3" />
+      <node id="7812943990232411879" at="112,0,115,0" concept="4" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="7812943990232411879" at="151,87,154,7" concept="3" />
+      <node id="7812943990232411879" at="154,7,157,7" concept="3" />
+      <node id="7812943990232411879" at="173,0,176,0" concept="4" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="7812943990232411879" at="212,87,215,7" concept="3" />
+      <node id="7812943990232411879" at="215,7,218,7" concept="3" />
+      <node id="7812943990232411879" at="234,0,237,0" concept="4" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="7812943990232411879" at="27,0,31,0" concept="0" trace="TransformationMatchCustomConditions_EditorBuilder_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7812943990232411879" at="61,0,65,0" concept="4" trace="createRefNode_0#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="69,0,73,0" concept="0" trace="inputModelSingleRoleHandler_moducj_b0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="7812943990232411879" at="122,0,126,0" concept="4" trace="createRefNode_1#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="130,0,134,0" concept="0" trace="transformationPlanSingleRoleHandler_moducj_d0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="7812943990232411879" at="183,0,187,0" concept="4" trace="createRefNode_2#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="191,0,195,0" concept="0" trace="assertionsSingleRoleHandler_moducj_f0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="7812943990232411879" at="32,0,37,0" concept="4" trace="getNode#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7812943990232411879" at="74,0,79,0" concept="4" trace="getNode#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7812943990232411879" at="135,0,140,0" concept="4" trace="getNode#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7812943990232411879" at="196,0,201,0" concept="4" trace="getNode#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7812943990232411882" at="55,0,61,0" concept="4" trace="createConstant_0#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411885" at="116,0,122,0" concept="4" trace="createConstant_1#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411887" at="177,0,183,0" concept="4" trace="createConstant_2#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="80,0,87,0" concept="4" trace="createChildCell#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="141,0,148,0" concept="4" trace="createChildCell#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="202,0,209,0" concept="4" trace="createChildCell#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="90,0,98,0" concept="4" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;Z)V" />
+      <node id="7812943990232411879" at="151,0,159,0" concept="4" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;Z)V" />
+      <node id="7812943990232411879" at="212,0,220,0" concept="4" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;Z)V" />
+      <node id="7812943990232411879" at="101,224,110,7" concept="9" />
+      <node id="7812943990232411879" at="162,232,171,7" concept="9" />
+      <node id="7812943990232411879" at="223,224,232,7" concept="9" />
+      <node id="7812943990232411879" at="42,0,55,0" concept="4" trace="createCollection_0#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="98,0,112,0" concept="4" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="159,0,173,0" concept="4" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7812943990232411879" at="220,0,234,0" concept="4" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <scope id="7812943990232411879" at="34,26,35,18" />
+      <scope id="7812943990232411879" at="38,39,39,32" />
+      <scope id="7812943990232411879" at="76,28,77,20" />
+      <scope id="7812943990232411879" at="91,118,92,137" />
+      <scope id="7812943990232411879" at="94,42,95,165" />
+      <scope id="7812943990232411879" at="108,17,109,42" />
+      <scope id="7812943990232411879" at="112,40,113,31" />
+      <scope id="7812943990232411879" at="137,28,138,20" />
+      <scope id="7812943990232411879" at="152,118,153,137" />
+      <scope id="7812943990232411879" at="155,42,156,173" />
+      <scope id="7812943990232411879" at="169,17,170,42" />
+      <scope id="7812943990232411879" at="173,40,174,39" />
+      <scope id="7812943990232411879" at="198,28,199,20" />
+      <scope id="7812943990232411879" at="213,118,214,137" />
+      <scope id="7812943990232411879" at="216,42,217,165" />
+      <scope id="7812943990232411879" at="230,17,231,42" />
+      <scope id="7812943990232411879" at="234,40,235,31" />
+      <scope id="7812943990232411879" at="27,115,29,18" />
+      <scope id="7812943990232411879" at="61,40,63,33">
+        <var name="provider" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="69,124,71,25" />
+      <scope id="7812943990232411879" at="122,40,124,33">
+        <var name="provider" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="130,132,132,25" />
+      <scope id="7812943990232411879" at="183,40,185,33">
+        <var name="provider" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="191,124,193,25" />
+      <scope id="7812943990232411879" at="38,0,41,0" />
+      <scope id="7812943990232411879" at="112,0,115,0" />
+      <scope id="7812943990232411879" at="173,0,176,0" />
+      <scope id="7812943990232411879" at="234,0,237,0" />
+      <scope id="7812943990232411879" at="27,0,31,0">
+        <var name="context" id="7812943990232411879" />
+        <var name="node" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411882" at="55,41,59,22">
+        <var name="editorCell" id="7812943990232411882" />
+      </scope>
+      <scope id="7812943990232411879" at="61,0,65,0" />
+      <scope id="7812943990232411879" at="69,0,73,0">
+        <var name="containmentLink" id="7812943990232411879" />
+        <var name="context" id="7812943990232411879" />
+        <var name="ownerNode" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411885" at="116,41,120,22">
+        <var name="editorCell" id="7812943990232411885" />
+      </scope>
+      <scope id="7812943990232411879" at="122,0,126,0" />
+      <scope id="7812943990232411879" at="130,0,134,0">
+        <var name="containmentLink" id="7812943990232411879" />
+        <var name="context" id="7812943990232411879" />
+        <var name="ownerNode" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411887" at="177,41,181,22">
+        <var name="editorCell" id="7812943990232411887" />
+      </scope>
+      <scope id="7812943990232411879" at="183,0,187,0" />
+      <scope id="7812943990232411879" at="191,0,195,0">
+        <var name="containmentLink" id="7812943990232411879" />
+        <var name="context" id="7812943990232411879" />
+        <var name="ownerNode" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="32,0,37,0" />
+      <scope id="7812943990232411879" at="74,0,79,0" />
+      <scope id="7812943990232411879" at="80,55,85,24">
+        <var name="editorCell" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="102,11,107,26">
+        <var name="editorCell" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="135,0,140,0" />
+      <scope id="7812943990232411879" at="141,55,146,24">
+        <var name="editorCell" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="163,11,168,26">
+        <var name="editorCell" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="196,0,201,0" />
+      <scope id="7812943990232411879" at="202,55,207,24">
+        <var name="editorCell" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="224,11,229,26">
+        <var name="editorCell" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411882" at="55,0,61,0" />
+      <scope id="7812943990232411879" at="90,87,96,7" />
+      <scope id="7812943990232411885" at="116,0,122,0" />
+      <scope id="7812943990232411879" at="151,87,157,7" />
+      <scope id="7812943990232411887" at="177,0,183,0" />
+      <scope id="7812943990232411879" at="212,87,218,7" />
+      <scope id="7812943990232411879" at="80,0,87,0">
+        <var name="child" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="141,0,148,0">
+        <var name="child" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="202,0,209,0">
+        <var name="child" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="90,0,98,0">
+        <var name="child" id="7812943990232411879" />
+        <var name="editorCell" id="7812943990232411879" />
+        <var name="isEmpty" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="151,0,159,0">
+        <var name="child" id="7812943990232411879" />
+        <var name="editorCell" id="7812943990232411879" />
+        <var name="isEmpty" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="212,0,220,0">
+        <var name="child" id="7812943990232411879" />
+        <var name="editorCell" id="7812943990232411879" />
+        <var name="isEmpty" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="42,43,53,22">
+        <var name="editorCell" id="7812943990232411879" />
+      </scope>
+      <scope id="7812943990232411879" at="99,44,110,7" />
+      <scope id="7812943990232411879" at="160,44,171,7" />
+      <scope id="7812943990232411879" at="221,44,232,7" />
+      <scope id="7812943990232411879" at="42,0,55,0" />
+      <scope id="7812943990232411879" at="98,0,112,0" />
+      <scope id="7812943990232411879" at="159,0,173,0" />
+      <scope id="7812943990232411879" at="220,0,234,0" />
+      <unit id="7812943990232411879" at="65,0,116,0" name="jetbrains.mps.lang.test.generator.editor.TransformationMatchCustomConditions_EditorBuilder_a$inputModelSingleRoleHandler_moducj_b0" />
+      <unit id="7812943990232411879" at="126,0,177,0" name="jetbrains.mps.lang.test.generator.editor.TransformationMatchCustomConditions_EditorBuilder_a$transformationPlanSingleRoleHandler_moducj_d0" />
+      <unit id="7812943990232411879" at="187,0,238,0" name="jetbrains.mps.lang.test.generator.editor.TransformationMatchCustomConditions_EditorBuilder_a$assertionsSingleRoleHandler_moducj_f0" />
+      <unit id="7812943990232411879" at="23,0,239,0" name="jetbrains.mps.lang.test.generator.editor.TransformationMatchCustomConditions_EditorBuilder_a" />
+    </file>
+  </root>
   <root nodeRef="r:b1fae8f3-e29e-439c-9379-32f038b5d44d(jetbrains.mps.lang.test.generator.editor)/7985317431306202014">
     <file name="GeneratorTest_Editor.java">
       <node id="7985317431306202014" at="11,79,12,79" concept="6" />
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/ConceptPresentationAspectImpl.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/ConceptPresentationAspectImpl.java
index 90a1246037b8..d600a4eae324 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/ConceptPresentationAspectImpl.java
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/ConceptPresentationAspectImpl.java
@@ -10,11 +10,14 @@
 
 public class ConceptPresentationAspectImpl extends ConceptPresentationAspectBase {
   private ConceptPresentation props_ArgumentReference;
+  private ConceptPresentation props_CustomAssertionBlock;
   private ConceptPresentation props_GeneratorTest;
   private ConceptPresentation props_ModelArgument;
+  private ConceptPresentation props_Model_ConceptFunctionParameter;
   private ConceptPresentation props_TestArgument;
   private ConceptPresentation props_TestAssertion;
   private ConceptPresentation props_TransformationMatchAssertion;
+  private ConceptPresentation props_TransformationMatchCustomConditions;
   private ConceptPresentation props_TransformationMatchManyAssertion;
 
   @Override
@@ -29,6 +32,13 @@ public ConceptPresentation getDescriptor(SAbstractConcept c) {
           props_ArgumentReference = cpb.create();
         }
         return props_ArgumentReference;
+      case LanguageConceptSwitch.CustomAssertionBlock:
+        if (props_CustomAssertionBlock == null) {
+          ConceptPresentationBuilder cpb = new ConceptPresentationBuilder();
+          cpb.rawPresentation("CustomAssertionBlock");
+          props_CustomAssertionBlock = cpb.create();
+        }
+        return props_CustomAssertionBlock;
       case LanguageConceptSwitch.GeneratorTest:
         if (props_GeneratorTest == null) {
           ConceptPresentationBuilder cpb = new ConceptPresentationBuilder();
@@ -44,6 +54,13 @@ public ConceptPresentation getDescriptor(SAbstractConcept c) {
           props_ModelArgument = cpb.create();
         }
         return props_ModelArgument;
+      case LanguageConceptSwitch.Model_ConceptFunctionParameter:
+        if (props_Model_ConceptFunctionParameter == null) {
+          ConceptPresentationBuilder cpb = new ConceptPresentationBuilder();
+          cpb.rawPresentation("model");
+          props_Model_ConceptFunctionParameter = cpb.create();
+        }
+        return props_Model_ConceptFunctionParameter;
       case LanguageConceptSwitch.TestArgument:
         if (props_TestArgument == null) {
           ConceptPresentationBuilder cpb = new ConceptPresentationBuilder();
@@ -64,6 +81,14 @@ public ConceptPresentation getDescriptor(SAbstractConcept c) {
           props_TransformationMatchAssertion = cpb.create();
         }
         return props_TransformationMatchAssertion;
+      case LanguageConceptSwitch.TransformationMatchCustomConditions:
+        if (props_TransformationMatchCustomConditions == null) {
+          ConceptPresentationBuilder cpb = new ConceptPresentationBuilder();
+          cpb.shortDesc("transform and match custom conditions");
+          cpb.rawPresentation("TransformationMatchCustomConditions");
+          props_TransformationMatchCustomConditions = cpb.create();
+        }
+        return props_TransformationMatchCustomConditions;
       case LanguageConceptSwitch.TransformationMatchManyAssertion:
         if (props_TransformationMatchManyAssertion == null) {
           ConceptPresentationBuilder cpb = new ConceptPresentationBuilder();
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/LanguageConceptSwitch.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/LanguageConceptSwitch.java
index 82518a2737b7..a5d08414496d 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/LanguageConceptSwitch.java
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/LanguageConceptSwitch.java
@@ -10,21 +10,27 @@
 public final class LanguageConceptSwitch {
   private final LanguageConceptIndex myIndex;
   public static final int ArgumentReference = 0;
-  public static final int GeneratorTest = 1;
-  public static final int ModelArgument = 2;
-  public static final int TestArgument = 3;
-  public static final int TestAssertion = 4;
-  public static final int TransformationMatchAssertion = 5;
-  public static final int TransformationMatchManyAssertion = 6;
+  public static final int CustomAssertionBlock = 1;
+  public static final int GeneratorTest = 2;
+  public static final int ModelArgument = 3;
+  public static final int Model_ConceptFunctionParameter = 4;
+  public static final int TestArgument = 5;
+  public static final int TestAssertion = 6;
+  public static final int TransformationMatchAssertion = 7;
+  public static final int TransformationMatchCustomConditions = 8;
+  public static final int TransformationMatchManyAssertion = 9;
 
   public LanguageConceptSwitch() {
     LanguageConceptIndexBuilder builder = new LanguageConceptIndexBuilder(0x68015e26cc4d49dbL, 0x8715b643faea1769L);
     builder.put(0x7b1db36ecf0d05bL, ArgumentReference);
+    builder.put(0x6c6d272a13d37a56L, CustomAssertionBlock);
     builder.put(0x7b1db36ecf092beL, GeneratorTest);
     builder.put(0x7b1db36ecf09c6eL, ModelArgument);
+    builder.put(0x6c6d272a13d3b3b1L, Model_ConceptFunctionParameter);
     builder.put(0x7b1db36ecf09c6aL, TestArgument);
     builder.put(0x7b1db36ecf0d058L, TestAssertion);
     builder.put(0x7b1db36ecf0d057L, TransformationMatchAssertion);
+    builder.put(0x6c6d272a13d346a9L, TransformationMatchCustomConditions);
     builder.put(0x5812b95d667f29d9L, TransformationMatchManyAssertion);
     myIndex = builder.seal();
   }
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/StructureAspectDescriptor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/StructureAspectDescriptor.java
index 0cadc3da7011..7310ab44b29e 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/StructureAspectDescriptor.java
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/StructureAspectDescriptor.java
@@ -10,14 +10,19 @@
 import jetbrains.mps.smodel.adapter.ids.SConceptId;
 import org.jetbrains.mps.openapi.language.SAbstractConcept;
 import jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2;
+import jetbrains.mps.smodel.runtime.ConceptKind;
+import jetbrains.mps.smodel.runtime.StaticScope;
 
 public class StructureAspectDescriptor extends BaseStructureAspectDescriptor {
   /*package*/ final ConceptDescriptor myConceptArgumentReference = createDescriptorForArgumentReference();
+  /*package*/ final ConceptDescriptor myConceptCustomAssertionBlock = createDescriptorForCustomAssertionBlock();
   /*package*/ final ConceptDescriptor myConceptGeneratorTest = createDescriptorForGeneratorTest();
   /*package*/ final ConceptDescriptor myConceptModelArgument = createDescriptorForModelArgument();
+  /*package*/ final ConceptDescriptor myConceptModel_ConceptFunctionParameter = createDescriptorForModel_ConceptFunctionParameter();
   /*package*/ final ConceptDescriptor myConceptTestArgument = createDescriptorForTestArgument();
   /*package*/ final ConceptDescriptor myConceptTestAssertion = createDescriptorForTestAssertion();
   /*package*/ final ConceptDescriptor myConceptTransformationMatchAssertion = createDescriptorForTransformationMatchAssertion();
+  /*package*/ final ConceptDescriptor myConceptTransformationMatchCustomConditions = createDescriptorForTransformationMatchCustomConditions();
   /*package*/ final ConceptDescriptor myConceptTransformationMatchManyAssertion = createDescriptorForTransformationMatchManyAssertion();
   private final LanguageConceptSwitch myIndexSwitch;
 
@@ -27,7 +32,7 @@ public StructureAspectDescriptor() {
 
   @Override
   public Collection<ConceptDescriptor> getDescriptors() {
-    return Arrays.asList(myConceptArgumentReference, myConceptGeneratorTest, myConceptModelArgument, myConceptTestArgument, myConceptTestAssertion, myConceptTransformationMatchAssertion, myConceptTransformationMatchManyAssertion);
+    return Arrays.asList(myConceptArgumentReference, myConceptCustomAssertionBlock, myConceptGeneratorTest, myConceptModelArgument, myConceptModel_ConceptFunctionParameter, myConceptTestArgument, myConceptTestAssertion, myConceptTransformationMatchAssertion, myConceptTransformationMatchCustomConditions, myConceptTransformationMatchManyAssertion);
   }
 
   @Override
@@ -36,16 +41,22 @@ public ConceptDescriptor getDescriptor(SConceptId id) {
     switch (myIndexSwitch.index(id)) {
       case LanguageConceptSwitch.ArgumentReference:
         return myConceptArgumentReference;
+      case LanguageConceptSwitch.CustomAssertionBlock:
+        return myConceptCustomAssertionBlock;
       case LanguageConceptSwitch.GeneratorTest:
         return myConceptGeneratorTest;
       case LanguageConceptSwitch.ModelArgument:
         return myConceptModelArgument;
+      case LanguageConceptSwitch.Model_ConceptFunctionParameter:
+        return myConceptModel_ConceptFunctionParameter;
       case LanguageConceptSwitch.TestArgument:
         return myConceptTestArgument;
       case LanguageConceptSwitch.TestAssertion:
         return myConceptTestAssertion;
       case LanguageConceptSwitch.TransformationMatchAssertion:
         return myConceptTransformationMatchAssertion;
+      case LanguageConceptSwitch.TransformationMatchCustomConditions:
+        return myConceptTransformationMatchCustomConditions;
       case LanguageConceptSwitch.TransformationMatchManyAssertion:
         return myConceptTransformationMatchManyAssertion;
       default:
@@ -65,6 +76,15 @@ private static ConceptDescriptor createDescriptorForArgumentReference() {
     b.associate("arg", 0x7b1db36ecf0d05cL).target(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf09c6aL).optional(false).origin("554465258093203548").done();
     return b.create();
   }
+  private static ConceptDescriptor createDescriptorForCustomAssertionBlock() {
+    ConceptDescriptorBuilder2 b = new ConceptDescriptorBuilder2("jetbrains.mps.lang.test.generator", "CustomAssertionBlock", 0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d37a56L);
+    b.class_(false, false, false);
+    b.super_("jetbrains.mps.baseLanguage.structure.ConceptFunction", 0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x108bbca0f48L);
+    b.origin("r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/7812943990232414806");
+    b.version(2);
+    b.kind(ConceptKind.INTERFACE, StaticScope.GLOBAL);
+    return b.create();
+  }
   private static ConceptDescriptor createDescriptorForGeneratorTest() {
     ConceptDescriptorBuilder2 b = new ConceptDescriptorBuilder2("jetbrains.mps.lang.test.generator", "GeneratorTest", 0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL);
     b.class_(false, false, true);
@@ -86,6 +106,15 @@ private static ConceptDescriptor createDescriptorForModelArgument() {
     b.alias("model");
     return b.create();
   }
+  private static ConceptDescriptor createDescriptorForModel_ConceptFunctionParameter() {
+    ConceptDescriptorBuilder2 b = new ConceptDescriptorBuilder2("jetbrains.mps.lang.test.generator", "Model_ConceptFunctionParameter", 0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d3b3b1L);
+    b.class_(false, false, false);
+    b.super_("jetbrains.mps.baseLanguage.structure.ConceptFunctionParameter", 0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101c66e2c0bL);
+    b.origin("r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/7812943990232429489");
+    b.version(2);
+    b.alias("model");
+    return b.create();
+  }
   private static ConceptDescriptor createDescriptorForTestArgument() {
     ConceptDescriptorBuilder2 b = new ConceptDescriptorBuilder2("jetbrains.mps.lang.test.generator", "TestArgument", 0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf09c6aL);
     b.interface_();
@@ -112,6 +141,17 @@ private static ConceptDescriptor createDescriptorForTransformationMatchAssertion
     b.aggregate("transformationPlan", 0x7b1db36ecf0d063L).target(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL).optional(true).ordered(true).multiple(false).origin("554465258093203555").done();
     return b.create();
   }
+  private static ConceptDescriptor createDescriptorForTransformationMatchCustomConditions() {
+    ConceptDescriptorBuilder2 b = new ConceptDescriptorBuilder2("jetbrains.mps.lang.test.generator", "TransformationMatchCustomConditions", 0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L);
+    b.class_(false, false, false);
+    b.parent(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d058L);
+    b.origin("r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/7812943990232401577");
+    b.version(2);
+    b.aggregate("inputModel", 0x6c6d272a13d346acL).target(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL).optional(false).ordered(true).multiple(false).origin("7812943990232401580").done();
+    b.aggregate("transformationPlan", 0x6c6d272a13d346aeL).target(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL).optional(true).ordered(true).multiple(false).origin("7812943990232401582").done();
+    b.aggregate("assertions", 0x6c6d272a13d36ef9L).target(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d37a56L).optional(false).ordered(true).multiple(false).origin("7812943990232411897").done();
+    return b.create();
+  }
   private static ConceptDescriptor createDescriptorForTransformationMatchManyAssertion() {
     ConceptDescriptorBuilder2 b = new ConceptDescriptorBuilder2("jetbrains.mps.lang.test.generator", "TransformationMatchManyAssertion", 0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L);
     b.class_(false, false, false);
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/aspectcps-descriptorclasses.mps b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/aspectcps-descriptorclasses.mps
index 924a3d7cb104..63b561166168 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/aspectcps-descriptorclasses.mps
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/aspectcps-descriptorclasses.mps
@@ -37,6 +37,10 @@
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
+        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
+        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
+      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
@@ -198,103 +202,133 @@
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="false" />
       <property role="TrG5h" value="props_ArgumentReference" />
-      <node concept="3uibUv" id="c" role="1tU5fm">
+      <node concept="3uibUv" id="f" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
       </node>
-      <node concept="3Tm6S6" id="d" role="1B3o_S" />
+      <node concept="3Tm6S6" id="g" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="false" />
-      <property role="TrG5h" value="props_GeneratorTest" />
-      <node concept="3uibUv" id="e" role="1tU5fm">
+      <property role="TrG5h" value="props_CustomAssertionBlock" />
+      <node concept="3uibUv" id="h" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
       </node>
-      <node concept="3Tm6S6" id="f" role="1B3o_S" />
+      <node concept="3Tm6S6" id="i" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="4" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="false" />
-      <property role="TrG5h" value="props_ModelArgument" />
-      <node concept="3uibUv" id="g" role="1tU5fm">
+      <property role="TrG5h" value="props_GeneratorTest" />
+      <node concept="3uibUv" id="j" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
       </node>
-      <node concept="3Tm6S6" id="h" role="1B3o_S" />
+      <node concept="3Tm6S6" id="k" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="5" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="false" />
-      <property role="TrG5h" value="props_TestArgument" />
-      <node concept="3uibUv" id="i" role="1tU5fm">
+      <property role="TrG5h" value="props_ModelArgument" />
+      <node concept="3uibUv" id="l" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
       </node>
-      <node concept="3Tm6S6" id="j" role="1B3o_S" />
+      <node concept="3Tm6S6" id="m" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="6" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="false" />
-      <property role="TrG5h" value="props_TestAssertion" />
-      <node concept="3uibUv" id="k" role="1tU5fm">
+      <property role="TrG5h" value="props_Model_ConceptFunctionParameter" />
+      <node concept="3uibUv" id="n" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
       </node>
-      <node concept="3Tm6S6" id="l" role="1B3o_S" />
+      <node concept="3Tm6S6" id="o" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="7" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="false" />
-      <property role="TrG5h" value="props_TransformationMatchAssertion" />
-      <node concept="3uibUv" id="m" role="1tU5fm">
+      <property role="TrG5h" value="props_TestArgument" />
+      <node concept="3uibUv" id="p" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
       </node>
-      <node concept="3Tm6S6" id="n" role="1B3o_S" />
+      <node concept="3Tm6S6" id="q" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="8" role="jymVt">
+      <property role="eg7rD" value="false" />
+      <property role="34CwA1" value="false" />
+      <property role="3TUv4t" value="false" />
+      <property role="TrG5h" value="props_TestAssertion" />
+      <node concept="3uibUv" id="r" role="1tU5fm">
+        <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
+      </node>
+      <node concept="3Tm6S6" id="s" role="1B3o_S" />
+    </node>
+    <node concept="312cEg" id="9" role="jymVt">
+      <property role="eg7rD" value="false" />
+      <property role="34CwA1" value="false" />
+      <property role="3TUv4t" value="false" />
+      <property role="TrG5h" value="props_TransformationMatchAssertion" />
+      <node concept="3uibUv" id="t" role="1tU5fm">
+        <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
+      </node>
+      <node concept="3Tm6S6" id="u" role="1B3o_S" />
+    </node>
+    <node concept="312cEg" id="a" role="jymVt">
+      <property role="eg7rD" value="false" />
+      <property role="34CwA1" value="false" />
+      <property role="3TUv4t" value="false" />
+      <property role="TrG5h" value="props_TransformationMatchCustomConditions" />
+      <node concept="3uibUv" id="v" role="1tU5fm">
+        <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
+      </node>
+      <node concept="3Tm6S6" id="w" role="1B3o_S" />
+    </node>
+    <node concept="312cEg" id="b" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="false" />
       <property role="TrG5h" value="props_TransformationMatchManyAssertion" />
-      <node concept="3uibUv" id="o" role="1tU5fm">
+      <node concept="3uibUv" id="x" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
       </node>
-      <node concept="3Tm6S6" id="p" role="1B3o_S" />
+      <node concept="3Tm6S6" id="y" role="1B3o_S" />
     </node>
-    <node concept="3Tm1VV" id="9" role="1B3o_S" />
-    <node concept="2tJIrI" id="a" role="jymVt" />
-    <node concept="3clFb_" id="b" role="jymVt">
+    <node concept="3Tm1VV" id="c" role="1B3o_S" />
+    <node concept="2tJIrI" id="d" role="jymVt" />
+    <node concept="3clFb_" id="e" role="jymVt">
       <property role="IEkAT" value="false" />
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getDescriptor" />
       <property role="DiZV1" value="false" />
-      <node concept="3Tm1VV" id="q" role="1B3o_S" />
-      <node concept="37vLTG" id="r" role="3clF46">
+      <node concept="3Tm1VV" id="z" role="1B3o_S" />
+      <node concept="37vLTG" id="$" role="3clF46">
         <property role="TrG5h" value="c" />
-        <node concept="3uibUv" id="w" role="1tU5fm">
+        <node concept="3uibUv" id="D" role="1tU5fm">
           <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
         </node>
       </node>
-      <node concept="3clFbS" id="s" role="3clF47">
-        <node concept="3cpWs8" id="x" role="3cqZAp">
-          <node concept="3cpWsn" id="$" role="3cpWs9">
+      <node concept="3clFbS" id="_" role="3clF47">
+        <node concept="3cpWs8" id="E" role="3cqZAp">
+          <node concept="3cpWsn" id="H" role="3cpWs9">
             <property role="TrG5h" value="structureDescriptor" />
-            <node concept="3uibUv" id="_" role="1tU5fm">
-              <ref role="3uigEE" node="67" resolve="StructureAspectDescriptor" />
+            <node concept="3uibUv" id="I" role="1tU5fm">
+              <ref role="3uigEE" node="8d" resolve="StructureAspectDescriptor" />
             </node>
-            <node concept="10QFUN" id="A" role="33vP2m">
-              <node concept="3uibUv" id="B" role="10QFUM">
-                <ref role="3uigEE" node="67" resolve="StructureAspectDescriptor" />
+            <node concept="10QFUN" id="J" role="33vP2m">
+              <node concept="3uibUv" id="K" role="10QFUM">
+                <ref role="3uigEE" node="8d" resolve="StructureAspectDescriptor" />
               </node>
-              <node concept="2OqwBi" id="C" role="10QFUP">
-                <node concept="37vLTw" id="D" role="2Oq$k0">
+              <node concept="2OqwBi" id="L" role="10QFUP">
+                <node concept="37vLTw" id="M" role="2Oq$k0">
                   <ref role="3cqZAo" to="ze1i:~ConceptPresentationAspectBase.myLanguageRuntime" resolve="myLanguageRuntime" />
                 </node>
-                <node concept="liA8E" id="E" role="2OqNvi">
+                <node concept="liA8E" id="N" role="2OqNvi">
                   <ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class):jetbrains.mps.smodel.runtime.ILanguageAspect" resolve="getAspect" />
-                  <node concept="3VsKOn" id="F" role="37wK5m">
+                  <node concept="3VsKOn" id="O" role="37wK5m">
                     <ref role="3VsUkX" to="ze1i:~StructureAspectDescriptor" resolve="StructureAspectDescriptor" />
                   </node>
                 </node>
@@ -302,2644 +336,3624 @@
             </node>
           </node>
         </node>
-        <node concept="3KaCP$" id="y" role="3cqZAp">
-          <node concept="2OqwBi" id="G" role="3KbGdf">
-            <node concept="37vLTw" id="O" role="2Oq$k0">
-              <ref role="3cqZAo" node="$" resolve="structureDescriptor" />
+        <node concept="3KaCP$" id="F" role="3cqZAp">
+          <node concept="2OqwBi" id="P" role="3KbGdf">
+            <node concept="37vLTw" id="10" role="2Oq$k0">
+              <ref role="3cqZAo" node="H" resolve="structureDescriptor" />
             </node>
-            <node concept="liA8E" id="P" role="2OqNvi">
-              <ref role="37wK5l" node="6p" resolve="internalIndex" />
-              <node concept="37vLTw" id="Q" role="37wK5m">
-                <ref role="3cqZAo" node="r" resolve="c" />
+            <node concept="liA8E" id="11" role="2OqNvi">
+              <ref role="37wK5l" node="8y" resolve="internalIndex" />
+              <node concept="37vLTw" id="12" role="37wK5m">
+                <ref role="3cqZAo" node="$" resolve="c" />
               </node>
             </node>
           </node>
-          <node concept="3KbdKl" id="H" role="3KbHQx">
-            <node concept="3clFbS" id="R" role="3Kbo56">
-              <node concept="3clFbJ" id="T" role="3cqZAp">
-                <node concept="3clFbS" id="V" role="3clFbx">
-                  <node concept="3cpWs8" id="X" role="3cqZAp">
-                    <node concept="3cpWsn" id="10" role="3cpWs9">
+          <node concept="3KbdKl" id="Q" role="3KbHQx">
+            <node concept="3clFbS" id="13" role="3Kbo56">
+              <node concept="3clFbJ" id="15" role="3cqZAp">
+                <node concept="3clFbS" id="17" role="3clFbx">
+                  <node concept="3cpWs8" id="19" role="3cqZAp">
+                    <node concept="3cpWsn" id="1c" role="3cpWs9">
                       <property role="TrG5h" value="cpb" />
-                      <node concept="3uibUv" id="11" role="1tU5fm">
+                      <node concept="3uibUv" id="1d" role="1tU5fm">
                         <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
                       </node>
-                      <node concept="2ShNRf" id="12" role="33vP2m">
-                        <node concept="1pGfFk" id="13" role="2ShVmc">
+                      <node concept="2ShNRf" id="1e" role="33vP2m">
+                        <node concept="1pGfFk" id="1f" role="2ShVmc">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="Y" role="3cqZAp">
-                    <node concept="2OqwBi" id="14" role="3clFbG">
-                      <node concept="37vLTw" id="15" role="2Oq$k0">
-                        <ref role="3cqZAo" node="10" resolve="cpb" />
+                  <node concept="3clFbF" id="1a" role="3cqZAp">
+                    <node concept="2OqwBi" id="1g" role="3clFbG">
+                      <node concept="37vLTw" id="1h" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1c" resolve="cpb" />
                       </node>
-                      <node concept="liA8E" id="16" role="2OqNvi">
+                      <node concept="liA8E" id="1i" role="2OqNvi">
                         <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.presentationByReference(long,long,long,long,java.lang.String,java.lang.String,java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="presentationByReference" />
-                        <node concept="1adDum" id="17" role="37wK5m">
+                        <node concept="1adDum" id="1j" role="37wK5m">
                           <property role="1adDun" value="0x68015e26cc4d49dbL" />
-                          <node concept="cd27G" id="1f" role="lGtFl">
-                            <node concept="3u3nmq" id="1g" role="cd27D">
+                          <node concept="cd27G" id="1r" role="lGtFl">
+                            <node concept="3u3nmq" id="1s" role="cd27D">
                               <property role="3u3nmv" value="554465258093203547" />
                             </node>
                           </node>
                         </node>
-                        <node concept="1adDum" id="18" role="37wK5m">
+                        <node concept="1adDum" id="1k" role="37wK5m">
                           <property role="1adDun" value="0x8715b643faea1769L" />
-                          <node concept="cd27G" id="1h" role="lGtFl">
-                            <node concept="3u3nmq" id="1i" role="cd27D">
+                          <node concept="cd27G" id="1t" role="lGtFl">
+                            <node concept="3u3nmq" id="1u" role="cd27D">
                               <property role="3u3nmv" value="554465258093203547" />
                             </node>
                           </node>
                         </node>
-                        <node concept="1adDum" id="19" role="37wK5m">
+                        <node concept="1adDum" id="1l" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf0d05bL" />
-                          <node concept="cd27G" id="1j" role="lGtFl">
-                            <node concept="3u3nmq" id="1k" role="cd27D">
+                          <node concept="cd27G" id="1v" role="lGtFl">
+                            <node concept="3u3nmq" id="1w" role="cd27D">
                               <property role="3u3nmv" value="554465258093203547" />
                             </node>
                           </node>
                         </node>
-                        <node concept="1adDum" id="1a" role="37wK5m">
+                        <node concept="1adDum" id="1m" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf0d05cL" />
-                          <node concept="cd27G" id="1l" role="lGtFl">
-                            <node concept="3u3nmq" id="1m" role="cd27D">
+                          <node concept="cd27G" id="1x" role="lGtFl">
+                            <node concept="3u3nmq" id="1y" role="cd27D">
                               <property role="3u3nmv" value="554465258093203547" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Xl_RD" id="1b" role="37wK5m">
+                        <node concept="Xl_RD" id="1n" role="37wK5m">
                           <property role="Xl_RC" value="arg" />
-                          <node concept="cd27G" id="1n" role="lGtFl">
-                            <node concept="3u3nmq" id="1o" role="cd27D">
+                          <node concept="cd27G" id="1z" role="lGtFl">
+                            <node concept="3u3nmq" id="1$" role="cd27D">
                               <property role="3u3nmv" value="554465258093203547" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Xl_RD" id="1c" role="37wK5m">
+                        <node concept="Xl_RD" id="1o" role="37wK5m">
                           <property role="Xl_RC" value="" />
-                          <node concept="cd27G" id="1p" role="lGtFl">
-                            <node concept="3u3nmq" id="1q" role="cd27D">
+                          <node concept="cd27G" id="1_" role="lGtFl">
+                            <node concept="3u3nmq" id="1A" role="cd27D">
                               <property role="3u3nmv" value="554465258093203547" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Xl_RD" id="1d" role="37wK5m">
+                        <node concept="Xl_RD" id="1p" role="37wK5m">
                           <property role="Xl_RC" value="" />
-                          <node concept="cd27G" id="1r" role="lGtFl">
-                            <node concept="3u3nmq" id="1s" role="cd27D">
+                          <node concept="cd27G" id="1B" role="lGtFl">
+                            <node concept="3u3nmq" id="1C" role="cd27D">
                               <property role="3u3nmv" value="554465258093203547" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="1e" role="lGtFl">
-                          <node concept="3u3nmq" id="1t" role="cd27D">
+                        <node concept="cd27G" id="1q" role="lGtFl">
+                          <node concept="3u3nmq" id="1D" role="cd27D">
                             <property role="3u3nmv" value="554465258093203547" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="Z" role="3cqZAp">
-                    <node concept="37vLTI" id="1u" role="3clFbG">
-                      <node concept="2OqwBi" id="1v" role="37vLTx">
-                        <node concept="37vLTw" id="1x" role="2Oq$k0">
-                          <ref role="3cqZAo" node="10" resolve="cpb" />
+                  <node concept="3clFbF" id="1b" role="3cqZAp">
+                    <node concept="37vLTI" id="1E" role="3clFbG">
+                      <node concept="2OqwBi" id="1F" role="37vLTx">
+                        <node concept="37vLTw" id="1H" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1c" resolve="cpb" />
                         </node>
-                        <node concept="liA8E" id="1y" role="2OqNvi">
+                        <node concept="liA8E" id="1I" role="2OqNvi">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="1w" role="37vLTJ">
+                      <node concept="37vLTw" id="1G" role="37vLTJ">
                         <ref role="3cqZAo" node="2" resolve="props_ArgumentReference" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbC" id="W" role="3clFbw">
-                  <node concept="10Nm6u" id="1z" role="3uHU7w" />
-                  <node concept="37vLTw" id="1$" role="3uHU7B">
+                <node concept="3clFbC" id="18" role="3clFbw">
+                  <node concept="10Nm6u" id="1J" role="3uHU7w" />
+                  <node concept="37vLTw" id="1K" role="3uHU7B">
                     <ref role="3cqZAo" node="2" resolve="props_ArgumentReference" />
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="U" role="3cqZAp">
-                <node concept="37vLTw" id="1_" role="3cqZAk">
+              <node concept="3cpWs6" id="16" role="3cqZAp">
+                <node concept="37vLTw" id="1L" role="3cqZAk">
                   <ref role="3cqZAo" node="2" resolve="props_ArgumentReference" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="S" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4l" resolve="ArgumentReference" />
+            <node concept="10M0yZ" id="14" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="5X" resolve="ArgumentReference" />
+            </node>
+          </node>
+          <node concept="3KbdKl" id="R" role="3KbHQx">
+            <node concept="3clFbS" id="1M" role="3Kbo56">
+              <node concept="3clFbJ" id="1O" role="3cqZAp">
+                <node concept="3clFbS" id="1Q" role="3clFbx">
+                  <node concept="3cpWs8" id="1S" role="3cqZAp">
+                    <node concept="3cpWsn" id="1V" role="3cpWs9">
+                      <property role="TrG5h" value="cpb" />
+                      <node concept="3uibUv" id="1W" role="1tU5fm">
+                        <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
+                      </node>
+                      <node concept="2ShNRf" id="1X" role="33vP2m">
+                        <node concept="1pGfFk" id="1Y" role="2ShVmc">
+                          <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="1T" role="3cqZAp">
+                    <node concept="2OqwBi" id="1Z" role="3clFbG">
+                      <node concept="37vLTw" id="20" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1V" resolve="cpb" />
+                      </node>
+                      <node concept="liA8E" id="21" role="2OqNvi">
+                        <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.rawPresentation(java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="rawPresentation" />
+                        <node concept="Xl_RD" id="22" role="37wK5m">
+                          <property role="Xl_RC" value="CustomAssertionBlock" />
+                          <node concept="cd27G" id="24" role="lGtFl">
+                            <node concept="3u3nmq" id="25" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232414806" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="cd27G" id="23" role="lGtFl">
+                          <node concept="3u3nmq" id="26" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232414806" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="1U" role="3cqZAp">
+                    <node concept="37vLTI" id="27" role="3clFbG">
+                      <node concept="2OqwBi" id="28" role="37vLTx">
+                        <node concept="37vLTw" id="2a" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1V" resolve="cpb" />
+                        </node>
+                        <node concept="liA8E" id="2b" role="2OqNvi">
+                          <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="29" role="37vLTJ">
+                        <ref role="3cqZAo" node="3" resolve="props_CustomAssertionBlock" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbC" id="1R" role="3clFbw">
+                  <node concept="10Nm6u" id="2c" role="3uHU7w" />
+                  <node concept="37vLTw" id="2d" role="3uHU7B">
+                    <ref role="3cqZAo" node="3" resolve="props_CustomAssertionBlock" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="1P" role="3cqZAp">
+                <node concept="37vLTw" id="2e" role="3cqZAk">
+                  <ref role="3cqZAo" node="3" resolve="props_CustomAssertionBlock" />
+                </node>
+              </node>
+            </node>
+            <node concept="10M0yZ" id="1N" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="5Y" resolve="CustomAssertionBlock" />
             </node>
           </node>
-          <node concept="3KbdKl" id="I" role="3KbHQx">
-            <node concept="3clFbS" id="1A" role="3Kbo56">
-              <node concept="3clFbJ" id="1C" role="3cqZAp">
-                <node concept="3clFbS" id="1E" role="3clFbx">
-                  <node concept="3cpWs8" id="1G" role="3cqZAp">
-                    <node concept="3cpWsn" id="1J" role="3cpWs9">
+          <node concept="3KbdKl" id="S" role="3KbHQx">
+            <node concept="3clFbS" id="2f" role="3Kbo56">
+              <node concept="3clFbJ" id="2h" role="3cqZAp">
+                <node concept="3clFbS" id="2j" role="3clFbx">
+                  <node concept="3cpWs8" id="2l" role="3cqZAp">
+                    <node concept="3cpWsn" id="2o" role="3cpWs9">
                       <property role="TrG5h" value="cpb" />
-                      <node concept="3uibUv" id="1K" role="1tU5fm">
+                      <node concept="3uibUv" id="2p" role="1tU5fm">
                         <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
                       </node>
-                      <node concept="2ShNRf" id="1L" role="33vP2m">
-                        <node concept="1pGfFk" id="1M" role="2ShVmc">
+                      <node concept="2ShNRf" id="2q" role="33vP2m">
+                        <node concept="1pGfFk" id="2r" role="2ShVmc">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="1H" role="3cqZAp">
-                    <node concept="2OqwBi" id="1N" role="3clFbG">
-                      <node concept="37vLTw" id="1O" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1J" resolve="cpb" />
+                  <node concept="3clFbF" id="2m" role="3cqZAp">
+                    <node concept="2OqwBi" id="2s" role="3clFbG">
+                      <node concept="37vLTw" id="2t" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2o" resolve="cpb" />
                       </node>
-                      <node concept="liA8E" id="1P" role="2OqNvi">
+                      <node concept="liA8E" id="2u" role="2OqNvi">
                         <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.presentationByName():jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="presentationByName" />
-                        <node concept="cd27G" id="1Q" role="lGtFl">
-                          <node concept="3u3nmq" id="1R" role="cd27D">
+                        <node concept="cd27G" id="2v" role="lGtFl">
+                          <node concept="3u3nmq" id="2w" role="cd27D">
                             <property role="3u3nmv" value="554465258093187774" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="1I" role="3cqZAp">
-                    <node concept="37vLTI" id="1S" role="3clFbG">
-                      <node concept="2OqwBi" id="1T" role="37vLTx">
-                        <node concept="37vLTw" id="1V" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1J" resolve="cpb" />
+                  <node concept="3clFbF" id="2n" role="3cqZAp">
+                    <node concept="37vLTI" id="2x" role="3clFbG">
+                      <node concept="2OqwBi" id="2y" role="37vLTx">
+                        <node concept="37vLTw" id="2$" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2o" resolve="cpb" />
                         </node>
-                        <node concept="liA8E" id="1W" role="2OqNvi">
+                        <node concept="liA8E" id="2_" role="2OqNvi">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="1U" role="37vLTJ">
-                        <ref role="3cqZAo" node="3" resolve="props_GeneratorTest" />
+                      <node concept="37vLTw" id="2z" role="37vLTJ">
+                        <ref role="3cqZAo" node="4" resolve="props_GeneratorTest" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbC" id="1F" role="3clFbw">
-                  <node concept="10Nm6u" id="1X" role="3uHU7w" />
-                  <node concept="37vLTw" id="1Y" role="3uHU7B">
-                    <ref role="3cqZAo" node="3" resolve="props_GeneratorTest" />
+                <node concept="3clFbC" id="2k" role="3clFbw">
+                  <node concept="10Nm6u" id="2A" role="3uHU7w" />
+                  <node concept="37vLTw" id="2B" role="3uHU7B">
+                    <ref role="3cqZAo" node="4" resolve="props_GeneratorTest" />
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="1D" role="3cqZAp">
-                <node concept="37vLTw" id="1Z" role="3cqZAk">
-                  <ref role="3cqZAo" node="3" resolve="props_GeneratorTest" />
+              <node concept="3cpWs6" id="2i" role="3cqZAp">
+                <node concept="37vLTw" id="2C" role="3cqZAk">
+                  <ref role="3cqZAo" node="4" resolve="props_GeneratorTest" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="1B" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4m" resolve="GeneratorTest" />
+            <node concept="10M0yZ" id="2g" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="5Z" resolve="GeneratorTest" />
             </node>
           </node>
-          <node concept="3KbdKl" id="J" role="3KbHQx">
-            <node concept="3clFbS" id="20" role="3Kbo56">
-              <node concept="3clFbJ" id="22" role="3cqZAp">
-                <node concept="3clFbS" id="24" role="3clFbx">
-                  <node concept="3cpWs8" id="26" role="3cqZAp">
-                    <node concept="3cpWsn" id="2a" role="3cpWs9">
+          <node concept="3KbdKl" id="T" role="3KbHQx">
+            <node concept="3clFbS" id="2D" role="3Kbo56">
+              <node concept="3clFbJ" id="2F" role="3cqZAp">
+                <node concept="3clFbS" id="2H" role="3clFbx">
+                  <node concept="3cpWs8" id="2J" role="3cqZAp">
+                    <node concept="3cpWsn" id="2N" role="3cpWs9">
                       <property role="TrG5h" value="cpb" />
-                      <node concept="3uibUv" id="2b" role="1tU5fm">
+                      <node concept="3uibUv" id="2O" role="1tU5fm">
                         <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
                       </node>
-                      <node concept="2ShNRf" id="2c" role="33vP2m">
-                        <node concept="1pGfFk" id="2d" role="2ShVmc">
+                      <node concept="2ShNRf" id="2P" role="33vP2m">
+                        <node concept="1pGfFk" id="2Q" role="2ShVmc">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="27" role="3cqZAp">
-                    <node concept="2OqwBi" id="2e" role="3clFbG">
-                      <node concept="37vLTw" id="2f" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2a" resolve="cpb" />
+                  <node concept="3clFbF" id="2K" role="3cqZAp">
+                    <node concept="2OqwBi" id="2R" role="3clFbG">
+                      <node concept="37vLTw" id="2S" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2N" resolve="cpb" />
                       </node>
-                      <node concept="liA8E" id="2g" role="2OqNvi">
+                      <node concept="liA8E" id="2T" role="2OqNvi">
                         <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.shortDesc(java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="shortDesc" />
-                        <node concept="Xl_RD" id="2h" role="37wK5m">
+                        <node concept="Xl_RD" id="2U" role="37wK5m">
                           <property role="Xl_RC" value="points to a model in a context repository" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="28" role="3cqZAp">
-                    <node concept="2OqwBi" id="2i" role="3clFbG">
-                      <node concept="37vLTw" id="2j" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2a" resolve="cpb" />
+                  <node concept="3clFbF" id="2L" role="3cqZAp">
+                    <node concept="2OqwBi" id="2V" role="3clFbG">
+                      <node concept="37vLTw" id="2W" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2N" resolve="cpb" />
                       </node>
-                      <node concept="liA8E" id="2k" role="2OqNvi">
+                      <node concept="liA8E" id="2X" role="2OqNvi">
                         <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.presentationByName():jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="presentationByName" />
-                        <node concept="cd27G" id="2l" role="lGtFl">
-                          <node concept="3u3nmq" id="2m" role="cd27D">
+                        <node concept="cd27G" id="2Y" role="lGtFl">
+                          <node concept="3u3nmq" id="2Z" role="cd27D">
                             <property role="3u3nmv" value="554465258093190254" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="29" role="3cqZAp">
-                    <node concept="37vLTI" id="2n" role="3clFbG">
-                      <node concept="2OqwBi" id="2o" role="37vLTx">
-                        <node concept="37vLTw" id="2q" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2a" resolve="cpb" />
+                  <node concept="3clFbF" id="2M" role="3cqZAp">
+                    <node concept="37vLTI" id="30" role="3clFbG">
+                      <node concept="2OqwBi" id="31" role="37vLTx">
+                        <node concept="37vLTw" id="33" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2N" resolve="cpb" />
                         </node>
-                        <node concept="liA8E" id="2r" role="2OqNvi">
+                        <node concept="liA8E" id="34" role="2OqNvi">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="2p" role="37vLTJ">
-                        <ref role="3cqZAo" node="4" resolve="props_ModelArgument" />
+                      <node concept="37vLTw" id="32" role="37vLTJ">
+                        <ref role="3cqZAo" node="5" resolve="props_ModelArgument" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbC" id="25" role="3clFbw">
-                  <node concept="10Nm6u" id="2s" role="3uHU7w" />
-                  <node concept="37vLTw" id="2t" role="3uHU7B">
-                    <ref role="3cqZAo" node="4" resolve="props_ModelArgument" />
+                <node concept="3clFbC" id="2I" role="3clFbw">
+                  <node concept="10Nm6u" id="35" role="3uHU7w" />
+                  <node concept="37vLTw" id="36" role="3uHU7B">
+                    <ref role="3cqZAo" node="5" resolve="props_ModelArgument" />
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="23" role="3cqZAp">
-                <node concept="37vLTw" id="2u" role="3cqZAk">
-                  <ref role="3cqZAo" node="4" resolve="props_ModelArgument" />
+              <node concept="3cpWs6" id="2G" role="3cqZAp">
+                <node concept="37vLTw" id="37" role="3cqZAk">
+                  <ref role="3cqZAo" node="5" resolve="props_ModelArgument" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="21" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4n" resolve="ModelArgument" />
+            <node concept="10M0yZ" id="2E" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="60" resolve="ModelArgument" />
             </node>
           </node>
-          <node concept="3KbdKl" id="K" role="3KbHQx">
-            <node concept="3clFbS" id="2v" role="3Kbo56">
-              <node concept="3clFbJ" id="2x" role="3cqZAp">
-                <node concept="3clFbS" id="2z" role="3clFbx">
-                  <node concept="3cpWs8" id="2_" role="3cqZAp">
-                    <node concept="3cpWsn" id="2B" role="3cpWs9">
+          <node concept="3KbdKl" id="U" role="3KbHQx">
+            <node concept="3clFbS" id="38" role="3Kbo56">
+              <node concept="3clFbJ" id="3a" role="3cqZAp">
+                <node concept="3clFbS" id="3c" role="3clFbx">
+                  <node concept="3cpWs8" id="3e" role="3cqZAp">
+                    <node concept="3cpWsn" id="3h" role="3cpWs9">
                       <property role="TrG5h" value="cpb" />
-                      <node concept="3uibUv" id="2C" role="1tU5fm">
+                      <node concept="3uibUv" id="3i" role="1tU5fm">
                         <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
                       </node>
-                      <node concept="2ShNRf" id="2D" role="33vP2m">
-                        <node concept="1pGfFk" id="2E" role="2ShVmc">
+                      <node concept="2ShNRf" id="3j" role="33vP2m">
+                        <node concept="1pGfFk" id="3k" role="2ShVmc">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="2A" role="3cqZAp">
-                    <node concept="37vLTI" id="2F" role="3clFbG">
-                      <node concept="2OqwBi" id="2G" role="37vLTx">
-                        <node concept="37vLTw" id="2I" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2B" resolve="cpb" />
+                  <node concept="3clFbF" id="3f" role="3cqZAp">
+                    <node concept="2OqwBi" id="3l" role="3clFbG">
+                      <node concept="37vLTw" id="3m" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3h" resolve="cpb" />
+                      </node>
+                      <node concept="liA8E" id="3n" role="2OqNvi">
+                        <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.rawPresentation(java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="rawPresentation" />
+                        <node concept="Xl_RD" id="3o" role="37wK5m">
+                          <property role="Xl_RC" value="model" />
+                          <node concept="cd27G" id="3q" role="lGtFl">
+                            <node concept="3u3nmq" id="3r" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232429489" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="cd27G" id="3p" role="lGtFl">
+                          <node concept="3u3nmq" id="3s" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232429489" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="3g" role="3cqZAp">
+                    <node concept="37vLTI" id="3t" role="3clFbG">
+                      <node concept="2OqwBi" id="3u" role="37vLTx">
+                        <node concept="37vLTw" id="3w" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3h" resolve="cpb" />
                         </node>
-                        <node concept="liA8E" id="2J" role="2OqNvi">
+                        <node concept="liA8E" id="3x" role="2OqNvi">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="2H" role="37vLTJ">
-                        <ref role="3cqZAo" node="5" resolve="props_TestArgument" />
+                      <node concept="37vLTw" id="3v" role="37vLTJ">
+                        <ref role="3cqZAo" node="6" resolve="props_Model_ConceptFunctionParameter" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbC" id="2$" role="3clFbw">
-                  <node concept="10Nm6u" id="2K" role="3uHU7w" />
-                  <node concept="37vLTw" id="2L" role="3uHU7B">
-                    <ref role="3cqZAo" node="5" resolve="props_TestArgument" />
+                <node concept="3clFbC" id="3d" role="3clFbw">
+                  <node concept="10Nm6u" id="3y" role="3uHU7w" />
+                  <node concept="37vLTw" id="3z" role="3uHU7B">
+                    <ref role="3cqZAo" node="6" resolve="props_Model_ConceptFunctionParameter" />
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="2y" role="3cqZAp">
-                <node concept="37vLTw" id="2M" role="3cqZAk">
-                  <ref role="3cqZAo" node="5" resolve="props_TestArgument" />
+              <node concept="3cpWs6" id="3b" role="3cqZAp">
+                <node concept="37vLTw" id="3$" role="3cqZAk">
+                  <ref role="3cqZAo" node="6" resolve="props_Model_ConceptFunctionParameter" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="2w" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4o" resolve="TestArgument" />
+            <node concept="10M0yZ" id="39" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="61" resolve="Model_ConceptFunctionParameter" />
             </node>
           </node>
-          <node concept="3KbdKl" id="L" role="3KbHQx">
-            <node concept="3clFbS" id="2N" role="3Kbo56">
-              <node concept="3clFbJ" id="2P" role="3cqZAp">
-                <node concept="3clFbS" id="2R" role="3clFbx">
-                  <node concept="3cpWs8" id="2T" role="3cqZAp">
-                    <node concept="3cpWsn" id="2V" role="3cpWs9">
+          <node concept="3KbdKl" id="V" role="3KbHQx">
+            <node concept="3clFbS" id="3_" role="3Kbo56">
+              <node concept="3clFbJ" id="3B" role="3cqZAp">
+                <node concept="3clFbS" id="3D" role="3clFbx">
+                  <node concept="3cpWs8" id="3F" role="3cqZAp">
+                    <node concept="3cpWsn" id="3H" role="3cpWs9">
                       <property role="TrG5h" value="cpb" />
-                      <node concept="3uibUv" id="2W" role="1tU5fm">
+                      <node concept="3uibUv" id="3I" role="1tU5fm">
                         <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
                       </node>
-                      <node concept="2ShNRf" id="2X" role="33vP2m">
-                        <node concept="1pGfFk" id="2Y" role="2ShVmc">
+                      <node concept="2ShNRf" id="3J" role="33vP2m">
+                        <node concept="1pGfFk" id="3K" role="2ShVmc">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="2U" role="3cqZAp">
-                    <node concept="37vLTI" id="2Z" role="3clFbG">
-                      <node concept="2OqwBi" id="30" role="37vLTx">
-                        <node concept="37vLTw" id="32" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2V" resolve="cpb" />
+                  <node concept="3clFbF" id="3G" role="3cqZAp">
+                    <node concept="37vLTI" id="3L" role="3clFbG">
+                      <node concept="2OqwBi" id="3M" role="37vLTx">
+                        <node concept="37vLTw" id="3O" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3H" resolve="cpb" />
                         </node>
-                        <node concept="liA8E" id="33" role="2OqNvi">
+                        <node concept="liA8E" id="3P" role="2OqNvi">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="31" role="37vLTJ">
-                        <ref role="3cqZAo" node="6" resolve="props_TestAssertion" />
+                      <node concept="37vLTw" id="3N" role="37vLTJ">
+                        <ref role="3cqZAo" node="7" resolve="props_TestArgument" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbC" id="2S" role="3clFbw">
-                  <node concept="10Nm6u" id="34" role="3uHU7w" />
-                  <node concept="37vLTw" id="35" role="3uHU7B">
-                    <ref role="3cqZAo" node="6" resolve="props_TestAssertion" />
+                <node concept="3clFbC" id="3E" role="3clFbw">
+                  <node concept="10Nm6u" id="3Q" role="3uHU7w" />
+                  <node concept="37vLTw" id="3R" role="3uHU7B">
+                    <ref role="3cqZAo" node="7" resolve="props_TestArgument" />
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="2Q" role="3cqZAp">
-                <node concept="37vLTw" id="36" role="3cqZAk">
-                  <ref role="3cqZAo" node="6" resolve="props_TestAssertion" />
+              <node concept="3cpWs6" id="3C" role="3cqZAp">
+                <node concept="37vLTw" id="3S" role="3cqZAk">
+                  <ref role="3cqZAo" node="7" resolve="props_TestArgument" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="2O" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4p" resolve="TestAssertion" />
+            <node concept="10M0yZ" id="3A" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="62" resolve="TestArgument" />
             </node>
           </node>
-          <node concept="3KbdKl" id="M" role="3KbHQx">
-            <node concept="3clFbS" id="37" role="3Kbo56">
-              <node concept="3clFbJ" id="39" role="3cqZAp">
-                <node concept="3clFbS" id="3b" role="3clFbx">
-                  <node concept="3cpWs8" id="3d" role="3cqZAp">
-                    <node concept="3cpWsn" id="3h" role="3cpWs9">
+          <node concept="3KbdKl" id="W" role="3KbHQx">
+            <node concept="3clFbS" id="3T" role="3Kbo56">
+              <node concept="3clFbJ" id="3V" role="3cqZAp">
+                <node concept="3clFbS" id="3X" role="3clFbx">
+                  <node concept="3cpWs8" id="3Z" role="3cqZAp">
+                    <node concept="3cpWsn" id="41" role="3cpWs9">
                       <property role="TrG5h" value="cpb" />
-                      <node concept="3uibUv" id="3i" role="1tU5fm">
+                      <node concept="3uibUv" id="42" role="1tU5fm">
                         <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
                       </node>
-                      <node concept="2ShNRf" id="3j" role="33vP2m">
-                        <node concept="1pGfFk" id="3k" role="2ShVmc">
+                      <node concept="2ShNRf" id="43" role="33vP2m">
+                        <node concept="1pGfFk" id="44" role="2ShVmc">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="3e" role="3cqZAp">
-                    <node concept="2OqwBi" id="3l" role="3clFbG">
-                      <node concept="37vLTw" id="3m" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3h" resolve="cpb" />
+                  <node concept="3clFbF" id="40" role="3cqZAp">
+                    <node concept="37vLTI" id="45" role="3clFbG">
+                      <node concept="2OqwBi" id="46" role="37vLTx">
+                        <node concept="37vLTw" id="48" role="2Oq$k0">
+                          <ref role="3cqZAo" node="41" resolve="cpb" />
+                        </node>
+                        <node concept="liA8E" id="49" role="2OqNvi">
+                          <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
+                        </node>
                       </node>
-                      <node concept="liA8E" id="3n" role="2OqNvi">
+                      <node concept="37vLTw" id="47" role="37vLTJ">
+                        <ref role="3cqZAo" node="8" resolve="props_TestAssertion" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbC" id="3Y" role="3clFbw">
+                  <node concept="10Nm6u" id="4a" role="3uHU7w" />
+                  <node concept="37vLTw" id="4b" role="3uHU7B">
+                    <ref role="3cqZAo" node="8" resolve="props_TestAssertion" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="3W" role="3cqZAp">
+                <node concept="37vLTw" id="4c" role="3cqZAk">
+                  <ref role="3cqZAo" node="8" resolve="props_TestAssertion" />
+                </node>
+              </node>
+            </node>
+            <node concept="10M0yZ" id="3U" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="63" resolve="TestAssertion" />
+            </node>
+          </node>
+          <node concept="3KbdKl" id="X" role="3KbHQx">
+            <node concept="3clFbS" id="4d" role="3Kbo56">
+              <node concept="3clFbJ" id="4f" role="3cqZAp">
+                <node concept="3clFbS" id="4h" role="3clFbx">
+                  <node concept="3cpWs8" id="4j" role="3cqZAp">
+                    <node concept="3cpWsn" id="4n" role="3cpWs9">
+                      <property role="TrG5h" value="cpb" />
+                      <node concept="3uibUv" id="4o" role="1tU5fm">
+                        <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
+                      </node>
+                      <node concept="2ShNRf" id="4p" role="33vP2m">
+                        <node concept="1pGfFk" id="4q" role="2ShVmc">
+                          <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="4k" role="3cqZAp">
+                    <node concept="2OqwBi" id="4r" role="3clFbG">
+                      <node concept="37vLTw" id="4s" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4n" resolve="cpb" />
+                      </node>
+                      <node concept="liA8E" id="4t" role="2OqNvi">
                         <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.shortDesc(java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="shortDesc" />
-                        <node concept="Xl_RD" id="3o" role="37wK5m">
+                        <node concept="Xl_RD" id="4u" role="37wK5m">
                           <property role="Xl_RC" value="transform and match primary output model" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="3f" role="3cqZAp">
-                    <node concept="2OqwBi" id="3p" role="3clFbG">
-                      <node concept="37vLTw" id="3q" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3h" resolve="cpb" />
+                  <node concept="3clFbF" id="4l" role="3cqZAp">
+                    <node concept="2OqwBi" id="4v" role="3clFbG">
+                      <node concept="37vLTw" id="4w" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4n" resolve="cpb" />
                       </node>
-                      <node concept="liA8E" id="3r" role="2OqNvi">
+                      <node concept="liA8E" id="4x" role="2OqNvi">
                         <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.rawPresentation(java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="rawPresentation" />
-                        <node concept="Xl_RD" id="3s" role="37wK5m">
+                        <node concept="Xl_RD" id="4y" role="37wK5m">
                           <property role="Xl_RC" value="TransformationMatchAssertion" />
-                          <node concept="cd27G" id="3u" role="lGtFl">
-                            <node concept="3u3nmq" id="3v" role="cd27D">
+                          <node concept="cd27G" id="4$" role="lGtFl">
+                            <node concept="3u3nmq" id="4_" role="cd27D">
                               <property role="3u3nmv" value="554465258093203543" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="3t" role="lGtFl">
-                          <node concept="3u3nmq" id="3w" role="cd27D">
+                        <node concept="cd27G" id="4z" role="lGtFl">
+                          <node concept="3u3nmq" id="4A" role="cd27D">
                             <property role="3u3nmv" value="554465258093203543" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="3g" role="3cqZAp">
-                    <node concept="37vLTI" id="3x" role="3clFbG">
-                      <node concept="2OqwBi" id="3y" role="37vLTx">
-                        <node concept="37vLTw" id="3$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3h" resolve="cpb" />
+                  <node concept="3clFbF" id="4m" role="3cqZAp">
+                    <node concept="37vLTI" id="4B" role="3clFbG">
+                      <node concept="2OqwBi" id="4C" role="37vLTx">
+                        <node concept="37vLTw" id="4E" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4n" resolve="cpb" />
+                        </node>
+                        <node concept="liA8E" id="4F" role="2OqNvi">
+                          <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
                         </node>
-                        <node concept="liA8E" id="3_" role="2OqNvi">
+                      </node>
+                      <node concept="37vLTw" id="4D" role="37vLTJ">
+                        <ref role="3cqZAo" node="9" resolve="props_TransformationMatchAssertion" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbC" id="4i" role="3clFbw">
+                  <node concept="10Nm6u" id="4G" role="3uHU7w" />
+                  <node concept="37vLTw" id="4H" role="3uHU7B">
+                    <ref role="3cqZAo" node="9" resolve="props_TransformationMatchAssertion" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="4g" role="3cqZAp">
+                <node concept="37vLTw" id="4I" role="3cqZAk">
+                  <ref role="3cqZAo" node="9" resolve="props_TransformationMatchAssertion" />
+                </node>
+              </node>
+            </node>
+            <node concept="10M0yZ" id="4e" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="64" resolve="TransformationMatchAssertion" />
+            </node>
+          </node>
+          <node concept="3KbdKl" id="Y" role="3KbHQx">
+            <node concept="3clFbS" id="4J" role="3Kbo56">
+              <node concept="3clFbJ" id="4L" role="3cqZAp">
+                <node concept="3clFbS" id="4N" role="3clFbx">
+                  <node concept="3cpWs8" id="4P" role="3cqZAp">
+                    <node concept="3cpWsn" id="4T" role="3cpWs9">
+                      <property role="TrG5h" value="cpb" />
+                      <node concept="3uibUv" id="4U" role="1tU5fm">
+                        <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
+                      </node>
+                      <node concept="2ShNRf" id="4V" role="33vP2m">
+                        <node concept="1pGfFk" id="4W" role="2ShVmc">
+                          <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="4Q" role="3cqZAp">
+                    <node concept="2OqwBi" id="4X" role="3clFbG">
+                      <node concept="37vLTw" id="4Y" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4T" resolve="cpb" />
+                      </node>
+                      <node concept="liA8E" id="4Z" role="2OqNvi">
+                        <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.shortDesc(java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="shortDesc" />
+                        <node concept="Xl_RD" id="50" role="37wK5m">
+                          <property role="Xl_RC" value="transform and match custom conditions" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="4R" role="3cqZAp">
+                    <node concept="2OqwBi" id="51" role="3clFbG">
+                      <node concept="37vLTw" id="52" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4T" resolve="cpb" />
+                      </node>
+                      <node concept="liA8E" id="53" role="2OqNvi">
+                        <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.rawPresentation(java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="rawPresentation" />
+                        <node concept="Xl_RD" id="54" role="37wK5m">
+                          <property role="Xl_RC" value="TransformationMatchCustomConditions" />
+                          <node concept="cd27G" id="56" role="lGtFl">
+                            <node concept="3u3nmq" id="57" role="cd27D">
+                              <property role="3u3nmv" value="7812943990232401577" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="cd27G" id="55" role="lGtFl">
+                          <node concept="3u3nmq" id="58" role="cd27D">
+                            <property role="3u3nmv" value="7812943990232401577" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="4S" role="3cqZAp">
+                    <node concept="37vLTI" id="59" role="3clFbG">
+                      <node concept="2OqwBi" id="5a" role="37vLTx">
+                        <node concept="37vLTw" id="5c" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4T" resolve="cpb" />
+                        </node>
+                        <node concept="liA8E" id="5d" role="2OqNvi">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="3z" role="37vLTJ">
-                        <ref role="3cqZAo" node="7" resolve="props_TransformationMatchAssertion" />
+                      <node concept="37vLTw" id="5b" role="37vLTJ">
+                        <ref role="3cqZAo" node="a" resolve="props_TransformationMatchCustomConditions" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbC" id="3c" role="3clFbw">
-                  <node concept="10Nm6u" id="3A" role="3uHU7w" />
-                  <node concept="37vLTw" id="3B" role="3uHU7B">
-                    <ref role="3cqZAo" node="7" resolve="props_TransformationMatchAssertion" />
+                <node concept="3clFbC" id="4O" role="3clFbw">
+                  <node concept="10Nm6u" id="5e" role="3uHU7w" />
+                  <node concept="37vLTw" id="5f" role="3uHU7B">
+                    <ref role="3cqZAo" node="a" resolve="props_TransformationMatchCustomConditions" />
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="3a" role="3cqZAp">
-                <node concept="37vLTw" id="3C" role="3cqZAk">
-                  <ref role="3cqZAo" node="7" resolve="props_TransformationMatchAssertion" />
+              <node concept="3cpWs6" id="4M" role="3cqZAp">
+                <node concept="37vLTw" id="5g" role="3cqZAk">
+                  <ref role="3cqZAo" node="a" resolve="props_TransformationMatchCustomConditions" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="38" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4q" resolve="TransformationMatchAssertion" />
+            <node concept="10M0yZ" id="4K" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="65" resolve="TransformationMatchCustomConditions" />
             </node>
           </node>
-          <node concept="3KbdKl" id="N" role="3KbHQx">
-            <node concept="3clFbS" id="3D" role="3Kbo56">
-              <node concept="3clFbJ" id="3F" role="3cqZAp">
-                <node concept="3clFbS" id="3H" role="3clFbx">
-                  <node concept="3cpWs8" id="3J" role="3cqZAp">
-                    <node concept="3cpWsn" id="3N" role="3cpWs9">
+          <node concept="3KbdKl" id="Z" role="3KbHQx">
+            <node concept="3clFbS" id="5h" role="3Kbo56">
+              <node concept="3clFbJ" id="5j" role="3cqZAp">
+                <node concept="3clFbS" id="5l" role="3clFbx">
+                  <node concept="3cpWs8" id="5n" role="3cqZAp">
+                    <node concept="3cpWsn" id="5r" role="3cpWs9">
                       <property role="TrG5h" value="cpb" />
-                      <node concept="3uibUv" id="3O" role="1tU5fm">
+                      <node concept="3uibUv" id="5s" role="1tU5fm">
                         <ref role="3uigEE" to="ze1i:~ConceptPresentationBuilder" resolve="ConceptPresentationBuilder" />
                       </node>
-                      <node concept="2ShNRf" id="3P" role="33vP2m">
-                        <node concept="1pGfFk" id="3Q" role="2ShVmc">
+                      <node concept="2ShNRf" id="5t" role="33vP2m">
+                        <node concept="1pGfFk" id="5u" role="2ShVmc">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.&lt;init&gt;()" resolve="ConceptPresentationBuilder" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="3K" role="3cqZAp">
-                    <node concept="2OqwBi" id="3R" role="3clFbG">
-                      <node concept="37vLTw" id="3S" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3N" resolve="cpb" />
+                  <node concept="3clFbF" id="5o" role="3cqZAp">
+                    <node concept="2OqwBi" id="5v" role="3clFbG">
+                      <node concept="37vLTw" id="5w" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5r" resolve="cpb" />
                       </node>
-                      <node concept="liA8E" id="3T" role="2OqNvi">
+                      <node concept="liA8E" id="5x" role="2OqNvi">
                         <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.shortDesc(java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="shortDesc" />
-                        <node concept="Xl_RD" id="3U" role="37wK5m">
+                        <node concept="Xl_RD" id="5y" role="37wK5m">
                           <property role="Xl_RC" value="transform and match multiple output models" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="3L" role="3cqZAp">
-                    <node concept="2OqwBi" id="3V" role="3clFbG">
-                      <node concept="37vLTw" id="3W" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3N" resolve="cpb" />
+                  <node concept="3clFbF" id="5p" role="3cqZAp">
+                    <node concept="2OqwBi" id="5z" role="3clFbG">
+                      <node concept="37vLTw" id="5$" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5r" resolve="cpb" />
                       </node>
-                      <node concept="liA8E" id="3X" role="2OqNvi">
+                      <node concept="liA8E" id="5_" role="2OqNvi">
                         <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.rawPresentation(java.lang.String):jetbrains.mps.smodel.runtime.ConceptPresentationBuilder" resolve="rawPresentation" />
-                        <node concept="Xl_RD" id="3Y" role="37wK5m">
+                        <node concept="Xl_RD" id="5A" role="37wK5m">
                           <property role="Xl_RC" value="TransformationMatchManyAssertion" />
-                          <node concept="cd27G" id="40" role="lGtFl">
-                            <node concept="3u3nmq" id="41" role="cd27D">
+                          <node concept="cd27G" id="5C" role="lGtFl">
+                            <node concept="3u3nmq" id="5D" role="cd27D">
                               <property role="3u3nmv" value="6346338635721157081" />
                             </node>
                           </node>
                         </node>
-                        <node concept="cd27G" id="3Z" role="lGtFl">
-                          <node concept="3u3nmq" id="42" role="cd27D">
+                        <node concept="cd27G" id="5B" role="lGtFl">
+                          <node concept="3u3nmq" id="5E" role="cd27D">
                             <property role="3u3nmv" value="6346338635721157081" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="3M" role="3cqZAp">
-                    <node concept="37vLTI" id="43" role="3clFbG">
-                      <node concept="2OqwBi" id="44" role="37vLTx">
-                        <node concept="37vLTw" id="46" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3N" resolve="cpb" />
+                  <node concept="3clFbF" id="5q" role="3cqZAp">
+                    <node concept="37vLTI" id="5F" role="3clFbG">
+                      <node concept="2OqwBi" id="5G" role="37vLTx">
+                        <node concept="37vLTw" id="5I" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5r" resolve="cpb" />
                         </node>
-                        <node concept="liA8E" id="47" role="2OqNvi">
+                        <node concept="liA8E" id="5J" role="2OqNvi">
                           <ref role="37wK5l" to="ze1i:~ConceptPresentationBuilder.create():jetbrains.mps.smodel.runtime.ConceptPresentation" resolve="create" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="45" role="37vLTJ">
-                        <ref role="3cqZAo" node="8" resolve="props_TransformationMatchManyAssertion" />
+                      <node concept="37vLTw" id="5H" role="37vLTJ">
+                        <ref role="3cqZAo" node="b" resolve="props_TransformationMatchManyAssertion" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbC" id="3I" role="3clFbw">
-                  <node concept="10Nm6u" id="48" role="3uHU7w" />
-                  <node concept="37vLTw" id="49" role="3uHU7B">
-                    <ref role="3cqZAo" node="8" resolve="props_TransformationMatchManyAssertion" />
+                <node concept="3clFbC" id="5m" role="3clFbw">
+                  <node concept="10Nm6u" id="5K" role="3uHU7w" />
+                  <node concept="37vLTw" id="5L" role="3uHU7B">
+                    <ref role="3cqZAo" node="b" resolve="props_TransformationMatchManyAssertion" />
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="3G" role="3cqZAp">
-                <node concept="37vLTw" id="4a" role="3cqZAk">
-                  <ref role="3cqZAo" node="8" resolve="props_TransformationMatchManyAssertion" />
+              <node concept="3cpWs6" id="5k" role="3cqZAp">
+                <node concept="37vLTw" id="5M" role="3cqZAk">
+                  <ref role="3cqZAo" node="b" resolve="props_TransformationMatchManyAssertion" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="3E" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4r" resolve="TransformationMatchManyAssertion" />
+            <node concept="10M0yZ" id="5i" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="66" resolve="TransformationMatchManyAssertion" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="z" role="3cqZAp">
-          <node concept="10Nm6u" id="4b" role="3cqZAk" />
+        <node concept="3cpWs6" id="G" role="3cqZAp">
+          <node concept="10Nm6u" id="5N" role="3cqZAk" />
         </node>
       </node>
-      <node concept="3uibUv" id="t" role="3clF45">
+      <node concept="3uibUv" id="A" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConceptPresentation" resolve="ConceptPresentation" />
       </node>
-      <node concept="2AHcQZ" id="u" role="2AJF6D">
+      <node concept="2AHcQZ" id="B" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="2AHcQZ" id="v" role="2AJF6D">
+      <node concept="2AHcQZ" id="C" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
     </node>
   </node>
-  <node concept="39dXUE" id="4c">
-    <node concept="39e2AJ" id="4d" role="39e2AI">
+  <node concept="39dXUE" id="5O">
+    <node concept="39e2AJ" id="5P" role="39e2AI">
       <property role="39e3Y2" value="ConceptPresentationAspectClass" />
-      <node concept="39e2AG" id="4f" role="39e3Y0">
+      <node concept="39e2AG" id="5R" role="39e3Y0">
         <property role="2mV_xN" value="true" />
-        <node concept="39e2AT" id="4g" role="39e2AY">
+        <node concept="39e2AT" id="5S" role="39e2AY">
           <ref role="39e2AS" node="0" resolve="ConceptPresentationAspectImpl" />
         </node>
       </node>
     </node>
-    <node concept="39e2AJ" id="4e" role="39e2AI">
+    <node concept="39e2AJ" id="5Q" role="39e2AI">
       <property role="39e3Y2" value="StructureAspectDescriptorCons" />
-      <node concept="39e2AG" id="4h" role="39e3Y0">
+      <node concept="39e2AG" id="5T" role="39e3Y0">
         <property role="2mV_xN" value="true" />
-        <node concept="39e2AT" id="4i" role="39e2AY">
-          <ref role="39e2AS" node="6j" resolve="StructureAspectDescriptor" />
+        <node concept="39e2AT" id="5U" role="39e2AY">
+          <ref role="39e2AS" node="8s" resolve="StructureAspectDescriptor" />
         </node>
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="4j">
+  <node concept="312cEu" id="5V">
     <property role="TrG5h" value="LanguageConceptSwitch" />
     <property role="1EXbeo" value="true" />
-    <node concept="312cEg" id="4k" role="jymVt">
+    <node concept="312cEg" id="5W" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="myIndex" />
       <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="4z" role="1B3o_S" />
-      <node concept="3uibUv" id="4$" role="1tU5fm">
+      <node concept="3Tm6S6" id="6e" role="1B3o_S" />
+      <node concept="3uibUv" id="6f" role="1tU5fm">
         <ref role="3uigEE" to="ksn4:~LanguageConceptIndex" resolve="LanguageConceptIndex" />
       </node>
     </node>
-    <node concept="Wx3nA" id="4l" role="jymVt">
+    <node concept="Wx3nA" id="5X" role="jymVt">
       <property role="2dlcS1" value="false" />
       <property role="2dld4O" value="false" />
       <property role="3TUv4t" value="true" />
       <property role="TrG5h" value="ArgumentReference" />
-      <node concept="3Tm1VV" id="4_" role="1B3o_S" />
-      <node concept="10Oyi0" id="4A" role="1tU5fm" />
-      <node concept="3cmrfG" id="4B" role="33vP2m">
+      <node concept="3Tm1VV" id="6g" role="1B3o_S" />
+      <node concept="10Oyi0" id="6h" role="1tU5fm" />
+      <node concept="3cmrfG" id="6i" role="33vP2m">
         <property role="3cmrfH" value="0" />
       </node>
     </node>
-    <node concept="Wx3nA" id="4m" role="jymVt">
+    <node concept="Wx3nA" id="5Y" role="jymVt">
       <property role="2dlcS1" value="false" />
       <property role="2dld4O" value="false" />
       <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="GeneratorTest" />
-      <node concept="3Tm1VV" id="4C" role="1B3o_S" />
-      <node concept="10Oyi0" id="4D" role="1tU5fm" />
-      <node concept="3cmrfG" id="4E" role="33vP2m">
+      <property role="TrG5h" value="CustomAssertionBlock" />
+      <node concept="3Tm1VV" id="6j" role="1B3o_S" />
+      <node concept="10Oyi0" id="6k" role="1tU5fm" />
+      <node concept="3cmrfG" id="6l" role="33vP2m">
         <property role="3cmrfH" value="1" />
       </node>
     </node>
-    <node concept="Wx3nA" id="4n" role="jymVt">
+    <node concept="Wx3nA" id="5Z" role="jymVt">
       <property role="2dlcS1" value="false" />
       <property role="2dld4O" value="false" />
       <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="ModelArgument" />
-      <node concept="3Tm1VV" id="4F" role="1B3o_S" />
-      <node concept="10Oyi0" id="4G" role="1tU5fm" />
-      <node concept="3cmrfG" id="4H" role="33vP2m">
+      <property role="TrG5h" value="GeneratorTest" />
+      <node concept="3Tm1VV" id="6m" role="1B3o_S" />
+      <node concept="10Oyi0" id="6n" role="1tU5fm" />
+      <node concept="3cmrfG" id="6o" role="33vP2m">
         <property role="3cmrfH" value="2" />
       </node>
     </node>
-    <node concept="Wx3nA" id="4o" role="jymVt">
+    <node concept="Wx3nA" id="60" role="jymVt">
       <property role="2dlcS1" value="false" />
       <property role="2dld4O" value="false" />
       <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="TestArgument" />
-      <node concept="3Tm1VV" id="4I" role="1B3o_S" />
-      <node concept="10Oyi0" id="4J" role="1tU5fm" />
-      <node concept="3cmrfG" id="4K" role="33vP2m">
+      <property role="TrG5h" value="ModelArgument" />
+      <node concept="3Tm1VV" id="6p" role="1B3o_S" />
+      <node concept="10Oyi0" id="6q" role="1tU5fm" />
+      <node concept="3cmrfG" id="6r" role="33vP2m">
         <property role="3cmrfH" value="3" />
       </node>
     </node>
-    <node concept="Wx3nA" id="4p" role="jymVt">
+    <node concept="Wx3nA" id="61" role="jymVt">
       <property role="2dlcS1" value="false" />
       <property role="2dld4O" value="false" />
       <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="TestAssertion" />
-      <node concept="3Tm1VV" id="4L" role="1B3o_S" />
-      <node concept="10Oyi0" id="4M" role="1tU5fm" />
-      <node concept="3cmrfG" id="4N" role="33vP2m">
+      <property role="TrG5h" value="Model_ConceptFunctionParameter" />
+      <node concept="3Tm1VV" id="6s" role="1B3o_S" />
+      <node concept="10Oyi0" id="6t" role="1tU5fm" />
+      <node concept="3cmrfG" id="6u" role="33vP2m">
         <property role="3cmrfH" value="4" />
       </node>
     </node>
-    <node concept="Wx3nA" id="4q" role="jymVt">
+    <node concept="Wx3nA" id="62" role="jymVt">
       <property role="2dlcS1" value="false" />
       <property role="2dld4O" value="false" />
       <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="TransformationMatchAssertion" />
-      <node concept="3Tm1VV" id="4O" role="1B3o_S" />
-      <node concept="10Oyi0" id="4P" role="1tU5fm" />
-      <node concept="3cmrfG" id="4Q" role="33vP2m">
+      <property role="TrG5h" value="TestArgument" />
+      <node concept="3Tm1VV" id="6v" role="1B3o_S" />
+      <node concept="10Oyi0" id="6w" role="1tU5fm" />
+      <node concept="3cmrfG" id="6x" role="33vP2m">
         <property role="3cmrfH" value="5" />
       </node>
     </node>
-    <node concept="Wx3nA" id="4r" role="jymVt">
+    <node concept="Wx3nA" id="63" role="jymVt">
       <property role="2dlcS1" value="false" />
       <property role="2dld4O" value="false" />
       <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="TransformationMatchManyAssertion" />
-      <node concept="3Tm1VV" id="4R" role="1B3o_S" />
-      <node concept="10Oyi0" id="4S" role="1tU5fm" />
-      <node concept="3cmrfG" id="4T" role="33vP2m">
+      <property role="TrG5h" value="TestAssertion" />
+      <node concept="3Tm1VV" id="6y" role="1B3o_S" />
+      <node concept="10Oyi0" id="6z" role="1tU5fm" />
+      <node concept="3cmrfG" id="6$" role="33vP2m">
         <property role="3cmrfH" value="6" />
       </node>
     </node>
-    <node concept="2tJIrI" id="4s" role="jymVt" />
-    <node concept="3clFbW" id="4t" role="jymVt">
-      <node concept="3cqZAl" id="4U" role="3clF45" />
-      <node concept="3Tm1VV" id="4V" role="1B3o_S" />
-      <node concept="3clFbS" id="4W" role="3clF47">
-        <node concept="3cpWs8" id="4X" role="3cqZAp">
-          <node concept="3cpWsn" id="56" role="3cpWs9">
+    <node concept="Wx3nA" id="64" role="jymVt">
+      <property role="2dlcS1" value="false" />
+      <property role="2dld4O" value="false" />
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="TransformationMatchAssertion" />
+      <node concept="3Tm1VV" id="6_" role="1B3o_S" />
+      <node concept="10Oyi0" id="6A" role="1tU5fm" />
+      <node concept="3cmrfG" id="6B" role="33vP2m">
+        <property role="3cmrfH" value="7" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="65" role="jymVt">
+      <property role="2dlcS1" value="false" />
+      <property role="2dld4O" value="false" />
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="TransformationMatchCustomConditions" />
+      <node concept="3Tm1VV" id="6C" role="1B3o_S" />
+      <node concept="10Oyi0" id="6D" role="1tU5fm" />
+      <node concept="3cmrfG" id="6E" role="33vP2m">
+        <property role="3cmrfH" value="8" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="66" role="jymVt">
+      <property role="2dlcS1" value="false" />
+      <property role="2dld4O" value="false" />
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="TransformationMatchManyAssertion" />
+      <node concept="3Tm1VV" id="6F" role="1B3o_S" />
+      <node concept="10Oyi0" id="6G" role="1tU5fm" />
+      <node concept="3cmrfG" id="6H" role="33vP2m">
+        <property role="3cmrfH" value="9" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="67" role="jymVt" />
+    <node concept="3clFbW" id="68" role="jymVt">
+      <node concept="3cqZAl" id="6I" role="3clF45" />
+      <node concept="3Tm1VV" id="6J" role="1B3o_S" />
+      <node concept="3clFbS" id="6K" role="3clF47">
+        <node concept="3cpWs8" id="6L" role="3cqZAp">
+          <node concept="3cpWsn" id="6X" role="3cpWs9">
             <property role="TrG5h" value="builder" />
-            <node concept="3uibUv" id="57" role="1tU5fm">
+            <node concept="3uibUv" id="6Y" role="1tU5fm">
               <ref role="3uigEE" to="ksn4:~LanguageConceptIndexBuilder" resolve="LanguageConceptIndexBuilder" />
             </node>
-            <node concept="2ShNRf" id="58" role="33vP2m">
-              <node concept="1pGfFk" id="59" role="2ShVmc">
+            <node concept="2ShNRf" id="6Z" role="33vP2m">
+              <node concept="1pGfFk" id="70" role="2ShVmc">
                 <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.&lt;init&gt;(long,long)" resolve="LanguageConceptIndexBuilder" />
-                <node concept="1adDum" id="5a" role="37wK5m">
+                <node concept="1adDum" id="71" role="37wK5m">
                   <property role="1adDun" value="0x68015e26cc4d49dbL" />
                 </node>
-                <node concept="1adDum" id="5b" role="37wK5m">
+                <node concept="1adDum" id="72" role="37wK5m">
                   <property role="1adDun" value="0x8715b643faea1769L" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="4Y" role="3cqZAp">
-          <node concept="2OqwBi" id="5c" role="3clFbG">
-            <node concept="37vLTw" id="5d" role="2Oq$k0">
-              <ref role="3cqZAo" node="56" resolve="builder" />
+        <node concept="3clFbF" id="6M" role="3cqZAp">
+          <node concept="2OqwBi" id="73" role="3clFbG">
+            <node concept="37vLTw" id="74" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
             </node>
-            <node concept="liA8E" id="5e" role="2OqNvi">
+            <node concept="liA8E" id="75" role="2OqNvi">
               <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
-              <node concept="1adDum" id="5f" role="37wK5m">
+              <node concept="1adDum" id="76" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf0d05bL" />
               </node>
-              <node concept="37vLTw" id="5g" role="37wK5m">
-                <ref role="3cqZAo" node="4l" resolve="ArgumentReference" />
+              <node concept="37vLTw" id="77" role="37wK5m">
+                <ref role="3cqZAo" node="5X" resolve="ArgumentReference" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6N" role="3cqZAp">
+          <node concept="2OqwBi" id="78" role="3clFbG">
+            <node concept="37vLTw" id="79" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
+            </node>
+            <node concept="liA8E" id="7a" role="2OqNvi">
+              <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
+              <node concept="1adDum" id="7b" role="37wK5m">
+                <property role="1adDun" value="0x6c6d272a13d37a56L" />
+              </node>
+              <node concept="37vLTw" id="7c" role="37wK5m">
+                <ref role="3cqZAo" node="5Y" resolve="CustomAssertionBlock" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="4Z" role="3cqZAp">
-          <node concept="2OqwBi" id="5h" role="3clFbG">
-            <node concept="37vLTw" id="5i" role="2Oq$k0">
-              <ref role="3cqZAo" node="56" resolve="builder" />
+        <node concept="3clFbF" id="6O" role="3cqZAp">
+          <node concept="2OqwBi" id="7d" role="3clFbG">
+            <node concept="37vLTw" id="7e" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
             </node>
-            <node concept="liA8E" id="5j" role="2OqNvi">
+            <node concept="liA8E" id="7f" role="2OqNvi">
               <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
-              <node concept="1adDum" id="5k" role="37wK5m">
+              <node concept="1adDum" id="7g" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf092beL" />
               </node>
-              <node concept="37vLTw" id="5l" role="37wK5m">
-                <ref role="3cqZAo" node="4m" resolve="GeneratorTest" />
+              <node concept="37vLTw" id="7h" role="37wK5m">
+                <ref role="3cqZAo" node="5Z" resolve="GeneratorTest" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="50" role="3cqZAp">
-          <node concept="2OqwBi" id="5m" role="3clFbG">
-            <node concept="37vLTw" id="5n" role="2Oq$k0">
-              <ref role="3cqZAo" node="56" resolve="builder" />
+        <node concept="3clFbF" id="6P" role="3cqZAp">
+          <node concept="2OqwBi" id="7i" role="3clFbG">
+            <node concept="37vLTw" id="7j" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
             </node>
-            <node concept="liA8E" id="5o" role="2OqNvi">
+            <node concept="liA8E" id="7k" role="2OqNvi">
               <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
-              <node concept="1adDum" id="5p" role="37wK5m">
+              <node concept="1adDum" id="7l" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf09c6eL" />
               </node>
-              <node concept="37vLTw" id="5q" role="37wK5m">
-                <ref role="3cqZAo" node="4n" resolve="ModelArgument" />
+              <node concept="37vLTw" id="7m" role="37wK5m">
+                <ref role="3cqZAo" node="60" resolve="ModelArgument" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6Q" role="3cqZAp">
+          <node concept="2OqwBi" id="7n" role="3clFbG">
+            <node concept="37vLTw" id="7o" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
+            </node>
+            <node concept="liA8E" id="7p" role="2OqNvi">
+              <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
+              <node concept="1adDum" id="7q" role="37wK5m">
+                <property role="1adDun" value="0x6c6d272a13d3b3b1L" />
+              </node>
+              <node concept="37vLTw" id="7r" role="37wK5m">
+                <ref role="3cqZAo" node="61" resolve="Model_ConceptFunctionParameter" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="51" role="3cqZAp">
-          <node concept="2OqwBi" id="5r" role="3clFbG">
-            <node concept="37vLTw" id="5s" role="2Oq$k0">
-              <ref role="3cqZAo" node="56" resolve="builder" />
+        <node concept="3clFbF" id="6R" role="3cqZAp">
+          <node concept="2OqwBi" id="7s" role="3clFbG">
+            <node concept="37vLTw" id="7t" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
             </node>
-            <node concept="liA8E" id="5t" role="2OqNvi">
+            <node concept="liA8E" id="7u" role="2OqNvi">
               <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
-              <node concept="1adDum" id="5u" role="37wK5m">
+              <node concept="1adDum" id="7v" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf09c6aL" />
               </node>
-              <node concept="37vLTw" id="5v" role="37wK5m">
-                <ref role="3cqZAo" node="4o" resolve="TestArgument" />
+              <node concept="37vLTw" id="7w" role="37wK5m">
+                <ref role="3cqZAo" node="62" resolve="TestArgument" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="52" role="3cqZAp">
-          <node concept="2OqwBi" id="5w" role="3clFbG">
-            <node concept="37vLTw" id="5x" role="2Oq$k0">
-              <ref role="3cqZAo" node="56" resolve="builder" />
+        <node concept="3clFbF" id="6S" role="3cqZAp">
+          <node concept="2OqwBi" id="7x" role="3clFbG">
+            <node concept="37vLTw" id="7y" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
             </node>
-            <node concept="liA8E" id="5y" role="2OqNvi">
+            <node concept="liA8E" id="7z" role="2OqNvi">
               <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
-              <node concept="1adDum" id="5z" role="37wK5m">
+              <node concept="1adDum" id="7$" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf0d058L" />
               </node>
-              <node concept="37vLTw" id="5$" role="37wK5m">
-                <ref role="3cqZAo" node="4p" resolve="TestAssertion" />
+              <node concept="37vLTw" id="7_" role="37wK5m">
+                <ref role="3cqZAo" node="63" resolve="TestAssertion" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="53" role="3cqZAp">
-          <node concept="2OqwBi" id="5_" role="3clFbG">
-            <node concept="37vLTw" id="5A" role="2Oq$k0">
-              <ref role="3cqZAo" node="56" resolve="builder" />
+        <node concept="3clFbF" id="6T" role="3cqZAp">
+          <node concept="2OqwBi" id="7A" role="3clFbG">
+            <node concept="37vLTw" id="7B" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
             </node>
-            <node concept="liA8E" id="5B" role="2OqNvi">
+            <node concept="liA8E" id="7C" role="2OqNvi">
               <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
-              <node concept="1adDum" id="5C" role="37wK5m">
+              <node concept="1adDum" id="7D" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf0d057L" />
               </node>
-              <node concept="37vLTw" id="5D" role="37wK5m">
-                <ref role="3cqZAo" node="4q" resolve="TransformationMatchAssertion" />
+              <node concept="37vLTw" id="7E" role="37wK5m">
+                <ref role="3cqZAo" node="64" resolve="TransformationMatchAssertion" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="54" role="3cqZAp">
-          <node concept="2OqwBi" id="5E" role="3clFbG">
-            <node concept="37vLTw" id="5F" role="2Oq$k0">
-              <ref role="3cqZAo" node="56" resolve="builder" />
+        <node concept="3clFbF" id="6U" role="3cqZAp">
+          <node concept="2OqwBi" id="7F" role="3clFbG">
+            <node concept="37vLTw" id="7G" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
             </node>
-            <node concept="liA8E" id="5G" role="2OqNvi">
+            <node concept="liA8E" id="7H" role="2OqNvi">
               <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
-              <node concept="1adDum" id="5H" role="37wK5m">
+              <node concept="1adDum" id="7I" role="37wK5m">
+                <property role="1adDun" value="0x6c6d272a13d346a9L" />
+              </node>
+              <node concept="37vLTw" id="7J" role="37wK5m">
+                <ref role="3cqZAo" node="65" resolve="TransformationMatchCustomConditions" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6V" role="3cqZAp">
+          <node concept="2OqwBi" id="7K" role="3clFbG">
+            <node concept="37vLTw" id="7L" role="2Oq$k0">
+              <ref role="3cqZAo" node="6X" resolve="builder" />
+            </node>
+            <node concept="liA8E" id="7M" role="2OqNvi">
+              <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.put(long,int):jetbrains.mps.lang.smodel.LanguageConceptIndexBuilder" resolve="put" />
+              <node concept="1adDum" id="7N" role="37wK5m">
                 <property role="1adDun" value="0x5812b95d667f29d9L" />
               </node>
-              <node concept="37vLTw" id="5I" role="37wK5m">
-                <ref role="3cqZAo" node="4r" resolve="TransformationMatchManyAssertion" />
+              <node concept="37vLTw" id="7O" role="37wK5m">
+                <ref role="3cqZAo" node="66" resolve="TransformationMatchManyAssertion" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="55" role="3cqZAp">
-          <node concept="37vLTI" id="5J" role="3clFbG">
-            <node concept="2OqwBi" id="5K" role="37vLTx">
-              <node concept="37vLTw" id="5M" role="2Oq$k0">
-                <ref role="3cqZAo" node="56" resolve="builder" />
+        <node concept="3clFbF" id="6W" role="3cqZAp">
+          <node concept="37vLTI" id="7P" role="3clFbG">
+            <node concept="2OqwBi" id="7Q" role="37vLTx">
+              <node concept="37vLTw" id="7S" role="2Oq$k0">
+                <ref role="3cqZAo" node="6X" resolve="builder" />
               </node>
-              <node concept="liA8E" id="5N" role="2OqNvi">
+              <node concept="liA8E" id="7T" role="2OqNvi">
                 <ref role="37wK5l" to="ksn4:~LanguageConceptIndexBuilder.seal():jetbrains.mps.lang.smodel.LanguageConceptIndex" resolve="seal" />
               </node>
             </node>
-            <node concept="37vLTw" id="5L" role="37vLTJ">
-              <ref role="3cqZAo" node="4k" resolve="myIndex" />
+            <node concept="37vLTw" id="7R" role="37vLTJ">
+              <ref role="3cqZAo" node="5W" resolve="myIndex" />
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4u" role="jymVt" />
-    <node concept="3clFb_" id="4v" role="jymVt">
+    <node concept="2tJIrI" id="69" role="jymVt" />
+    <node concept="3clFb_" id="6a" role="jymVt">
       <property role="TrG5h" value="index" />
-      <node concept="10Oyi0" id="5O" role="3clF45" />
-      <node concept="3clFbS" id="5P" role="3clF47">
-        <node concept="3cpWs6" id="5R" role="3cqZAp">
-          <node concept="2OqwBi" id="5S" role="3cqZAk">
-            <node concept="37vLTw" id="5T" role="2Oq$k0">
-              <ref role="3cqZAo" node="4k" resolve="myIndex" />
-            </node>
-            <node concept="liA8E" id="5U" role="2OqNvi">
+      <node concept="10Oyi0" id="7U" role="3clF45" />
+      <node concept="3clFbS" id="7V" role="3clF47">
+        <node concept="3cpWs6" id="7X" role="3cqZAp">
+          <node concept="2OqwBi" id="7Y" role="3cqZAk">
+            <node concept="37vLTw" id="7Z" role="2Oq$k0">
+              <ref role="3cqZAo" node="5W" resolve="myIndex" />
+            </node>
+            <node concept="liA8E" id="80" role="2OqNvi">
               <ref role="37wK5l" to="ksn4:~LanguageConceptIndex.index(jetbrains.mps.smodel.adapter.ids.SConceptId):int" resolve="index" />
-              <node concept="37vLTw" id="5V" role="37wK5m">
-                <ref role="3cqZAo" node="5Q" resolve="cid" />
+              <node concept="37vLTw" id="81" role="37wK5m">
+                <ref role="3cqZAo" node="7W" resolve="cid" />
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="5Q" role="3clF46">
+      <node concept="37vLTG" id="7W" role="3clF46">
         <property role="TrG5h" value="cid" />
-        <node concept="3uibUv" id="5W" role="1tU5fm">
+        <node concept="3uibUv" id="82" role="1tU5fm">
           <ref role="3uigEE" to="e8bb:~SConceptId" resolve="SConceptId" />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4w" role="jymVt" />
-    <node concept="3clFb_" id="4x" role="jymVt">
+    <node concept="2tJIrI" id="6b" role="jymVt" />
+    <node concept="3clFb_" id="6c" role="jymVt">
       <property role="TrG5h" value="index" />
-      <node concept="10Oyi0" id="5X" role="3clF45" />
-      <node concept="3Tm1VV" id="5Y" role="1B3o_S" />
-      <node concept="3clFbS" id="5Z" role="3clF47">
-        <node concept="3cpWs6" id="61" role="3cqZAp">
-          <node concept="2OqwBi" id="62" role="3cqZAk">
-            <node concept="37vLTw" id="63" role="2Oq$k0">
-              <ref role="3cqZAo" node="4k" resolve="myIndex" />
-            </node>
-            <node concept="liA8E" id="64" role="2OqNvi">
+      <node concept="10Oyi0" id="83" role="3clF45" />
+      <node concept="3Tm1VV" id="84" role="1B3o_S" />
+      <node concept="3clFbS" id="85" role="3clF47">
+        <node concept="3cpWs6" id="87" role="3cqZAp">
+          <node concept="2OqwBi" id="88" role="3cqZAk">
+            <node concept="37vLTw" id="89" role="2Oq$k0">
+              <ref role="3cqZAo" node="5W" resolve="myIndex" />
+            </node>
+            <node concept="liA8E" id="8a" role="2OqNvi">
               <ref role="37wK5l" to="ksn4:~ConceptIndex.index(org.jetbrains.mps.openapi.language.SAbstractConcept):int" resolve="index" />
-              <node concept="37vLTw" id="65" role="37wK5m">
-                <ref role="3cqZAo" node="60" resolve="concept" />
+              <node concept="37vLTw" id="8b" role="37wK5m">
+                <ref role="3cqZAo" node="86" resolve="concept" />
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="60" role="3clF46">
+      <node concept="37vLTG" id="86" role="3clF46">
         <property role="TrG5h" value="concept" />
-        <node concept="3uibUv" id="66" role="1tU5fm">
+        <node concept="3uibUv" id="8c" role="1tU5fm">
           <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
         </node>
       </node>
     </node>
-    <node concept="3Tm1VV" id="4y" role="1B3o_S" />
+    <node concept="3Tm1VV" id="6d" role="1B3o_S" />
   </node>
-  <node concept="312cEu" id="67">
+  <node concept="312cEu" id="8d">
     <property role="TrG5h" value="StructureAspectDescriptor" />
-    <node concept="3uibUv" id="68" role="1zkMxy">
+    <node concept="3uibUv" id="8e" role="1zkMxy">
       <ref role="3uigEE" to="ze1i:~BaseStructureAspectDescriptor" resolve="BaseStructureAspectDescriptor" />
     </node>
-    <node concept="312cEg" id="69" role="jymVt">
+    <node concept="312cEg" id="8f" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="true" />
       <property role="TrG5h" value="myConceptArgumentReference" />
-      <node concept="3uibUv" id="6y" role="1tU5fm">
+      <node concept="3uibUv" id="8I" role="1tU5fm">
+        <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
+      </node>
+      <node concept="1rXfSq" id="8J" role="33vP2m">
+        <ref role="37wK5l" node="8$" resolve="createDescriptorForArgumentReference" />
+      </node>
+    </node>
+    <node concept="312cEg" id="8g" role="jymVt">
+      <property role="eg7rD" value="false" />
+      <property role="34CwA1" value="false" />
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="myConceptCustomAssertionBlock" />
+      <node concept="3uibUv" id="8K" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
-      <node concept="1rXfSq" id="6z" role="33vP2m">
-        <ref role="37wK5l" node="6r" resolve="createDescriptorForArgumentReference" />
+      <node concept="1rXfSq" id="8L" role="33vP2m">
+        <ref role="37wK5l" node="8_" resolve="createDescriptorForCustomAssertionBlock" />
       </node>
     </node>
-    <node concept="312cEg" id="6a" role="jymVt">
+    <node concept="312cEg" id="8h" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="true" />
       <property role="TrG5h" value="myConceptGeneratorTest" />
-      <node concept="3uibUv" id="6$" role="1tU5fm">
+      <node concept="3uibUv" id="8M" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
-      <node concept="1rXfSq" id="6_" role="33vP2m">
-        <ref role="37wK5l" node="6s" resolve="createDescriptorForGeneratorTest" />
+      <node concept="1rXfSq" id="8N" role="33vP2m">
+        <ref role="37wK5l" node="8A" resolve="createDescriptorForGeneratorTest" />
       </node>
     </node>
-    <node concept="312cEg" id="6b" role="jymVt">
+    <node concept="312cEg" id="8i" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="true" />
       <property role="TrG5h" value="myConceptModelArgument" />
-      <node concept="3uibUv" id="6A" role="1tU5fm">
+      <node concept="3uibUv" id="8O" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
-      <node concept="1rXfSq" id="6B" role="33vP2m">
-        <ref role="37wK5l" node="6t" resolve="createDescriptorForModelArgument" />
+      <node concept="1rXfSq" id="8P" role="33vP2m">
+        <ref role="37wK5l" node="8B" resolve="createDescriptorForModelArgument" />
       </node>
     </node>
-    <node concept="312cEg" id="6c" role="jymVt">
+    <node concept="312cEg" id="8j" role="jymVt">
+      <property role="eg7rD" value="false" />
+      <property role="34CwA1" value="false" />
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="myConceptModel_ConceptFunctionParameter" />
+      <node concept="3uibUv" id="8Q" role="1tU5fm">
+        <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
+      </node>
+      <node concept="1rXfSq" id="8R" role="33vP2m">
+        <ref role="37wK5l" node="8C" resolve="createDescriptorForModel_ConceptFunctionParameter" />
+      </node>
+    </node>
+    <node concept="312cEg" id="8k" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="true" />
       <property role="TrG5h" value="myConceptTestArgument" />
-      <node concept="3uibUv" id="6C" role="1tU5fm">
+      <node concept="3uibUv" id="8S" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
-      <node concept="1rXfSq" id="6D" role="33vP2m">
-        <ref role="37wK5l" node="6u" resolve="createDescriptorForTestArgument" />
+      <node concept="1rXfSq" id="8T" role="33vP2m">
+        <ref role="37wK5l" node="8D" resolve="createDescriptorForTestArgument" />
       </node>
     </node>
-    <node concept="312cEg" id="6d" role="jymVt">
+    <node concept="312cEg" id="8l" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="true" />
       <property role="TrG5h" value="myConceptTestAssertion" />
-      <node concept="3uibUv" id="6E" role="1tU5fm">
+      <node concept="3uibUv" id="8U" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
-      <node concept="1rXfSq" id="6F" role="33vP2m">
-        <ref role="37wK5l" node="6v" resolve="createDescriptorForTestAssertion" />
+      <node concept="1rXfSq" id="8V" role="33vP2m">
+        <ref role="37wK5l" node="8E" resolve="createDescriptorForTestAssertion" />
       </node>
     </node>
-    <node concept="312cEg" id="6e" role="jymVt">
+    <node concept="312cEg" id="8m" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="true" />
       <property role="TrG5h" value="myConceptTransformationMatchAssertion" />
-      <node concept="3uibUv" id="6G" role="1tU5fm">
+      <node concept="3uibUv" id="8W" role="1tU5fm">
+        <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
+      </node>
+      <node concept="1rXfSq" id="8X" role="33vP2m">
+        <ref role="37wK5l" node="8F" resolve="createDescriptorForTransformationMatchAssertion" />
+      </node>
+    </node>
+    <node concept="312cEg" id="8n" role="jymVt">
+      <property role="eg7rD" value="false" />
+      <property role="34CwA1" value="false" />
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="myConceptTransformationMatchCustomConditions" />
+      <node concept="3uibUv" id="8Y" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
-      <node concept="1rXfSq" id="6H" role="33vP2m">
-        <ref role="37wK5l" node="6w" resolve="createDescriptorForTransformationMatchAssertion" />
+      <node concept="1rXfSq" id="8Z" role="33vP2m">
+        <ref role="37wK5l" node="8G" resolve="createDescriptorForTransformationMatchCustomConditions" />
       </node>
     </node>
-    <node concept="312cEg" id="6f" role="jymVt">
+    <node concept="312cEg" id="8o" role="jymVt">
       <property role="eg7rD" value="false" />
       <property role="34CwA1" value="false" />
       <property role="3TUv4t" value="true" />
       <property role="TrG5h" value="myConceptTransformationMatchManyAssertion" />
-      <node concept="3uibUv" id="6I" role="1tU5fm">
+      <node concept="3uibUv" id="90" role="1tU5fm">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
-      <node concept="1rXfSq" id="6J" role="33vP2m">
-        <ref role="37wK5l" node="6x" resolve="createDescriptorForTransformationMatchManyAssertion" />
+      <node concept="1rXfSq" id="91" role="33vP2m">
+        <ref role="37wK5l" node="8H" resolve="createDescriptorForTransformationMatchManyAssertion" />
       </node>
     </node>
-    <node concept="312cEg" id="6g" role="jymVt">
+    <node concept="312cEg" id="8p" role="jymVt">
       <property role="TrG5h" value="myIndexSwitch" />
       <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="6K" role="1B3o_S" />
-      <node concept="3uibUv" id="6L" role="1tU5fm">
-        <ref role="3uigEE" node="4j" resolve="LanguageConceptSwitch" />
+      <node concept="3Tm6S6" id="92" role="1B3o_S" />
+      <node concept="3uibUv" id="93" role="1tU5fm">
+        <ref role="3uigEE" node="5V" resolve="LanguageConceptSwitch" />
       </node>
     </node>
-    <node concept="3Tm1VV" id="6h" role="1B3o_S" />
-    <node concept="2tJIrI" id="6i" role="jymVt" />
-    <node concept="3clFbW" id="6j" role="jymVt">
-      <node concept="3cqZAl" id="6M" role="3clF45" />
-      <node concept="3Tm1VV" id="6N" role="1B3o_S" />
-      <node concept="3clFbS" id="6O" role="3clF47">
-        <node concept="3clFbF" id="6P" role="3cqZAp">
-          <node concept="37vLTI" id="6Q" role="3clFbG">
-            <node concept="2ShNRf" id="6R" role="37vLTx">
-              <node concept="1pGfFk" id="6T" role="2ShVmc">
-                <ref role="37wK5l" node="4t" resolve="LanguageConceptSwitch" />
+    <node concept="3Tm1VV" id="8q" role="1B3o_S" />
+    <node concept="2tJIrI" id="8r" role="jymVt" />
+    <node concept="3clFbW" id="8s" role="jymVt">
+      <node concept="3cqZAl" id="94" role="3clF45" />
+      <node concept="3Tm1VV" id="95" role="1B3o_S" />
+      <node concept="3clFbS" id="96" role="3clF47">
+        <node concept="3clFbF" id="97" role="3cqZAp">
+          <node concept="37vLTI" id="98" role="3clFbG">
+            <node concept="2ShNRf" id="99" role="37vLTx">
+              <node concept="1pGfFk" id="9b" role="2ShVmc">
+                <ref role="37wK5l" node="68" resolve="LanguageConceptSwitch" />
               </node>
             </node>
-            <node concept="37vLTw" id="6S" role="37vLTJ">
-              <ref role="3cqZAo" node="6g" resolve="myIndexSwitch" />
+            <node concept="37vLTw" id="9a" role="37vLTJ">
+              <ref role="3cqZAo" node="8p" resolve="myIndexSwitch" />
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="6k" role="jymVt" />
-    <node concept="3clFb_" id="6l" role="jymVt">
+    <node concept="2tJIrI" id="8t" role="jymVt" />
+    <node concept="3clFb_" id="8u" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="od$2w" value="false" />
       <property role="TrG5h" value="getDescriptors" />
       <property role="DiZV1" value="false" />
-      <node concept="3clFbS" id="6U" role="3clF47">
-        <node concept="3cpWs6" id="6Y" role="3cqZAp">
-          <node concept="2YIFZM" id="6Z" role="3cqZAk">
+      <node concept="3clFbS" id="9c" role="3clF47">
+        <node concept="3cpWs6" id="9g" role="3cqZAp">
+          <node concept="2YIFZM" id="9h" role="3cqZAk">
             <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
             <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
-            <node concept="37vLTw" id="70" role="37wK5m">
-              <ref role="3cqZAo" node="69" resolve="myConceptArgumentReference" />
+            <node concept="37vLTw" id="9i" role="37wK5m">
+              <ref role="3cqZAo" node="8f" resolve="myConceptArgumentReference" />
+            </node>
+            <node concept="37vLTw" id="9j" role="37wK5m">
+              <ref role="3cqZAo" node="8g" resolve="myConceptCustomAssertionBlock" />
             </node>
-            <node concept="37vLTw" id="71" role="37wK5m">
-              <ref role="3cqZAo" node="6a" resolve="myConceptGeneratorTest" />
+            <node concept="37vLTw" id="9k" role="37wK5m">
+              <ref role="3cqZAo" node="8h" resolve="myConceptGeneratorTest" />
             </node>
-            <node concept="37vLTw" id="72" role="37wK5m">
-              <ref role="3cqZAo" node="6b" resolve="myConceptModelArgument" />
+            <node concept="37vLTw" id="9l" role="37wK5m">
+              <ref role="3cqZAo" node="8i" resolve="myConceptModelArgument" />
             </node>
-            <node concept="37vLTw" id="73" role="37wK5m">
-              <ref role="3cqZAo" node="6c" resolve="myConceptTestArgument" />
+            <node concept="37vLTw" id="9m" role="37wK5m">
+              <ref role="3cqZAo" node="8j" resolve="myConceptModel_ConceptFunctionParameter" />
             </node>
-            <node concept="37vLTw" id="74" role="37wK5m">
-              <ref role="3cqZAo" node="6d" resolve="myConceptTestAssertion" />
+            <node concept="37vLTw" id="9n" role="37wK5m">
+              <ref role="3cqZAo" node="8k" resolve="myConceptTestArgument" />
             </node>
-            <node concept="37vLTw" id="75" role="37wK5m">
-              <ref role="3cqZAo" node="6e" resolve="myConceptTransformationMatchAssertion" />
+            <node concept="37vLTw" id="9o" role="37wK5m">
+              <ref role="3cqZAo" node="8l" resolve="myConceptTestAssertion" />
             </node>
-            <node concept="37vLTw" id="76" role="37wK5m">
-              <ref role="3cqZAo" node="6f" resolve="myConceptTransformationMatchManyAssertion" />
+            <node concept="37vLTw" id="9p" role="37wK5m">
+              <ref role="3cqZAo" node="8m" resolve="myConceptTransformationMatchAssertion" />
+            </node>
+            <node concept="37vLTw" id="9q" role="37wK5m">
+              <ref role="3cqZAo" node="8n" resolve="myConceptTransformationMatchCustomConditions" />
+            </node>
+            <node concept="37vLTw" id="9r" role="37wK5m">
+              <ref role="3cqZAo" node="8o" resolve="myConceptTransformationMatchManyAssertion" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="6V" role="1B3o_S" />
-      <node concept="3uibUv" id="6W" role="3clF45">
+      <node concept="3Tm1VV" id="9d" role="1B3o_S" />
+      <node concept="3uibUv" id="9e" role="3clF45">
         <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-        <node concept="3uibUv" id="77" role="11_B2D">
+        <node concept="3uibUv" id="9s" role="11_B2D">
           <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
         </node>
       </node>
-      <node concept="2AHcQZ" id="6X" role="2AJF6D">
+      <node concept="2AHcQZ" id="9f" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="6m" role="jymVt" />
-    <node concept="3clFb_" id="6n" role="jymVt">
+    <node concept="2tJIrI" id="8v" role="jymVt" />
+    <node concept="3clFb_" id="8w" role="jymVt">
       <property role="IEkAT" value="false" />
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getDescriptor" />
       <property role="DiZV1" value="false" />
-      <node concept="3Tm1VV" id="78" role="1B3o_S" />
-      <node concept="37vLTG" id="79" role="3clF46">
+      <node concept="3Tm1VV" id="9t" role="1B3o_S" />
+      <node concept="37vLTG" id="9u" role="3clF46">
         <property role="TrG5h" value="id" />
-        <node concept="3uibUv" id="7e" role="1tU5fm">
+        <node concept="3uibUv" id="9z" role="1tU5fm">
           <ref role="3uigEE" to="e8bb:~SConceptId" resolve="SConceptId" />
         </node>
       </node>
-      <node concept="3clFbS" id="7a" role="3clF47">
-        <node concept="3KaCP$" id="7f" role="3cqZAp">
-          <node concept="3KbdKl" id="7g" role="3KbHQx">
-            <node concept="3clFbS" id="7p" role="3Kbo56">
-              <node concept="3cpWs6" id="7r" role="3cqZAp">
-                <node concept="37vLTw" id="7s" role="3cqZAk">
-                  <ref role="3cqZAo" node="69" resolve="myConceptArgumentReference" />
+      <node concept="3clFbS" id="9v" role="3clF47">
+        <node concept="3KaCP$" id="9$" role="3cqZAp">
+          <node concept="3KbdKl" id="9_" role="3KbHQx">
+            <node concept="3clFbS" id="9L" role="3Kbo56">
+              <node concept="3cpWs6" id="9N" role="3cqZAp">
+                <node concept="37vLTw" id="9O" role="3cqZAk">
+                  <ref role="3cqZAo" node="8f" resolve="myConceptArgumentReference" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="7q" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4l" resolve="ArgumentReference" />
+            <node concept="10M0yZ" id="9M" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="5X" resolve="ArgumentReference" />
             </node>
           </node>
-          <node concept="3KbdKl" id="7h" role="3KbHQx">
-            <node concept="3clFbS" id="7t" role="3Kbo56">
-              <node concept="3cpWs6" id="7v" role="3cqZAp">
-                <node concept="37vLTw" id="7w" role="3cqZAk">
-                  <ref role="3cqZAo" node="6a" resolve="myConceptGeneratorTest" />
+          <node concept="3KbdKl" id="9A" role="3KbHQx">
+            <node concept="3clFbS" id="9P" role="3Kbo56">
+              <node concept="3cpWs6" id="9R" role="3cqZAp">
+                <node concept="37vLTw" id="9S" role="3cqZAk">
+                  <ref role="3cqZAo" node="8g" resolve="myConceptCustomAssertionBlock" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="7u" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4m" resolve="GeneratorTest" />
+            <node concept="10M0yZ" id="9Q" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="5Y" resolve="CustomAssertionBlock" />
             </node>
           </node>
-          <node concept="3KbdKl" id="7i" role="3KbHQx">
-            <node concept="3clFbS" id="7x" role="3Kbo56">
-              <node concept="3cpWs6" id="7z" role="3cqZAp">
-                <node concept="37vLTw" id="7$" role="3cqZAk">
-                  <ref role="3cqZAo" node="6b" resolve="myConceptModelArgument" />
+          <node concept="3KbdKl" id="9B" role="3KbHQx">
+            <node concept="3clFbS" id="9T" role="3Kbo56">
+              <node concept="3cpWs6" id="9V" role="3cqZAp">
+                <node concept="37vLTw" id="9W" role="3cqZAk">
+                  <ref role="3cqZAo" node="8h" resolve="myConceptGeneratorTest" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="7y" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4n" resolve="ModelArgument" />
+            <node concept="10M0yZ" id="9U" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="5Z" resolve="GeneratorTest" />
             </node>
           </node>
-          <node concept="3KbdKl" id="7j" role="3KbHQx">
-            <node concept="3clFbS" id="7_" role="3Kbo56">
-              <node concept="3cpWs6" id="7B" role="3cqZAp">
-                <node concept="37vLTw" id="7C" role="3cqZAk">
-                  <ref role="3cqZAo" node="6c" resolve="myConceptTestArgument" />
+          <node concept="3KbdKl" id="9C" role="3KbHQx">
+            <node concept="3clFbS" id="9X" role="3Kbo56">
+              <node concept="3cpWs6" id="9Z" role="3cqZAp">
+                <node concept="37vLTw" id="a0" role="3cqZAk">
+                  <ref role="3cqZAo" node="8i" resolve="myConceptModelArgument" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="7A" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4o" resolve="TestArgument" />
+            <node concept="10M0yZ" id="9Y" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="60" resolve="ModelArgument" />
             </node>
           </node>
-          <node concept="3KbdKl" id="7k" role="3KbHQx">
-            <node concept="3clFbS" id="7D" role="3Kbo56">
-              <node concept="3cpWs6" id="7F" role="3cqZAp">
-                <node concept="37vLTw" id="7G" role="3cqZAk">
-                  <ref role="3cqZAo" node="6d" resolve="myConceptTestAssertion" />
+          <node concept="3KbdKl" id="9D" role="3KbHQx">
+            <node concept="3clFbS" id="a1" role="3Kbo56">
+              <node concept="3cpWs6" id="a3" role="3cqZAp">
+                <node concept="37vLTw" id="a4" role="3cqZAk">
+                  <ref role="3cqZAo" node="8j" resolve="myConceptModel_ConceptFunctionParameter" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="7E" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4p" resolve="TestAssertion" />
+            <node concept="10M0yZ" id="a2" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="61" resolve="Model_ConceptFunctionParameter" />
             </node>
           </node>
-          <node concept="3KbdKl" id="7l" role="3KbHQx">
-            <node concept="3clFbS" id="7H" role="3Kbo56">
-              <node concept="3cpWs6" id="7J" role="3cqZAp">
-                <node concept="37vLTw" id="7K" role="3cqZAk">
-                  <ref role="3cqZAo" node="6e" resolve="myConceptTransformationMatchAssertion" />
+          <node concept="3KbdKl" id="9E" role="3KbHQx">
+            <node concept="3clFbS" id="a5" role="3Kbo56">
+              <node concept="3cpWs6" id="a7" role="3cqZAp">
+                <node concept="37vLTw" id="a8" role="3cqZAk">
+                  <ref role="3cqZAo" node="8k" resolve="myConceptTestArgument" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="7I" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4q" resolve="TransformationMatchAssertion" />
+            <node concept="10M0yZ" id="a6" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="62" resolve="TestArgument" />
             </node>
           </node>
-          <node concept="3KbdKl" id="7m" role="3KbHQx">
-            <node concept="3clFbS" id="7L" role="3Kbo56">
-              <node concept="3cpWs6" id="7N" role="3cqZAp">
-                <node concept="37vLTw" id="7O" role="3cqZAk">
-                  <ref role="3cqZAo" node="6f" resolve="myConceptTransformationMatchManyAssertion" />
+          <node concept="3KbdKl" id="9F" role="3KbHQx">
+            <node concept="3clFbS" id="a9" role="3Kbo56">
+              <node concept="3cpWs6" id="ab" role="3cqZAp">
+                <node concept="37vLTw" id="ac" role="3cqZAk">
+                  <ref role="3cqZAo" node="8l" resolve="myConceptTestAssertion" />
                 </node>
               </node>
             </node>
-            <node concept="10M0yZ" id="7M" role="3Kbmr1">
-              <ref role="1PxDUh" node="4j" resolve="LanguageConceptSwitch" />
-              <ref role="3cqZAo" node="4r" resolve="TransformationMatchManyAssertion" />
+            <node concept="10M0yZ" id="aa" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="63" resolve="TestAssertion" />
             </node>
           </node>
-          <node concept="2OqwBi" id="7n" role="3KbGdf">
-            <node concept="37vLTw" id="7P" role="2Oq$k0">
-              <ref role="3cqZAo" node="6g" resolve="myIndexSwitch" />
-            </node>
-            <node concept="liA8E" id="7Q" role="2OqNvi">
-              <ref role="37wK5l" node="4v" resolve="index" />
-              <node concept="37vLTw" id="7R" role="37wK5m">
-                <ref role="3cqZAo" node="79" resolve="id" />
+          <node concept="3KbdKl" id="9G" role="3KbHQx">
+            <node concept="3clFbS" id="ad" role="3Kbo56">
+              <node concept="3cpWs6" id="af" role="3cqZAp">
+                <node concept="37vLTw" id="ag" role="3cqZAk">
+                  <ref role="3cqZAo" node="8m" resolve="myConceptTransformationMatchAssertion" />
+                </node>
               </node>
             </node>
+            <node concept="10M0yZ" id="ae" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="64" resolve="TransformationMatchAssertion" />
+            </node>
           </node>
-          <node concept="3clFbS" id="7o" role="3Kb1Dw">
-            <node concept="3cpWs6" id="7S" role="3cqZAp">
-              <node concept="10Nm6u" id="7T" role="3cqZAk" />
+          <node concept="3KbdKl" id="9H" role="3KbHQx">
+            <node concept="3clFbS" id="ah" role="3Kbo56">
+              <node concept="3cpWs6" id="aj" role="3cqZAp">
+                <node concept="37vLTw" id="ak" role="3cqZAk">
+                  <ref role="3cqZAo" node="8n" resolve="myConceptTransformationMatchCustomConditions" />
+                </node>
+              </node>
+            </node>
+            <node concept="10M0yZ" id="ai" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="65" resolve="TransformationMatchCustomConditions" />
+            </node>
+          </node>
+          <node concept="3KbdKl" id="9I" role="3KbHQx">
+            <node concept="3clFbS" id="al" role="3Kbo56">
+              <node concept="3cpWs6" id="an" role="3cqZAp">
+                <node concept="37vLTw" id="ao" role="3cqZAk">
+                  <ref role="3cqZAo" node="8o" resolve="myConceptTransformationMatchManyAssertion" />
+                </node>
+              </node>
+            </node>
+            <node concept="10M0yZ" id="am" role="3Kbmr1">
+              <ref role="1PxDUh" node="5V" resolve="LanguageConceptSwitch" />
+              <ref role="3cqZAo" node="66" resolve="TransformationMatchManyAssertion" />
+            </node>
+          </node>
+          <node concept="2OqwBi" id="9J" role="3KbGdf">
+            <node concept="37vLTw" id="ap" role="2Oq$k0">
+              <ref role="3cqZAo" node="8p" resolve="myIndexSwitch" />
+            </node>
+            <node concept="liA8E" id="aq" role="2OqNvi">
+              <ref role="37wK5l" node="6a" resolve="index" />
+              <node concept="37vLTw" id="ar" role="37wK5m">
+                <ref role="3cqZAo" node="9u" resolve="id" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbS" id="9K" role="3Kb1Dw">
+            <node concept="3cpWs6" id="as" role="3cqZAp">
+              <node concept="10Nm6u" id="at" role="3cqZAk" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3uibUv" id="7b" role="3clF45">
+      <node concept="3uibUv" id="9w" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
-      <node concept="2AHcQZ" id="7c" role="2AJF6D">
+      <node concept="2AHcQZ" id="9x" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="2AHcQZ" id="7d" role="2AJF6D">
+      <node concept="2AHcQZ" id="9y" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
     </node>
-    <node concept="2tJIrI" id="6o" role="jymVt" />
-    <node concept="3clFb_" id="6p" role="jymVt">
+    <node concept="2tJIrI" id="8x" role="jymVt" />
+    <node concept="3clFb_" id="8y" role="jymVt">
       <property role="TrG5h" value="internalIndex" />
-      <node concept="10Oyi0" id="7U" role="3clF45" />
-      <node concept="3clFbS" id="7V" role="3clF47">
-        <node concept="3cpWs6" id="7X" role="3cqZAp">
-          <node concept="2OqwBi" id="7Y" role="3cqZAk">
-            <node concept="37vLTw" id="7Z" role="2Oq$k0">
-              <ref role="3cqZAo" node="6g" resolve="myIndexSwitch" />
+      <node concept="10Oyi0" id="au" role="3clF45" />
+      <node concept="3clFbS" id="av" role="3clF47">
+        <node concept="3cpWs6" id="ax" role="3cqZAp">
+          <node concept="2OqwBi" id="ay" role="3cqZAk">
+            <node concept="37vLTw" id="az" role="2Oq$k0">
+              <ref role="3cqZAo" node="8p" resolve="myIndexSwitch" />
             </node>
-            <node concept="liA8E" id="80" role="2OqNvi">
-              <ref role="37wK5l" node="4x" resolve="index" />
-              <node concept="37vLTw" id="81" role="37wK5m">
-                <ref role="3cqZAo" node="7W" resolve="c" />
+            <node concept="liA8E" id="a$" role="2OqNvi">
+              <ref role="37wK5l" node="6c" resolve="index" />
+              <node concept="37vLTw" id="a_" role="37wK5m">
+                <ref role="3cqZAo" node="aw" resolve="c" />
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="7W" role="3clF46">
+      <node concept="37vLTG" id="aw" role="3clF46">
         <property role="TrG5h" value="c" />
-        <node concept="3uibUv" id="82" role="1tU5fm">
+        <node concept="3uibUv" id="aA" role="1tU5fm">
           <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="6q" role="jymVt" />
-    <node concept="2YIFZL" id="6r" role="jymVt">
+    <node concept="2tJIrI" id="8z" role="jymVt" />
+    <node concept="2YIFZL" id="8$" role="jymVt">
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <property role="TrG5h" value="createDescriptorForArgumentReference" />
-      <node concept="3clFbS" id="83" role="3clF47">
-        <node concept="3cpWs8" id="86" role="3cqZAp">
-          <node concept="3cpWsn" id="8c" role="3cpWs9">
+      <node concept="3clFbS" id="aB" role="3clF47">
+        <node concept="3cpWs8" id="aE" role="3cqZAp">
+          <node concept="3cpWsn" id="aK" role="3cpWs9">
             <property role="TrG5h" value="b" />
-            <node concept="3uibUv" id="8d" role="1tU5fm">
+            <node concept="3uibUv" id="aL" role="1tU5fm">
               <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
             </node>
-            <node concept="2ShNRf" id="8e" role="33vP2m">
-              <node concept="1pGfFk" id="8f" role="2ShVmc">
+            <node concept="2ShNRf" id="aM" role="33vP2m">
+              <node concept="1pGfFk" id="aN" role="2ShVmc">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
-                <node concept="Xl_RD" id="8g" role="37wK5m">
+                <node concept="Xl_RD" id="aO" role="37wK5m">
                   <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
                 </node>
-                <node concept="Xl_RD" id="8h" role="37wK5m">
+                <node concept="Xl_RD" id="aP" role="37wK5m">
                   <property role="Xl_RC" value="ArgumentReference" />
                 </node>
-                <node concept="1adDum" id="8i" role="37wK5m">
+                <node concept="1adDum" id="aQ" role="37wK5m">
                   <property role="1adDun" value="0x68015e26cc4d49dbL" />
                 </node>
-                <node concept="1adDum" id="8j" role="37wK5m">
+                <node concept="1adDum" id="aR" role="37wK5m">
                   <property role="1adDun" value="0x8715b643faea1769L" />
                 </node>
-                <node concept="1adDum" id="8k" role="37wK5m">
+                <node concept="1adDum" id="aS" role="37wK5m">
                   <property role="1adDun" value="0x7b1db36ecf0d05bL" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="87" role="3cqZAp">
-          <node concept="2OqwBi" id="8l" role="3clFbG">
-            <node concept="37vLTw" id="8m" role="2Oq$k0">
-              <ref role="3cqZAo" node="8c" resolve="b" />
+        <node concept="3clFbF" id="aF" role="3cqZAp">
+          <node concept="2OqwBi" id="aT" role="3clFbG">
+            <node concept="37vLTw" id="aU" role="2Oq$k0">
+              <ref role="3cqZAo" node="aK" resolve="b" />
             </node>
-            <node concept="liA8E" id="8n" role="2OqNvi">
+            <node concept="liA8E" id="aV" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.class_(boolean,boolean,boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="class_" />
-              <node concept="3clFbT" id="8o" role="37wK5m">
+              <node concept="3clFbT" id="aW" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="8p" role="37wK5m">
+              <node concept="3clFbT" id="aX" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="8q" role="37wK5m">
+              <node concept="3clFbT" id="aY" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="88" role="3cqZAp">
-          <node concept="2OqwBi" id="8r" role="3clFbG">
-            <node concept="37vLTw" id="8s" role="2Oq$k0">
-              <ref role="3cqZAo" node="8c" resolve="b" />
+        <node concept="3clFbF" id="aG" role="3cqZAp">
+          <node concept="2OqwBi" id="aZ" role="3clFbG">
+            <node concept="37vLTw" id="b0" role="2Oq$k0">
+              <ref role="3cqZAo" node="aK" resolve="b" />
             </node>
-            <node concept="liA8E" id="8t" role="2OqNvi">
+            <node concept="liA8E" id="b1" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
-              <node concept="Xl_RD" id="8u" role="37wK5m">
+              <node concept="Xl_RD" id="b2" role="37wK5m">
                 <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093203547" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="89" role="3cqZAp">
-          <node concept="2OqwBi" id="8v" role="3clFbG">
-            <node concept="37vLTw" id="8w" role="2Oq$k0">
-              <ref role="3cqZAo" node="8c" resolve="b" />
+        <node concept="3clFbF" id="aH" role="3cqZAp">
+          <node concept="2OqwBi" id="b3" role="3clFbG">
+            <node concept="37vLTw" id="b4" role="2Oq$k0">
+              <ref role="3cqZAo" node="aK" resolve="b" />
             </node>
-            <node concept="liA8E" id="8x" role="2OqNvi">
+            <node concept="liA8E" id="b5" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
-              <node concept="3cmrfG" id="8y" role="37wK5m">
+              <node concept="3cmrfG" id="b6" role="37wK5m">
                 <property role="3cmrfH" value="2" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="8a" role="3cqZAp">
-          <node concept="2OqwBi" id="8z" role="3clFbG">
-            <node concept="2OqwBi" id="8$" role="2Oq$k0">
-              <node concept="2OqwBi" id="8A" role="2Oq$k0">
-                <node concept="2OqwBi" id="8C" role="2Oq$k0">
-                  <node concept="2OqwBi" id="8E" role="2Oq$k0">
-                    <node concept="37vLTw" id="8G" role="2Oq$k0">
-                      <ref role="3cqZAo" node="8c" resolve="b" />
+        <node concept="3clFbF" id="aI" role="3cqZAp">
+          <node concept="2OqwBi" id="b7" role="3clFbG">
+            <node concept="2OqwBi" id="b8" role="2Oq$k0">
+              <node concept="2OqwBi" id="ba" role="2Oq$k0">
+                <node concept="2OqwBi" id="bc" role="2Oq$k0">
+                  <node concept="2OqwBi" id="be" role="2Oq$k0">
+                    <node concept="37vLTw" id="bg" role="2Oq$k0">
+                      <ref role="3cqZAo" node="aK" resolve="b" />
                     </node>
-                    <node concept="liA8E" id="8H" role="2OqNvi">
+                    <node concept="liA8E" id="bh" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.associate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AssociationLinkBuilder" resolve="associate" />
-                      <node concept="Xl_RD" id="8I" role="37wK5m">
+                      <node concept="Xl_RD" id="bi" role="37wK5m">
                         <property role="Xl_RC" value="arg" />
                       </node>
-                      <node concept="1adDum" id="8J" role="37wK5m">
+                      <node concept="1adDum" id="bj" role="37wK5m">
                         <property role="1adDun" value="0x7b1db36ecf0d05cL" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="8F" role="2OqNvi">
+                  <node concept="liA8E" id="bf" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AssociationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AssociationLinkBuilder" resolve="target" />
-                    <node concept="1adDum" id="8K" role="37wK5m">
+                    <node concept="1adDum" id="bk" role="37wK5m">
                       <property role="1adDun" value="0x68015e26cc4d49dbL" />
                     </node>
-                    <node concept="1adDum" id="8L" role="37wK5m">
+                    <node concept="1adDum" id="bl" role="37wK5m">
                       <property role="1adDun" value="0x8715b643faea1769L" />
                     </node>
-                    <node concept="1adDum" id="8M" role="37wK5m">
+                    <node concept="1adDum" id="bm" role="37wK5m">
                       <property role="1adDun" value="0x7b1db36ecf09c6aL" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="8D" role="2OqNvi">
+                <node concept="liA8E" id="bd" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AssociationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AssociationLinkBuilder" resolve="optional" />
-                  <node concept="3clFbT" id="8N" role="37wK5m">
+                  <node concept="3clFbT" id="bn" role="37wK5m">
                     <property role="3clFbU" value="false" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="8B" role="2OqNvi">
+              <node concept="liA8E" id="bb" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AssociationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AssociationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="8O" role="37wK5m">
+                <node concept="Xl_RD" id="bo" role="37wK5m">
                   <property role="Xl_RC" value="554465258093203548" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="8_" role="2OqNvi">
+            <node concept="liA8E" id="b9" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AssociationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="8b" role="3cqZAp">
-          <node concept="2OqwBi" id="8P" role="3cqZAk">
-            <node concept="37vLTw" id="8Q" role="2Oq$k0">
-              <ref role="3cqZAo" node="8c" resolve="b" />
+        <node concept="3cpWs6" id="aJ" role="3cqZAp">
+          <node concept="2OqwBi" id="bp" role="3cqZAk">
+            <node concept="37vLTw" id="bq" role="2Oq$k0">
+              <ref role="3cqZAo" node="aK" resolve="b" />
             </node>
-            <node concept="liA8E" id="8R" role="2OqNvi">
+            <node concept="liA8E" id="br" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="84" role="1B3o_S" />
-      <node concept="3uibUv" id="85" role="3clF45">
+      <node concept="3Tm6S6" id="aC" role="1B3o_S" />
+      <node concept="3uibUv" id="aD" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
     </node>
-    <node concept="2YIFZL" id="6s" role="jymVt">
+    <node concept="2YIFZL" id="8_" role="jymVt">
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="createDescriptorForCustomAssertionBlock" />
+      <node concept="3clFbS" id="bs" role="3clF47">
+        <node concept="3cpWs8" id="bv" role="3cqZAp">
+          <node concept="3cpWsn" id="bA" role="3cpWs9">
+            <property role="TrG5h" value="b" />
+            <node concept="3uibUv" id="bB" role="1tU5fm">
+              <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
+            </node>
+            <node concept="2ShNRf" id="bC" role="33vP2m">
+              <node concept="1pGfFk" id="bD" role="2ShVmc">
+                <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
+                <node concept="Xl_RD" id="bE" role="37wK5m">
+                  <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
+                </node>
+                <node concept="Xl_RD" id="bF" role="37wK5m">
+                  <property role="Xl_RC" value="CustomAssertionBlock" />
+                </node>
+                <node concept="1adDum" id="bG" role="37wK5m">
+                  <property role="1adDun" value="0x68015e26cc4d49dbL" />
+                </node>
+                <node concept="1adDum" id="bH" role="37wK5m">
+                  <property role="1adDun" value="0x8715b643faea1769L" />
+                </node>
+                <node concept="1adDum" id="bI" role="37wK5m">
+                  <property role="1adDun" value="0x6c6d272a13d37a56L" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="bw" role="3cqZAp">
+          <node concept="2OqwBi" id="bJ" role="3clFbG">
+            <node concept="37vLTw" id="bK" role="2Oq$k0">
+              <ref role="3cqZAo" node="bA" resolve="b" />
+            </node>
+            <node concept="liA8E" id="bL" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.class_(boolean,boolean,boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="class_" />
+              <node concept="3clFbT" id="bM" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="3clFbT" id="bN" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="3clFbT" id="bO" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="bx" role="3cqZAp">
+          <node concept="2OqwBi" id="bP" role="3clFbG">
+            <node concept="37vLTw" id="bQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="bA" resolve="b" />
+            </node>
+            <node concept="liA8E" id="bR" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.super_(java.lang.String,long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="super_" />
+              <node concept="Xl_RD" id="bS" role="37wK5m">
+                <property role="Xl_RC" value="jetbrains.mps.baseLanguage.structure.ConceptFunction" />
+              </node>
+              <node concept="1adDum" id="bT" role="37wK5m">
+                <property role="1adDun" value="0xf3061a5392264cc5L" />
+              </node>
+              <node concept="1adDum" id="bU" role="37wK5m">
+                <property role="1adDun" value="0xa443f952ceaf5816L" />
+              </node>
+              <node concept="1adDum" id="bV" role="37wK5m">
+                <property role="1adDun" value="0x108bbca0f48L" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="by" role="3cqZAp">
+          <node concept="2OqwBi" id="bW" role="3clFbG">
+            <node concept="37vLTw" id="bX" role="2Oq$k0">
+              <ref role="3cqZAo" node="bA" resolve="b" />
+            </node>
+            <node concept="liA8E" id="bY" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
+              <node concept="Xl_RD" id="bZ" role="37wK5m">
+                <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/7812943990232414806" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="bz" role="3cqZAp">
+          <node concept="2OqwBi" id="c0" role="3clFbG">
+            <node concept="37vLTw" id="c1" role="2Oq$k0">
+              <ref role="3cqZAo" node="bA" resolve="b" />
+            </node>
+            <node concept="liA8E" id="c2" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
+              <node concept="3cmrfG" id="c3" role="37wK5m">
+                <property role="3cmrfH" value="2" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="b$" role="3cqZAp">
+          <node concept="2OqwBi" id="c4" role="3clFbG">
+            <node concept="37vLTw" id="c5" role="2Oq$k0">
+              <ref role="3cqZAo" node="bA" resolve="b" />
+            </node>
+            <node concept="liA8E" id="c6" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.kind(jetbrains.mps.smodel.runtime.ConceptKind,jetbrains.mps.smodel.runtime.StaticScope):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="kind" />
+              <node concept="Rm8GO" id="c7" role="37wK5m">
+                <ref role="1Px2BO" to="ze1i:~ConceptKind" resolve="ConceptKind" />
+                <ref role="Rm8GQ" to="ze1i:~ConceptKind.INTERFACE" resolve="INTERFACE" />
+              </node>
+              <node concept="Rm8GO" id="c8" role="37wK5m">
+                <ref role="1Px2BO" to="ze1i:~StaticScope" resolve="StaticScope" />
+                <ref role="Rm8GQ" to="ze1i:~StaticScope.GLOBAL" resolve="GLOBAL" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="b_" role="3cqZAp">
+          <node concept="2OqwBi" id="c9" role="3cqZAk">
+            <node concept="37vLTw" id="ca" role="2Oq$k0">
+              <ref role="3cqZAo" node="bA" resolve="b" />
+            </node>
+            <node concept="liA8E" id="cb" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="bt" role="1B3o_S" />
+      <node concept="3uibUv" id="bu" role="3clF45">
+        <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
+      </node>
+    </node>
+    <node concept="2YIFZL" id="8A" role="jymVt">
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <property role="TrG5h" value="createDescriptorForGeneratorTest" />
-      <node concept="3clFbS" id="8S" role="3clF47">
-        <node concept="3cpWs8" id="8V" role="3cqZAp">
-          <node concept="3cpWsn" id="94" role="3cpWs9">
+      <node concept="3clFbS" id="cc" role="3clF47">
+        <node concept="3cpWs8" id="cf" role="3cqZAp">
+          <node concept="3cpWsn" id="co" role="3cpWs9">
             <property role="TrG5h" value="b" />
-            <node concept="3uibUv" id="95" role="1tU5fm">
+            <node concept="3uibUv" id="cp" role="1tU5fm">
               <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
             </node>
-            <node concept="2ShNRf" id="96" role="33vP2m">
-              <node concept="1pGfFk" id="97" role="2ShVmc">
+            <node concept="2ShNRf" id="cq" role="33vP2m">
+              <node concept="1pGfFk" id="cr" role="2ShVmc">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
-                <node concept="Xl_RD" id="98" role="37wK5m">
+                <node concept="Xl_RD" id="cs" role="37wK5m">
                   <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
                 </node>
-                <node concept="Xl_RD" id="99" role="37wK5m">
+                <node concept="Xl_RD" id="ct" role="37wK5m">
                   <property role="Xl_RC" value="GeneratorTest" />
                 </node>
-                <node concept="1adDum" id="9a" role="37wK5m">
+                <node concept="1adDum" id="cu" role="37wK5m">
                   <property role="1adDun" value="0x68015e26cc4d49dbL" />
                 </node>
-                <node concept="1adDum" id="9b" role="37wK5m">
+                <node concept="1adDum" id="cv" role="37wK5m">
                   <property role="1adDun" value="0x8715b643faea1769L" />
                 </node>
-                <node concept="1adDum" id="9c" role="37wK5m">
+                <node concept="1adDum" id="cw" role="37wK5m">
                   <property role="1adDun" value="0x7b1db36ecf092beL" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="8W" role="3cqZAp">
-          <node concept="2OqwBi" id="9d" role="3clFbG">
-            <node concept="37vLTw" id="9e" role="2Oq$k0">
-              <ref role="3cqZAo" node="94" resolve="b" />
+        <node concept="3clFbF" id="cg" role="3cqZAp">
+          <node concept="2OqwBi" id="cx" role="3clFbG">
+            <node concept="37vLTw" id="cy" role="2Oq$k0">
+              <ref role="3cqZAo" node="co" resolve="b" />
             </node>
-            <node concept="liA8E" id="9f" role="2OqNvi">
+            <node concept="liA8E" id="cz" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.class_(boolean,boolean,boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="class_" />
-              <node concept="3clFbT" id="9g" role="37wK5m">
+              <node concept="3clFbT" id="c$" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="9h" role="37wK5m">
+              <node concept="3clFbT" id="c_" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="9i" role="37wK5m">
+              <node concept="3clFbT" id="cA" role="37wK5m">
                 <property role="3clFbU" value="true" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="8X" role="3cqZAp">
-          <node concept="2OqwBi" id="9j" role="3clFbG">
-            <node concept="37vLTw" id="9k" role="2Oq$k0">
-              <ref role="3cqZAo" node="94" resolve="b" />
+        <node concept="3clFbF" id="ch" role="3cqZAp">
+          <node concept="2OqwBi" id="cB" role="3clFbG">
+            <node concept="37vLTw" id="cC" role="2Oq$k0">
+              <ref role="3cqZAo" node="co" resolve="b" />
             </node>
-            <node concept="liA8E" id="9l" role="2OqNvi">
+            <node concept="liA8E" id="cD" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.parent(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="parent" />
-              <node concept="1adDum" id="9m" role="37wK5m">
+              <node concept="1adDum" id="cE" role="37wK5m">
                 <property role="1adDun" value="0xceab519525ea4f22L" />
               </node>
-              <node concept="1adDum" id="9n" role="37wK5m">
+              <node concept="1adDum" id="cF" role="37wK5m">
                 <property role="1adDun" value="0x9b92103b95ca8c0cL" />
               </node>
-              <node concept="1adDum" id="9o" role="37wK5m">
+              <node concept="1adDum" id="cG" role="37wK5m">
                 <property role="1adDun" value="0x110396eaaa4L" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="8Y" role="3cqZAp">
-          <node concept="2OqwBi" id="9p" role="3clFbG">
-            <node concept="37vLTw" id="9q" role="2Oq$k0">
-              <ref role="3cqZAo" node="94" resolve="b" />
+        <node concept="3clFbF" id="ci" role="3cqZAp">
+          <node concept="2OqwBi" id="cH" role="3clFbG">
+            <node concept="37vLTw" id="cI" role="2Oq$k0">
+              <ref role="3cqZAo" node="co" resolve="b" />
             </node>
-            <node concept="liA8E" id="9r" role="2OqNvi">
+            <node concept="liA8E" id="cJ" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
-              <node concept="Xl_RD" id="9s" role="37wK5m">
+              <node concept="Xl_RD" id="cK" role="37wK5m">
                 <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093187774" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="8Z" role="3cqZAp">
-          <node concept="2OqwBi" id="9t" role="3clFbG">
-            <node concept="37vLTw" id="9u" role="2Oq$k0">
-              <ref role="3cqZAo" node="94" resolve="b" />
+        <node concept="3clFbF" id="cj" role="3cqZAp">
+          <node concept="2OqwBi" id="cL" role="3clFbG">
+            <node concept="37vLTw" id="cM" role="2Oq$k0">
+              <ref role="3cqZAo" node="co" resolve="b" />
             </node>
-            <node concept="liA8E" id="9v" role="2OqNvi">
+            <node concept="liA8E" id="cN" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
-              <node concept="3cmrfG" id="9w" role="37wK5m">
+              <node concept="3cmrfG" id="cO" role="37wK5m">
                 <property role="3cmrfH" value="2" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="90" role="3cqZAp">
-          <node concept="2OqwBi" id="9x" role="3clFbG">
-            <node concept="37vLTw" id="9y" role="2Oq$k0">
-              <ref role="3cqZAo" node="94" resolve="b" />
+        <node concept="3clFbF" id="ck" role="3cqZAp">
+          <node concept="2OqwBi" id="cP" role="3clFbG">
+            <node concept="37vLTw" id="cQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="co" resolve="b" />
             </node>
-            <node concept="liA8E" id="9z" role="2OqNvi">
+            <node concept="liA8E" id="cR" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.prop(java.lang.String,long,java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="prop" />
-              <node concept="Xl_RD" id="9$" role="37wK5m">
+              <node concept="Xl_RD" id="cS" role="37wK5m">
                 <property role="Xl_RC" value="description" />
               </node>
-              <node concept="1adDum" id="9_" role="37wK5m">
+              <node concept="1adDum" id="cT" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf09c64L" />
               </node>
-              <node concept="Xl_RD" id="9A" role="37wK5m">
+              <node concept="Xl_RD" id="cU" role="37wK5m">
                 <property role="Xl_RC" value="554465258093190244" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="91" role="3cqZAp">
-          <node concept="2OqwBi" id="9B" role="3clFbG">
-            <node concept="2OqwBi" id="9C" role="2Oq$k0">
-              <node concept="2OqwBi" id="9E" role="2Oq$k0">
-                <node concept="2OqwBi" id="9G" role="2Oq$k0">
-                  <node concept="2OqwBi" id="9I" role="2Oq$k0">
-                    <node concept="2OqwBi" id="9K" role="2Oq$k0">
-                      <node concept="2OqwBi" id="9M" role="2Oq$k0">
-                        <node concept="37vLTw" id="9O" role="2Oq$k0">
-                          <ref role="3cqZAo" node="94" resolve="b" />
-                        </node>
-                        <node concept="liA8E" id="9P" role="2OqNvi">
+        <node concept="3clFbF" id="cl" role="3cqZAp">
+          <node concept="2OqwBi" id="cV" role="3clFbG">
+            <node concept="2OqwBi" id="cW" role="2Oq$k0">
+              <node concept="2OqwBi" id="cY" role="2Oq$k0">
+                <node concept="2OqwBi" id="d0" role="2Oq$k0">
+                  <node concept="2OqwBi" id="d2" role="2Oq$k0">
+                    <node concept="2OqwBi" id="d4" role="2Oq$k0">
+                      <node concept="2OqwBi" id="d6" role="2Oq$k0">
+                        <node concept="37vLTw" id="d8" role="2Oq$k0">
+                          <ref role="3cqZAo" node="co" resolve="b" />
+                        </node>
+                        <node concept="liA8E" id="d9" role="2OqNvi">
                           <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
-                          <node concept="Xl_RD" id="9Q" role="37wK5m">
+                          <node concept="Xl_RD" id="da" role="37wK5m">
                             <property role="Xl_RC" value="arguments" />
                           </node>
-                          <node concept="1adDum" id="9R" role="37wK5m">
+                          <node concept="1adDum" id="db" role="37wK5m">
                             <property role="1adDun" value="0x7b1db36ecf09c67L" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="9N" role="2OqNvi">
+                      <node concept="liA8E" id="d7" role="2OqNvi">
                         <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
-                        <node concept="1adDum" id="9S" role="37wK5m">
+                        <node concept="1adDum" id="dc" role="37wK5m">
                           <property role="1adDun" value="0x68015e26cc4d49dbL" />
                         </node>
-                        <node concept="1adDum" id="9T" role="37wK5m">
+                        <node concept="1adDum" id="dd" role="37wK5m">
                           <property role="1adDun" value="0x8715b643faea1769L" />
                         </node>
-                        <node concept="1adDum" id="9U" role="37wK5m">
+                        <node concept="1adDum" id="de" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf09c6aL" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="9L" role="2OqNvi">
+                    <node concept="liA8E" id="d5" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
-                      <node concept="3clFbT" id="9V" role="37wK5m">
+                      <node concept="3clFbT" id="df" role="37wK5m">
                         <property role="3clFbU" value="true" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="9J" role="2OqNvi">
+                  <node concept="liA8E" id="d3" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
-                    <node concept="3clFbT" id="9W" role="37wK5m">
+                    <node concept="3clFbT" id="dg" role="37wK5m">
                       <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="9H" role="2OqNvi">
+                <node concept="liA8E" id="d1" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
-                  <node concept="3clFbT" id="9X" role="37wK5m">
+                  <node concept="3clFbT" id="dh" role="37wK5m">
                     <property role="3clFbU" value="true" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="9F" role="2OqNvi">
+              <node concept="liA8E" id="cZ" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="9Y" role="37wK5m">
+                <node concept="Xl_RD" id="di" role="37wK5m">
                   <property role="Xl_RC" value="554465258093190247" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="9D" role="2OqNvi">
+            <node concept="liA8E" id="cX" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="92" role="3cqZAp">
-          <node concept="2OqwBi" id="9Z" role="3clFbG">
-            <node concept="2OqwBi" id="a0" role="2Oq$k0">
-              <node concept="2OqwBi" id="a2" role="2Oq$k0">
-                <node concept="2OqwBi" id="a4" role="2Oq$k0">
-                  <node concept="2OqwBi" id="a6" role="2Oq$k0">
-                    <node concept="2OqwBi" id="a8" role="2Oq$k0">
-                      <node concept="2OqwBi" id="aa" role="2Oq$k0">
-                        <node concept="37vLTw" id="ac" role="2Oq$k0">
-                          <ref role="3cqZAo" node="94" resolve="b" />
+        <node concept="3clFbF" id="cm" role="3cqZAp">
+          <node concept="2OqwBi" id="dj" role="3clFbG">
+            <node concept="2OqwBi" id="dk" role="2Oq$k0">
+              <node concept="2OqwBi" id="dm" role="2Oq$k0">
+                <node concept="2OqwBi" id="do" role="2Oq$k0">
+                  <node concept="2OqwBi" id="dq" role="2Oq$k0">
+                    <node concept="2OqwBi" id="ds" role="2Oq$k0">
+                      <node concept="2OqwBi" id="du" role="2Oq$k0">
+                        <node concept="37vLTw" id="dw" role="2Oq$k0">
+                          <ref role="3cqZAo" node="co" resolve="b" />
                         </node>
-                        <node concept="liA8E" id="ad" role="2OqNvi">
+                        <node concept="liA8E" id="dx" role="2OqNvi">
                           <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
-                          <node concept="Xl_RD" id="ae" role="37wK5m">
+                          <node concept="Xl_RD" id="dy" role="37wK5m">
                             <property role="Xl_RC" value="tests" />
                           </node>
-                          <node concept="1adDum" id="af" role="37wK5m">
+                          <node concept="1adDum" id="dz" role="37wK5m">
                             <property role="1adDun" value="0x7b1db36ecf0d067L" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="ab" role="2OqNvi">
+                      <node concept="liA8E" id="dv" role="2OqNvi">
                         <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
-                        <node concept="1adDum" id="ag" role="37wK5m">
+                        <node concept="1adDum" id="d$" role="37wK5m">
                           <property role="1adDun" value="0x68015e26cc4d49dbL" />
                         </node>
-                        <node concept="1adDum" id="ah" role="37wK5m">
+                        <node concept="1adDum" id="d_" role="37wK5m">
                           <property role="1adDun" value="0x8715b643faea1769L" />
                         </node>
-                        <node concept="1adDum" id="ai" role="37wK5m">
+                        <node concept="1adDum" id="dA" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf0d058L" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="a9" role="2OqNvi">
+                    <node concept="liA8E" id="dt" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
-                      <node concept="3clFbT" id="aj" role="37wK5m">
+                      <node concept="3clFbT" id="dB" role="37wK5m">
                         <property role="3clFbU" value="true" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="a7" role="2OqNvi">
+                  <node concept="liA8E" id="dr" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
-                    <node concept="3clFbT" id="ak" role="37wK5m">
+                    <node concept="3clFbT" id="dC" role="37wK5m">
                       <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="a5" role="2OqNvi">
+                <node concept="liA8E" id="dp" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
-                  <node concept="3clFbT" id="al" role="37wK5m">
+                  <node concept="3clFbT" id="dD" role="37wK5m">
                     <property role="3clFbU" value="true" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="a3" role="2OqNvi">
+              <node concept="liA8E" id="dn" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="am" role="37wK5m">
+                <node concept="Xl_RD" id="dE" role="37wK5m">
                   <property role="Xl_RC" value="554465258093203559" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="a1" role="2OqNvi">
+            <node concept="liA8E" id="dl" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="93" role="3cqZAp">
-          <node concept="2OqwBi" id="an" role="3cqZAk">
-            <node concept="37vLTw" id="ao" role="2Oq$k0">
-              <ref role="3cqZAo" node="94" resolve="b" />
+        <node concept="3cpWs6" id="cn" role="3cqZAp">
+          <node concept="2OqwBi" id="dF" role="3cqZAk">
+            <node concept="37vLTw" id="dG" role="2Oq$k0">
+              <ref role="3cqZAo" node="co" resolve="b" />
             </node>
-            <node concept="liA8E" id="ap" role="2OqNvi">
+            <node concept="liA8E" id="dH" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="8T" role="1B3o_S" />
-      <node concept="3uibUv" id="8U" role="3clF45">
+      <node concept="3Tm6S6" id="cd" role="1B3o_S" />
+      <node concept="3uibUv" id="ce" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
     </node>
-    <node concept="2YIFZL" id="6t" role="jymVt">
+    <node concept="2YIFZL" id="8B" role="jymVt">
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <property role="TrG5h" value="createDescriptorForModelArgument" />
-      <node concept="3clFbS" id="aq" role="3clF47">
-        <node concept="3cpWs8" id="at" role="3cqZAp">
-          <node concept="3cpWsn" id="a_" role="3cpWs9">
+      <node concept="3clFbS" id="dI" role="3clF47">
+        <node concept="3cpWs8" id="dL" role="3cqZAp">
+          <node concept="3cpWsn" id="dT" role="3cpWs9">
             <property role="TrG5h" value="b" />
-            <node concept="3uibUv" id="aA" role="1tU5fm">
+            <node concept="3uibUv" id="dU" role="1tU5fm">
               <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
             </node>
-            <node concept="2ShNRf" id="aB" role="33vP2m">
-              <node concept="1pGfFk" id="aC" role="2ShVmc">
+            <node concept="2ShNRf" id="dV" role="33vP2m">
+              <node concept="1pGfFk" id="dW" role="2ShVmc">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
-                <node concept="Xl_RD" id="aD" role="37wK5m">
+                <node concept="Xl_RD" id="dX" role="37wK5m">
                   <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
                 </node>
-                <node concept="Xl_RD" id="aE" role="37wK5m">
+                <node concept="Xl_RD" id="dY" role="37wK5m">
                   <property role="Xl_RC" value="ModelArgument" />
                 </node>
-                <node concept="1adDum" id="aF" role="37wK5m">
+                <node concept="1adDum" id="dZ" role="37wK5m">
                   <property role="1adDun" value="0x68015e26cc4d49dbL" />
                 </node>
-                <node concept="1adDum" id="aG" role="37wK5m">
+                <node concept="1adDum" id="e0" role="37wK5m">
                   <property role="1adDun" value="0x8715b643faea1769L" />
                 </node>
-                <node concept="1adDum" id="aH" role="37wK5m">
+                <node concept="1adDum" id="e1" role="37wK5m">
                   <property role="1adDun" value="0x7b1db36ecf09c6eL" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="au" role="3cqZAp">
-          <node concept="2OqwBi" id="aI" role="3clFbG">
-            <node concept="37vLTw" id="aJ" role="2Oq$k0">
-              <ref role="3cqZAo" node="a_" resolve="b" />
+        <node concept="3clFbF" id="dM" role="3cqZAp">
+          <node concept="2OqwBi" id="e2" role="3clFbG">
+            <node concept="37vLTw" id="e3" role="2Oq$k0">
+              <ref role="3cqZAo" node="dT" resolve="b" />
             </node>
-            <node concept="liA8E" id="aK" role="2OqNvi">
+            <node concept="liA8E" id="e4" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.class_(boolean,boolean,boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="class_" />
-              <node concept="3clFbT" id="aL" role="37wK5m">
+              <node concept="3clFbT" id="e5" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="aM" role="37wK5m">
+              <node concept="3clFbT" id="e6" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="aN" role="37wK5m">
+              <node concept="3clFbT" id="e7" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="av" role="3cqZAp">
-          <node concept="2OqwBi" id="aO" role="3clFbG">
-            <node concept="37vLTw" id="aP" role="2Oq$k0">
-              <ref role="3cqZAo" node="bE" resolve="b" />
+        <node concept="3clFbF" id="dN" role="3cqZAp">
+          <node concept="2OqwBi" id="e8" role="3clFbG">
+            <node concept="37vLTw" id="e9" role="2Oq$k0">
+              <ref role="3cqZAo" node="fH" resolve="b" />
             </node>
-            <node concept="liA8E" id="aQ" role="2OqNvi">
+            <node concept="liA8E" id="ea" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.parent(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="parent" />
-              <node concept="1adDum" id="aR" role="37wK5m">
+              <node concept="1adDum" id="eb" role="37wK5m">
                 <property role="1adDun" value="0x68015e26cc4d49dbL" />
               </node>
-              <node concept="1adDum" id="aS" role="37wK5m">
+              <node concept="1adDum" id="ec" role="37wK5m">
                 <property role="1adDun" value="0x8715b643faea1769L" />
               </node>
-              <node concept="1adDum" id="aT" role="37wK5m">
+              <node concept="1adDum" id="ed" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf09c6aL" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="aw" role="3cqZAp">
-          <node concept="2OqwBi" id="aU" role="3clFbG">
-            <node concept="37vLTw" id="aV" role="2Oq$k0">
-              <ref role="3cqZAo" node="a_" resolve="b" />
+        <node concept="3clFbF" id="dO" role="3cqZAp">
+          <node concept="2OqwBi" id="ee" role="3clFbG">
+            <node concept="37vLTw" id="ef" role="2Oq$k0">
+              <ref role="3cqZAo" node="dT" resolve="b" />
             </node>
-            <node concept="liA8E" id="aW" role="2OqNvi">
+            <node concept="liA8E" id="eg" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
-              <node concept="Xl_RD" id="aX" role="37wK5m">
+              <node concept="Xl_RD" id="eh" role="37wK5m">
                 <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093190254" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="ax" role="3cqZAp">
-          <node concept="2OqwBi" id="aY" role="3clFbG">
-            <node concept="37vLTw" id="aZ" role="2Oq$k0">
-              <ref role="3cqZAo" node="a_" resolve="b" />
+        <node concept="3clFbF" id="dP" role="3cqZAp">
+          <node concept="2OqwBi" id="ei" role="3clFbG">
+            <node concept="37vLTw" id="ej" role="2Oq$k0">
+              <ref role="3cqZAo" node="dT" resolve="b" />
             </node>
-            <node concept="liA8E" id="b0" role="2OqNvi">
+            <node concept="liA8E" id="ek" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
-              <node concept="3cmrfG" id="b1" role="37wK5m">
+              <node concept="3cmrfG" id="el" role="37wK5m">
                 <property role="3cmrfH" value="2" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="ay" role="3cqZAp">
-          <node concept="2OqwBi" id="b2" role="3clFbG">
-            <node concept="2OqwBi" id="b3" role="2Oq$k0">
-              <node concept="2OqwBi" id="b5" role="2Oq$k0">
-                <node concept="2OqwBi" id="b7" role="2Oq$k0">
-                  <node concept="2OqwBi" id="b9" role="2Oq$k0">
-                    <node concept="2OqwBi" id="bb" role="2Oq$k0">
-                      <node concept="2OqwBi" id="bd" role="2Oq$k0">
-                        <node concept="37vLTw" id="bf" role="2Oq$k0">
-                          <ref role="3cqZAo" node="a_" resolve="b" />
+        <node concept="3clFbF" id="dQ" role="3cqZAp">
+          <node concept="2OqwBi" id="em" role="3clFbG">
+            <node concept="2OqwBi" id="en" role="2Oq$k0">
+              <node concept="2OqwBi" id="ep" role="2Oq$k0">
+                <node concept="2OqwBi" id="er" role="2Oq$k0">
+                  <node concept="2OqwBi" id="et" role="2Oq$k0">
+                    <node concept="2OqwBi" id="ev" role="2Oq$k0">
+                      <node concept="2OqwBi" id="ex" role="2Oq$k0">
+                        <node concept="37vLTw" id="ez" role="2Oq$k0">
+                          <ref role="3cqZAo" node="dT" resolve="b" />
                         </node>
-                        <node concept="liA8E" id="bg" role="2OqNvi">
+                        <node concept="liA8E" id="e$" role="2OqNvi">
                           <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
-                          <node concept="Xl_RD" id="bh" role="37wK5m">
+                          <node concept="Xl_RD" id="e_" role="37wK5m">
                             <property role="Xl_RC" value="param" />
                           </node>
-                          <node concept="1adDum" id="bi" role="37wK5m">
+                          <node concept="1adDum" id="eA" role="37wK5m">
                             <property role="1adDun" value="0x7b1db36ecf09c72L" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="be" role="2OqNvi">
+                      <node concept="liA8E" id="ey" role="2OqNvi">
                         <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
-                        <node concept="1adDum" id="bj" role="37wK5m">
+                        <node concept="1adDum" id="eB" role="37wK5m">
                           <property role="1adDun" value="0x446c26eb2b7b4bf0L" />
                         </node>
-                        <node concept="1adDum" id="bk" role="37wK5m">
+                        <node concept="1adDum" id="eC" role="37wK5m">
                           <property role="1adDun" value="0x9b35f83fa582753eL" />
                         </node>
-                        <node concept="1adDum" id="bl" role="37wK5m">
+                        <node concept="1adDum" id="eD" role="37wK5m">
                           <property role="1adDun" value="0x7d58bd9fd9c8b6d3L" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="bc" role="2OqNvi">
+                    <node concept="liA8E" id="ew" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
-                      <node concept="3clFbT" id="bm" role="37wK5m">
+                      <node concept="3clFbT" id="eE" role="37wK5m">
                         <property role="3clFbU" value="false" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="ba" role="2OqNvi">
+                  <node concept="liA8E" id="eu" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
-                    <node concept="3clFbT" id="bn" role="37wK5m">
+                    <node concept="3clFbT" id="eF" role="37wK5m">
                       <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="b8" role="2OqNvi">
+                <node concept="liA8E" id="es" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
-                  <node concept="3clFbT" id="bo" role="37wK5m">
+                  <node concept="3clFbT" id="eG" role="37wK5m">
                     <property role="3clFbU" value="false" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="b6" role="2OqNvi">
+              <node concept="liA8E" id="eq" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="bp" role="37wK5m">
+                <node concept="Xl_RD" id="eH" role="37wK5m">
                   <property role="Xl_RC" value="554465258093190258" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="b4" role="2OqNvi">
+            <node concept="liA8E" id="eo" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="az" role="3cqZAp">
-          <node concept="2OqwBi" id="bq" role="3clFbG">
-            <node concept="37vLTw" id="br" role="2Oq$k0">
-              <ref role="3cqZAo" node="a_" resolve="b" />
+        <node concept="3clFbF" id="dR" role="3cqZAp">
+          <node concept="2OqwBi" id="eI" role="3clFbG">
+            <node concept="37vLTw" id="eJ" role="2Oq$k0">
+              <ref role="3cqZAo" node="dT" resolve="b" />
             </node>
-            <node concept="liA8E" id="bs" role="2OqNvi">
+            <node concept="liA8E" id="eK" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.alias(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="alias" />
-              <node concept="Xl_RD" id="bt" role="37wK5m">
+              <node concept="Xl_RD" id="eL" role="37wK5m">
                 <property role="Xl_RC" value="model" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="a$" role="3cqZAp">
-          <node concept="2OqwBi" id="bu" role="3cqZAk">
-            <node concept="37vLTw" id="bv" role="2Oq$k0">
-              <ref role="3cqZAo" node="a_" resolve="b" />
+        <node concept="3cpWs6" id="dS" role="3cqZAp">
+          <node concept="2OqwBi" id="eM" role="3cqZAk">
+            <node concept="37vLTw" id="eN" role="2Oq$k0">
+              <ref role="3cqZAo" node="dT" resolve="b" />
             </node>
-            <node concept="liA8E" id="bw" role="2OqNvi">
+            <node concept="liA8E" id="eO" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="ar" role="1B3o_S" />
-      <node concept="3uibUv" id="as" role="3clF45">
+      <node concept="3Tm6S6" id="dJ" role="1B3o_S" />
+      <node concept="3uibUv" id="dK" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
     </node>
-    <node concept="2YIFZL" id="6u" role="jymVt">
+    <node concept="2YIFZL" id="8C" role="jymVt">
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="createDescriptorForModel_ConceptFunctionParameter" />
+      <node concept="3clFbS" id="eP" role="3clF47">
+        <node concept="3cpWs8" id="eS" role="3cqZAp">
+          <node concept="3cpWsn" id="eZ" role="3cpWs9">
+            <property role="TrG5h" value="b" />
+            <node concept="3uibUv" id="f0" role="1tU5fm">
+              <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
+            </node>
+            <node concept="2ShNRf" id="f1" role="33vP2m">
+              <node concept="1pGfFk" id="f2" role="2ShVmc">
+                <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
+                <node concept="Xl_RD" id="f3" role="37wK5m">
+                  <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
+                </node>
+                <node concept="Xl_RD" id="f4" role="37wK5m">
+                  <property role="Xl_RC" value="Model_ConceptFunctionParameter" />
+                </node>
+                <node concept="1adDum" id="f5" role="37wK5m">
+                  <property role="1adDun" value="0x68015e26cc4d49dbL" />
+                </node>
+                <node concept="1adDum" id="f6" role="37wK5m">
+                  <property role="1adDun" value="0x8715b643faea1769L" />
+                </node>
+                <node concept="1adDum" id="f7" role="37wK5m">
+                  <property role="1adDun" value="0x6c6d272a13d3b3b1L" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="eT" role="3cqZAp">
+          <node concept="2OqwBi" id="f8" role="3clFbG">
+            <node concept="37vLTw" id="f9" role="2Oq$k0">
+              <ref role="3cqZAo" node="eZ" resolve="b" />
+            </node>
+            <node concept="liA8E" id="fa" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.class_(boolean,boolean,boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="class_" />
+              <node concept="3clFbT" id="fb" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="3clFbT" id="fc" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="3clFbT" id="fd" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="eU" role="3cqZAp">
+          <node concept="2OqwBi" id="fe" role="3clFbG">
+            <node concept="37vLTw" id="ff" role="2Oq$k0">
+              <ref role="3cqZAo" node="eZ" resolve="b" />
+            </node>
+            <node concept="liA8E" id="fg" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.super_(java.lang.String,long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="super_" />
+              <node concept="Xl_RD" id="fh" role="37wK5m">
+                <property role="Xl_RC" value="jetbrains.mps.baseLanguage.structure.ConceptFunctionParameter" />
+              </node>
+              <node concept="1adDum" id="fi" role="37wK5m">
+                <property role="1adDun" value="0xf3061a5392264cc5L" />
+              </node>
+              <node concept="1adDum" id="fj" role="37wK5m">
+                <property role="1adDun" value="0xa443f952ceaf5816L" />
+              </node>
+              <node concept="1adDum" id="fk" role="37wK5m">
+                <property role="1adDun" value="0x101c66e2c0bL" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="eV" role="3cqZAp">
+          <node concept="2OqwBi" id="fl" role="3clFbG">
+            <node concept="37vLTw" id="fm" role="2Oq$k0">
+              <ref role="3cqZAo" node="eZ" resolve="b" />
+            </node>
+            <node concept="liA8E" id="fn" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
+              <node concept="Xl_RD" id="fo" role="37wK5m">
+                <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/7812943990232429489" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="eW" role="3cqZAp">
+          <node concept="2OqwBi" id="fp" role="3clFbG">
+            <node concept="37vLTw" id="fq" role="2Oq$k0">
+              <ref role="3cqZAo" node="eZ" resolve="b" />
+            </node>
+            <node concept="liA8E" id="fr" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
+              <node concept="3cmrfG" id="fs" role="37wK5m">
+                <property role="3cmrfH" value="2" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="eX" role="3cqZAp">
+          <node concept="2OqwBi" id="ft" role="3clFbG">
+            <node concept="37vLTw" id="fu" role="2Oq$k0">
+              <ref role="3cqZAo" node="eZ" resolve="b" />
+            </node>
+            <node concept="liA8E" id="fv" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.alias(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="alias" />
+              <node concept="Xl_RD" id="fw" role="37wK5m">
+                <property role="Xl_RC" value="model" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="eY" role="3cqZAp">
+          <node concept="2OqwBi" id="fx" role="3cqZAk">
+            <node concept="37vLTw" id="fy" role="2Oq$k0">
+              <ref role="3cqZAo" node="eZ" resolve="b" />
+            </node>
+            <node concept="liA8E" id="fz" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="eQ" role="1B3o_S" />
+      <node concept="3uibUv" id="eR" role="3clF45">
+        <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
+      </node>
+    </node>
+    <node concept="2YIFZL" id="8D" role="jymVt">
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <property role="TrG5h" value="createDescriptorForTestArgument" />
-      <node concept="3clFbS" id="bx" role="3clF47">
-        <node concept="3cpWs8" id="b$" role="3cqZAp">
-          <node concept="3cpWsn" id="bE" role="3cpWs9">
+      <node concept="3clFbS" id="f$" role="3clF47">
+        <node concept="3cpWs8" id="fB" role="3cqZAp">
+          <node concept="3cpWsn" id="fH" role="3cpWs9">
             <property role="TrG5h" value="b" />
-            <node concept="3uibUv" id="bF" role="1tU5fm">
+            <node concept="3uibUv" id="fI" role="1tU5fm">
               <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
             </node>
-            <node concept="2ShNRf" id="bG" role="33vP2m">
-              <node concept="1pGfFk" id="bH" role="2ShVmc">
+            <node concept="2ShNRf" id="fJ" role="33vP2m">
+              <node concept="1pGfFk" id="fK" role="2ShVmc">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
-                <node concept="Xl_RD" id="bI" role="37wK5m">
+                <node concept="Xl_RD" id="fL" role="37wK5m">
                   <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
                 </node>
-                <node concept="Xl_RD" id="bJ" role="37wK5m">
+                <node concept="Xl_RD" id="fM" role="37wK5m">
                   <property role="Xl_RC" value="TestArgument" />
                 </node>
-                <node concept="1adDum" id="bK" role="37wK5m">
+                <node concept="1adDum" id="fN" role="37wK5m">
                   <property role="1adDun" value="0x68015e26cc4d49dbL" />
                 </node>
-                <node concept="1adDum" id="bL" role="37wK5m">
+                <node concept="1adDum" id="fO" role="37wK5m">
                   <property role="1adDun" value="0x8715b643faea1769L" />
                 </node>
-                <node concept="1adDum" id="bM" role="37wK5m">
+                <node concept="1adDum" id="fP" role="37wK5m">
                   <property role="1adDun" value="0x7b1db36ecf09c6aL" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="b_" role="3cqZAp">
-          <node concept="2OqwBi" id="bN" role="3clFbG">
-            <node concept="37vLTw" id="bO" role="2Oq$k0">
-              <ref role="3cqZAo" node="bE" resolve="b" />
+        <node concept="3clFbF" id="fC" role="3cqZAp">
+          <node concept="2OqwBi" id="fQ" role="3clFbG">
+            <node concept="37vLTw" id="fR" role="2Oq$k0">
+              <ref role="3cqZAo" node="fH" resolve="b" />
             </node>
-            <node concept="liA8E" id="bP" role="2OqNvi">
+            <node concept="liA8E" id="fS" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.interface_():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="interface_" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="bA" role="3cqZAp">
-          <node concept="2OqwBi" id="bQ" role="3clFbG">
-            <node concept="37vLTw" id="bR" role="2Oq$k0">
-              <ref role="3cqZAo" node="bE" resolve="b" />
+        <node concept="3clFbF" id="fD" role="3cqZAp">
+          <node concept="2OqwBi" id="fT" role="3clFbG">
+            <node concept="37vLTw" id="fU" role="2Oq$k0">
+              <ref role="3cqZAo" node="fH" resolve="b" />
             </node>
-            <node concept="liA8E" id="bS" role="2OqNvi">
+            <node concept="liA8E" id="fV" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.parent(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="parent" />
-              <node concept="1adDum" id="bT" role="37wK5m">
+              <node concept="1adDum" id="fW" role="37wK5m">
                 <property role="1adDun" value="0xceab519525ea4f22L" />
               </node>
-              <node concept="1adDum" id="bU" role="37wK5m">
+              <node concept="1adDum" id="fX" role="37wK5m">
                 <property role="1adDun" value="0x9b92103b95ca8c0cL" />
               </node>
-              <node concept="1adDum" id="bV" role="37wK5m">
+              <node concept="1adDum" id="fY" role="37wK5m">
                 <property role="1adDun" value="0x110396eaaa4L" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="bB" role="3cqZAp">
-          <node concept="2OqwBi" id="bW" role="3clFbG">
-            <node concept="37vLTw" id="bX" role="2Oq$k0">
-              <ref role="3cqZAo" node="bE" resolve="b" />
+        <node concept="3clFbF" id="fE" role="3cqZAp">
+          <node concept="2OqwBi" id="fZ" role="3clFbG">
+            <node concept="37vLTw" id="g0" role="2Oq$k0">
+              <ref role="3cqZAo" node="fH" resolve="b" />
             </node>
-            <node concept="liA8E" id="bY" role="2OqNvi">
+            <node concept="liA8E" id="g1" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
-              <node concept="Xl_RD" id="bZ" role="37wK5m">
+              <node concept="Xl_RD" id="g2" role="37wK5m">
                 <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093190250" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="bC" role="3cqZAp">
-          <node concept="2OqwBi" id="c0" role="3clFbG">
-            <node concept="37vLTw" id="c1" role="2Oq$k0">
-              <ref role="3cqZAo" node="bE" resolve="b" />
+        <node concept="3clFbF" id="fF" role="3cqZAp">
+          <node concept="2OqwBi" id="g3" role="3clFbG">
+            <node concept="37vLTw" id="g4" role="2Oq$k0">
+              <ref role="3cqZAo" node="fH" resolve="b" />
             </node>
-            <node concept="liA8E" id="c2" role="2OqNvi">
+            <node concept="liA8E" id="g5" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
-              <node concept="3cmrfG" id="c3" role="37wK5m">
+              <node concept="3cmrfG" id="g6" role="37wK5m">
                 <property role="3cmrfH" value="2" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="bD" role="3cqZAp">
-          <node concept="2OqwBi" id="c4" role="3cqZAk">
-            <node concept="37vLTw" id="c5" role="2Oq$k0">
-              <ref role="3cqZAo" node="bE" resolve="b" />
+        <node concept="3cpWs6" id="fG" role="3cqZAp">
+          <node concept="2OqwBi" id="g7" role="3cqZAk">
+            <node concept="37vLTw" id="g8" role="2Oq$k0">
+              <ref role="3cqZAo" node="fH" resolve="b" />
             </node>
-            <node concept="liA8E" id="c6" role="2OqNvi">
+            <node concept="liA8E" id="g9" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="by" role="1B3o_S" />
-      <node concept="3uibUv" id="bz" role="3clF45">
+      <node concept="3Tm6S6" id="f_" role="1B3o_S" />
+      <node concept="3uibUv" id="fA" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
     </node>
-    <node concept="2YIFZL" id="6v" role="jymVt">
+    <node concept="2YIFZL" id="8E" role="jymVt">
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <property role="TrG5h" value="createDescriptorForTestAssertion" />
-      <node concept="3clFbS" id="c7" role="3clF47">
-        <node concept="3cpWs8" id="ca" role="3cqZAp">
-          <node concept="3cpWsn" id="cf" role="3cpWs9">
+      <node concept="3clFbS" id="ga" role="3clF47">
+        <node concept="3cpWs8" id="gd" role="3cqZAp">
+          <node concept="3cpWsn" id="gi" role="3cpWs9">
             <property role="TrG5h" value="b" />
-            <node concept="3uibUv" id="cg" role="1tU5fm">
+            <node concept="3uibUv" id="gj" role="1tU5fm">
               <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
             </node>
-            <node concept="2ShNRf" id="ch" role="33vP2m">
-              <node concept="1pGfFk" id="ci" role="2ShVmc">
+            <node concept="2ShNRf" id="gk" role="33vP2m">
+              <node concept="1pGfFk" id="gl" role="2ShVmc">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
-                <node concept="Xl_RD" id="cj" role="37wK5m">
+                <node concept="Xl_RD" id="gm" role="37wK5m">
                   <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
                 </node>
-                <node concept="Xl_RD" id="ck" role="37wK5m">
+                <node concept="Xl_RD" id="gn" role="37wK5m">
                   <property role="Xl_RC" value="TestAssertion" />
                 </node>
-                <node concept="1adDum" id="cl" role="37wK5m">
+                <node concept="1adDum" id="go" role="37wK5m">
                   <property role="1adDun" value="0x68015e26cc4d49dbL" />
                 </node>
-                <node concept="1adDum" id="cm" role="37wK5m">
+                <node concept="1adDum" id="gp" role="37wK5m">
                   <property role="1adDun" value="0x8715b643faea1769L" />
                 </node>
-                <node concept="1adDum" id="cn" role="37wK5m">
+                <node concept="1adDum" id="gq" role="37wK5m">
                   <property role="1adDun" value="0x7b1db36ecf0d058L" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cb" role="3cqZAp">
-          <node concept="2OqwBi" id="co" role="3clFbG">
-            <node concept="37vLTw" id="cp" role="2Oq$k0">
-              <ref role="3cqZAo" node="cf" resolve="b" />
+        <node concept="3clFbF" id="ge" role="3cqZAp">
+          <node concept="2OqwBi" id="gr" role="3clFbG">
+            <node concept="37vLTw" id="gs" role="2Oq$k0">
+              <ref role="3cqZAo" node="gi" resolve="b" />
             </node>
-            <node concept="liA8E" id="cq" role="2OqNvi">
+            <node concept="liA8E" id="gt" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.interface_():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="interface_" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cc" role="3cqZAp">
-          <node concept="2OqwBi" id="cr" role="3clFbG">
-            <node concept="37vLTw" id="cs" role="2Oq$k0">
-              <ref role="3cqZAo" node="cf" resolve="b" />
+        <node concept="3clFbF" id="gf" role="3cqZAp">
+          <node concept="2OqwBi" id="gu" role="3clFbG">
+            <node concept="37vLTw" id="gv" role="2Oq$k0">
+              <ref role="3cqZAo" node="gi" resolve="b" />
             </node>
-            <node concept="liA8E" id="ct" role="2OqNvi">
+            <node concept="liA8E" id="gw" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
-              <node concept="Xl_RD" id="cu" role="37wK5m">
+              <node concept="Xl_RD" id="gx" role="37wK5m">
                 <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093203544" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cd" role="3cqZAp">
-          <node concept="2OqwBi" id="cv" role="3clFbG">
-            <node concept="37vLTw" id="cw" role="2Oq$k0">
-              <ref role="3cqZAo" node="cf" resolve="b" />
+        <node concept="3clFbF" id="gg" role="3cqZAp">
+          <node concept="2OqwBi" id="gy" role="3clFbG">
+            <node concept="37vLTw" id="gz" role="2Oq$k0">
+              <ref role="3cqZAo" node="gi" resolve="b" />
             </node>
-            <node concept="liA8E" id="cx" role="2OqNvi">
+            <node concept="liA8E" id="g$" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
-              <node concept="3cmrfG" id="cy" role="37wK5m">
+              <node concept="3cmrfG" id="g_" role="37wK5m">
                 <property role="3cmrfH" value="2" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="ce" role="3cqZAp">
-          <node concept="2OqwBi" id="cz" role="3cqZAk">
-            <node concept="37vLTw" id="c$" role="2Oq$k0">
-              <ref role="3cqZAo" node="cf" resolve="b" />
+        <node concept="3cpWs6" id="gh" role="3cqZAp">
+          <node concept="2OqwBi" id="gA" role="3cqZAk">
+            <node concept="37vLTw" id="gB" role="2Oq$k0">
+              <ref role="3cqZAo" node="gi" resolve="b" />
             </node>
-            <node concept="liA8E" id="c_" role="2OqNvi">
+            <node concept="liA8E" id="gC" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="c8" role="1B3o_S" />
-      <node concept="3uibUv" id="c9" role="3clF45">
+      <node concept="3Tm6S6" id="gb" role="1B3o_S" />
+      <node concept="3uibUv" id="gc" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
     </node>
-    <node concept="2YIFZL" id="6w" role="jymVt">
+    <node concept="2YIFZL" id="8F" role="jymVt">
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <property role="TrG5h" value="createDescriptorForTransformationMatchAssertion" />
-      <node concept="3clFbS" id="cA" role="3clF47">
-        <node concept="3cpWs8" id="cD" role="3cqZAp">
-          <node concept="3cpWsn" id="cM" role="3cpWs9">
+      <node concept="3clFbS" id="gD" role="3clF47">
+        <node concept="3cpWs8" id="gG" role="3cqZAp">
+          <node concept="3cpWsn" id="gP" role="3cpWs9">
             <property role="TrG5h" value="b" />
-            <node concept="3uibUv" id="cN" role="1tU5fm">
+            <node concept="3uibUv" id="gQ" role="1tU5fm">
               <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
             </node>
-            <node concept="2ShNRf" id="cO" role="33vP2m">
-              <node concept="1pGfFk" id="cP" role="2ShVmc">
+            <node concept="2ShNRf" id="gR" role="33vP2m">
+              <node concept="1pGfFk" id="gS" role="2ShVmc">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
-                <node concept="Xl_RD" id="cQ" role="37wK5m">
+                <node concept="Xl_RD" id="gT" role="37wK5m">
                   <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
                 </node>
-                <node concept="Xl_RD" id="cR" role="37wK5m">
+                <node concept="Xl_RD" id="gU" role="37wK5m">
                   <property role="Xl_RC" value="TransformationMatchAssertion" />
                 </node>
-                <node concept="1adDum" id="cS" role="37wK5m">
+                <node concept="1adDum" id="gV" role="37wK5m">
                   <property role="1adDun" value="0x68015e26cc4d49dbL" />
                 </node>
-                <node concept="1adDum" id="cT" role="37wK5m">
+                <node concept="1adDum" id="gW" role="37wK5m">
                   <property role="1adDun" value="0x8715b643faea1769L" />
                 </node>
-                <node concept="1adDum" id="cU" role="37wK5m">
+                <node concept="1adDum" id="gX" role="37wK5m">
                   <property role="1adDun" value="0x7b1db36ecf0d057L" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cE" role="3cqZAp">
-          <node concept="2OqwBi" id="cV" role="3clFbG">
-            <node concept="37vLTw" id="cW" role="2Oq$k0">
-              <ref role="3cqZAo" node="cM" resolve="b" />
+        <node concept="3clFbF" id="gH" role="3cqZAp">
+          <node concept="2OqwBi" id="gY" role="3clFbG">
+            <node concept="37vLTw" id="gZ" role="2Oq$k0">
+              <ref role="3cqZAo" node="gP" resolve="b" />
             </node>
-            <node concept="liA8E" id="cX" role="2OqNvi">
+            <node concept="liA8E" id="h0" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.class_(boolean,boolean,boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="class_" />
-              <node concept="3clFbT" id="cY" role="37wK5m">
+              <node concept="3clFbT" id="h1" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="cZ" role="37wK5m">
+              <node concept="3clFbT" id="h2" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="d0" role="37wK5m">
+              <node concept="3clFbT" id="h3" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cF" role="3cqZAp">
-          <node concept="2OqwBi" id="d1" role="3clFbG">
-            <node concept="37vLTw" id="d2" role="2Oq$k0">
-              <ref role="3cqZAo" node="cf" resolve="b" />
+        <node concept="3clFbF" id="gI" role="3cqZAp">
+          <node concept="2OqwBi" id="h4" role="3clFbG">
+            <node concept="37vLTw" id="h5" role="2Oq$k0">
+              <ref role="3cqZAo" node="gi" resolve="b" />
             </node>
-            <node concept="liA8E" id="d3" role="2OqNvi">
+            <node concept="liA8E" id="h6" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.parent(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="parent" />
-              <node concept="1adDum" id="d4" role="37wK5m">
+              <node concept="1adDum" id="h7" role="37wK5m">
                 <property role="1adDun" value="0x68015e26cc4d49dbL" />
               </node>
-              <node concept="1adDum" id="d5" role="37wK5m">
+              <node concept="1adDum" id="h8" role="37wK5m">
                 <property role="1adDun" value="0x8715b643faea1769L" />
               </node>
-              <node concept="1adDum" id="d6" role="37wK5m">
+              <node concept="1adDum" id="h9" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf0d058L" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cG" role="3cqZAp">
-          <node concept="2OqwBi" id="d7" role="3clFbG">
-            <node concept="37vLTw" id="d8" role="2Oq$k0">
-              <ref role="3cqZAo" node="cM" resolve="b" />
+        <node concept="3clFbF" id="gJ" role="3cqZAp">
+          <node concept="2OqwBi" id="ha" role="3clFbG">
+            <node concept="37vLTw" id="hb" role="2Oq$k0">
+              <ref role="3cqZAo" node="gP" resolve="b" />
             </node>
-            <node concept="liA8E" id="d9" role="2OqNvi">
+            <node concept="liA8E" id="hc" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
-              <node concept="Xl_RD" id="da" role="37wK5m">
+              <node concept="Xl_RD" id="hd" role="37wK5m">
                 <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093203543" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cH" role="3cqZAp">
-          <node concept="2OqwBi" id="db" role="3clFbG">
-            <node concept="37vLTw" id="dc" role="2Oq$k0">
-              <ref role="3cqZAo" node="cM" resolve="b" />
+        <node concept="3clFbF" id="gK" role="3cqZAp">
+          <node concept="2OqwBi" id="he" role="3clFbG">
+            <node concept="37vLTw" id="hf" role="2Oq$k0">
+              <ref role="3cqZAo" node="gP" resolve="b" />
             </node>
-            <node concept="liA8E" id="dd" role="2OqNvi">
+            <node concept="liA8E" id="hg" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
-              <node concept="3cmrfG" id="de" role="37wK5m">
+              <node concept="3cmrfG" id="hh" role="37wK5m">
                 <property role="3cmrfH" value="2" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cI" role="3cqZAp">
-          <node concept="2OqwBi" id="df" role="3clFbG">
-            <node concept="2OqwBi" id="dg" role="2Oq$k0">
-              <node concept="2OqwBi" id="di" role="2Oq$k0">
-                <node concept="2OqwBi" id="dk" role="2Oq$k0">
-                  <node concept="2OqwBi" id="dm" role="2Oq$k0">
-                    <node concept="2OqwBi" id="do" role="2Oq$k0">
-                      <node concept="2OqwBi" id="dq" role="2Oq$k0">
-                        <node concept="37vLTw" id="ds" role="2Oq$k0">
-                          <ref role="3cqZAo" node="cM" resolve="b" />
+        <node concept="3clFbF" id="gL" role="3cqZAp">
+          <node concept="2OqwBi" id="hi" role="3clFbG">
+            <node concept="2OqwBi" id="hj" role="2Oq$k0">
+              <node concept="2OqwBi" id="hl" role="2Oq$k0">
+                <node concept="2OqwBi" id="hn" role="2Oq$k0">
+                  <node concept="2OqwBi" id="hp" role="2Oq$k0">
+                    <node concept="2OqwBi" id="hr" role="2Oq$k0">
+                      <node concept="2OqwBi" id="ht" role="2Oq$k0">
+                        <node concept="37vLTw" id="hv" role="2Oq$k0">
+                          <ref role="3cqZAo" node="gP" resolve="b" />
                         </node>
-                        <node concept="liA8E" id="dt" role="2OqNvi">
+                        <node concept="liA8E" id="hw" role="2OqNvi">
                           <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
-                          <node concept="Xl_RD" id="du" role="37wK5m">
+                          <node concept="Xl_RD" id="hx" role="37wK5m">
                             <property role="Xl_RC" value="inputModel" />
                           </node>
-                          <node concept="1adDum" id="dv" role="37wK5m">
+                          <node concept="1adDum" id="hy" role="37wK5m">
                             <property role="1adDun" value="0x7b1db36ecf0d05eL" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="dr" role="2OqNvi">
+                      <node concept="liA8E" id="hu" role="2OqNvi">
                         <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
-                        <node concept="1adDum" id="dw" role="37wK5m">
+                        <node concept="1adDum" id="hz" role="37wK5m">
                           <property role="1adDun" value="0x68015e26cc4d49dbL" />
                         </node>
-                        <node concept="1adDum" id="dx" role="37wK5m">
+                        <node concept="1adDum" id="h$" role="37wK5m">
                           <property role="1adDun" value="0x8715b643faea1769L" />
                         </node>
-                        <node concept="1adDum" id="dy" role="37wK5m">
+                        <node concept="1adDum" id="h_" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf0d05bL" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="dp" role="2OqNvi">
+                    <node concept="liA8E" id="hs" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
-                      <node concept="3clFbT" id="dz" role="37wK5m">
+                      <node concept="3clFbT" id="hA" role="37wK5m">
                         <property role="3clFbU" value="false" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="dn" role="2OqNvi">
+                  <node concept="liA8E" id="hq" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
-                    <node concept="3clFbT" id="d$" role="37wK5m">
+                    <node concept="3clFbT" id="hB" role="37wK5m">
                       <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="dl" role="2OqNvi">
+                <node concept="liA8E" id="ho" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
-                  <node concept="3clFbT" id="d_" role="37wK5m">
+                  <node concept="3clFbT" id="hC" role="37wK5m">
                     <property role="3clFbU" value="false" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="dj" role="2OqNvi">
+              <node concept="liA8E" id="hm" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="dA" role="37wK5m">
+                <node concept="Xl_RD" id="hD" role="37wK5m">
                   <property role="Xl_RC" value="554465258093203550" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="dh" role="2OqNvi">
+            <node concept="liA8E" id="hk" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cJ" role="3cqZAp">
-          <node concept="2OqwBi" id="dB" role="3clFbG">
-            <node concept="2OqwBi" id="dC" role="2Oq$k0">
-              <node concept="2OqwBi" id="dE" role="2Oq$k0">
-                <node concept="2OqwBi" id="dG" role="2Oq$k0">
-                  <node concept="2OqwBi" id="dI" role="2Oq$k0">
-                    <node concept="2OqwBi" id="dK" role="2Oq$k0">
-                      <node concept="2OqwBi" id="dM" role="2Oq$k0">
-                        <node concept="37vLTw" id="dO" role="2Oq$k0">
-                          <ref role="3cqZAo" node="cM" resolve="b" />
+        <node concept="3clFbF" id="gM" role="3cqZAp">
+          <node concept="2OqwBi" id="hE" role="3clFbG">
+            <node concept="2OqwBi" id="hF" role="2Oq$k0">
+              <node concept="2OqwBi" id="hH" role="2Oq$k0">
+                <node concept="2OqwBi" id="hJ" role="2Oq$k0">
+                  <node concept="2OqwBi" id="hL" role="2Oq$k0">
+                    <node concept="2OqwBi" id="hN" role="2Oq$k0">
+                      <node concept="2OqwBi" id="hP" role="2Oq$k0">
+                        <node concept="37vLTw" id="hR" role="2Oq$k0">
+                          <ref role="3cqZAo" node="gP" resolve="b" />
                         </node>
-                        <node concept="liA8E" id="dP" role="2OqNvi">
+                        <node concept="liA8E" id="hS" role="2OqNvi">
                           <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
-                          <node concept="Xl_RD" id="dQ" role="37wK5m">
+                          <node concept="Xl_RD" id="hT" role="37wK5m">
                             <property role="Xl_RC" value="referenceModel" />
                           </node>
-                          <node concept="1adDum" id="dR" role="37wK5m">
+                          <node concept="1adDum" id="hU" role="37wK5m">
                             <property role="1adDun" value="0x7b1db36ecf0d060L" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="dN" role="2OqNvi">
+                      <node concept="liA8E" id="hQ" role="2OqNvi">
                         <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
-                        <node concept="1adDum" id="dS" role="37wK5m">
+                        <node concept="1adDum" id="hV" role="37wK5m">
                           <property role="1adDun" value="0x68015e26cc4d49dbL" />
                         </node>
-                        <node concept="1adDum" id="dT" role="37wK5m">
+                        <node concept="1adDum" id="hW" role="37wK5m">
                           <property role="1adDun" value="0x8715b643faea1769L" />
                         </node>
-                        <node concept="1adDum" id="dU" role="37wK5m">
+                        <node concept="1adDum" id="hX" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf0d05bL" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="dL" role="2OqNvi">
+                    <node concept="liA8E" id="hO" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
-                      <node concept="3clFbT" id="dV" role="37wK5m">
+                      <node concept="3clFbT" id="hY" role="37wK5m">
                         <property role="3clFbU" value="false" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="dJ" role="2OqNvi">
+                  <node concept="liA8E" id="hM" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
-                    <node concept="3clFbT" id="dW" role="37wK5m">
+                    <node concept="3clFbT" id="hZ" role="37wK5m">
                       <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="dH" role="2OqNvi">
+                <node concept="liA8E" id="hK" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
-                  <node concept="3clFbT" id="dX" role="37wK5m">
+                  <node concept="3clFbT" id="i0" role="37wK5m">
                     <property role="3clFbU" value="false" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="dF" role="2OqNvi">
+              <node concept="liA8E" id="hI" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="dY" role="37wK5m">
+                <node concept="Xl_RD" id="i1" role="37wK5m">
                   <property role="Xl_RC" value="554465258093203552" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="dD" role="2OqNvi">
+            <node concept="liA8E" id="hG" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cK" role="3cqZAp">
-          <node concept="2OqwBi" id="dZ" role="3clFbG">
-            <node concept="2OqwBi" id="e0" role="2Oq$k0">
-              <node concept="2OqwBi" id="e2" role="2Oq$k0">
-                <node concept="2OqwBi" id="e4" role="2Oq$k0">
-                  <node concept="2OqwBi" id="e6" role="2Oq$k0">
-                    <node concept="2OqwBi" id="e8" role="2Oq$k0">
-                      <node concept="2OqwBi" id="ea" role="2Oq$k0">
-                        <node concept="37vLTw" id="ec" role="2Oq$k0">
-                          <ref role="3cqZAo" node="cM" resolve="b" />
+        <node concept="3clFbF" id="gN" role="3cqZAp">
+          <node concept="2OqwBi" id="i2" role="3clFbG">
+            <node concept="2OqwBi" id="i3" role="2Oq$k0">
+              <node concept="2OqwBi" id="i5" role="2Oq$k0">
+                <node concept="2OqwBi" id="i7" role="2Oq$k0">
+                  <node concept="2OqwBi" id="i9" role="2Oq$k0">
+                    <node concept="2OqwBi" id="ib" role="2Oq$k0">
+                      <node concept="2OqwBi" id="id" role="2Oq$k0">
+                        <node concept="37vLTw" id="if" role="2Oq$k0">
+                          <ref role="3cqZAo" node="gP" resolve="b" />
                         </node>
-                        <node concept="liA8E" id="ed" role="2OqNvi">
+                        <node concept="liA8E" id="ig" role="2OqNvi">
                           <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
-                          <node concept="Xl_RD" id="ee" role="37wK5m">
+                          <node concept="Xl_RD" id="ih" role="37wK5m">
                             <property role="Xl_RC" value="transformationPlan" />
                           </node>
-                          <node concept="1adDum" id="ef" role="37wK5m">
+                          <node concept="1adDum" id="ii" role="37wK5m">
                             <property role="1adDun" value="0x7b1db36ecf0d063L" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="eb" role="2OqNvi">
+                      <node concept="liA8E" id="ie" role="2OqNvi">
                         <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
-                        <node concept="1adDum" id="eg" role="37wK5m">
+                        <node concept="1adDum" id="ij" role="37wK5m">
                           <property role="1adDun" value="0x68015e26cc4d49dbL" />
                         </node>
-                        <node concept="1adDum" id="eh" role="37wK5m">
+                        <node concept="1adDum" id="ik" role="37wK5m">
                           <property role="1adDun" value="0x8715b643faea1769L" />
                         </node>
-                        <node concept="1adDum" id="ei" role="37wK5m">
+                        <node concept="1adDum" id="il" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf0d05bL" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="e9" role="2OqNvi">
+                    <node concept="liA8E" id="ic" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
-                      <node concept="3clFbT" id="ej" role="37wK5m">
+                      <node concept="3clFbT" id="im" role="37wK5m">
                         <property role="3clFbU" value="true" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="e7" role="2OqNvi">
+                  <node concept="liA8E" id="ia" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
-                    <node concept="3clFbT" id="ek" role="37wK5m">
+                    <node concept="3clFbT" id="in" role="37wK5m">
                       <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="e5" role="2OqNvi">
+                <node concept="liA8E" id="i8" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
-                  <node concept="3clFbT" id="el" role="37wK5m">
+                  <node concept="3clFbT" id="io" role="37wK5m">
                     <property role="3clFbU" value="false" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="e3" role="2OqNvi">
+              <node concept="liA8E" id="i6" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="em" role="37wK5m">
+                <node concept="Xl_RD" id="ip" role="37wK5m">
                   <property role="Xl_RC" value="554465258093203555" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="e1" role="2OqNvi">
+            <node concept="liA8E" id="i4" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="cL" role="3cqZAp">
-          <node concept="2OqwBi" id="en" role="3cqZAk">
-            <node concept="37vLTw" id="eo" role="2Oq$k0">
-              <ref role="3cqZAo" node="cM" resolve="b" />
+        <node concept="3cpWs6" id="gO" role="3cqZAp">
+          <node concept="2OqwBi" id="iq" role="3cqZAk">
+            <node concept="37vLTw" id="ir" role="2Oq$k0">
+              <ref role="3cqZAo" node="gP" resolve="b" />
             </node>
-            <node concept="liA8E" id="ep" role="2OqNvi">
+            <node concept="liA8E" id="is" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="cB" role="1B3o_S" />
-      <node concept="3uibUv" id="cC" role="3clF45">
+      <node concept="3Tm6S6" id="gE" role="1B3o_S" />
+      <node concept="3uibUv" id="gF" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
     </node>
-    <node concept="2YIFZL" id="6x" role="jymVt">
+    <node concept="2YIFZL" id="8G" role="jymVt">
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="createDescriptorForTransformationMatchCustomConditions" />
+      <node concept="3clFbS" id="it" role="3clF47">
+        <node concept="3cpWs8" id="iw" role="3cqZAp">
+          <node concept="3cpWsn" id="iD" role="3cpWs9">
+            <property role="TrG5h" value="b" />
+            <node concept="3uibUv" id="iE" role="1tU5fm">
+              <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
+            </node>
+            <node concept="2ShNRf" id="iF" role="33vP2m">
+              <node concept="1pGfFk" id="iG" role="2ShVmc">
+                <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
+                <node concept="Xl_RD" id="iH" role="37wK5m">
+                  <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
+                </node>
+                <node concept="Xl_RD" id="iI" role="37wK5m">
+                  <property role="Xl_RC" value="TransformationMatchCustomConditions" />
+                </node>
+                <node concept="1adDum" id="iJ" role="37wK5m">
+                  <property role="1adDun" value="0x68015e26cc4d49dbL" />
+                </node>
+                <node concept="1adDum" id="iK" role="37wK5m">
+                  <property role="1adDun" value="0x8715b643faea1769L" />
+                </node>
+                <node concept="1adDum" id="iL" role="37wK5m">
+                  <property role="1adDun" value="0x6c6d272a13d346a9L" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="ix" role="3cqZAp">
+          <node concept="2OqwBi" id="iM" role="3clFbG">
+            <node concept="37vLTw" id="iN" role="2Oq$k0">
+              <ref role="3cqZAo" node="iD" resolve="b" />
+            </node>
+            <node concept="liA8E" id="iO" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.class_(boolean,boolean,boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="class_" />
+              <node concept="3clFbT" id="iP" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="3clFbT" id="iQ" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="3clFbT" id="iR" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="iy" role="3cqZAp">
+          <node concept="2OqwBi" id="iS" role="3clFbG">
+            <node concept="37vLTw" id="iT" role="2Oq$k0">
+              <ref role="3cqZAo" node="gi" resolve="b" />
+            </node>
+            <node concept="liA8E" id="iU" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.parent(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="parent" />
+              <node concept="1adDum" id="iV" role="37wK5m">
+                <property role="1adDun" value="0x68015e26cc4d49dbL" />
+              </node>
+              <node concept="1adDum" id="iW" role="37wK5m">
+                <property role="1adDun" value="0x8715b643faea1769L" />
+              </node>
+              <node concept="1adDum" id="iX" role="37wK5m">
+                <property role="1adDun" value="0x7b1db36ecf0d058L" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="iz" role="3cqZAp">
+          <node concept="2OqwBi" id="iY" role="3clFbG">
+            <node concept="37vLTw" id="iZ" role="2Oq$k0">
+              <ref role="3cqZAo" node="iD" resolve="b" />
+            </node>
+            <node concept="liA8E" id="j0" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
+              <node concept="Xl_RD" id="j1" role="37wK5m">
+                <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/7812943990232401577" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="i$" role="3cqZAp">
+          <node concept="2OqwBi" id="j2" role="3clFbG">
+            <node concept="37vLTw" id="j3" role="2Oq$k0">
+              <ref role="3cqZAo" node="iD" resolve="b" />
+            </node>
+            <node concept="liA8E" id="j4" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
+              <node concept="3cmrfG" id="j5" role="37wK5m">
+                <property role="3cmrfH" value="2" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="i_" role="3cqZAp">
+          <node concept="2OqwBi" id="j6" role="3clFbG">
+            <node concept="2OqwBi" id="j7" role="2Oq$k0">
+              <node concept="2OqwBi" id="j9" role="2Oq$k0">
+                <node concept="2OqwBi" id="jb" role="2Oq$k0">
+                  <node concept="2OqwBi" id="jd" role="2Oq$k0">
+                    <node concept="2OqwBi" id="jf" role="2Oq$k0">
+                      <node concept="2OqwBi" id="jh" role="2Oq$k0">
+                        <node concept="37vLTw" id="jj" role="2Oq$k0">
+                          <ref role="3cqZAo" node="iD" resolve="b" />
+                        </node>
+                        <node concept="liA8E" id="jk" role="2OqNvi">
+                          <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
+                          <node concept="Xl_RD" id="jl" role="37wK5m">
+                            <property role="Xl_RC" value="inputModel" />
+                          </node>
+                          <node concept="1adDum" id="jm" role="37wK5m">
+                            <property role="1adDun" value="0x6c6d272a13d346acL" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="ji" role="2OqNvi">
+                        <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
+                        <node concept="1adDum" id="jn" role="37wK5m">
+                          <property role="1adDun" value="0x68015e26cc4d49dbL" />
+                        </node>
+                        <node concept="1adDum" id="jo" role="37wK5m">
+                          <property role="1adDun" value="0x8715b643faea1769L" />
+                        </node>
+                        <node concept="1adDum" id="jp" role="37wK5m">
+                          <property role="1adDun" value="0x7b1db36ecf0d05bL" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="jg" role="2OqNvi">
+                      <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
+                      <node concept="3clFbT" id="jq" role="37wK5m">
+                        <property role="3clFbU" value="false" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="je" role="2OqNvi">
+                    <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
+                    <node concept="3clFbT" id="jr" role="37wK5m">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="jc" role="2OqNvi">
+                  <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
+                  <node concept="3clFbT" id="js" role="37wK5m">
+                    <property role="3clFbU" value="false" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="ja" role="2OqNvi">
+                <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
+                <node concept="Xl_RD" id="jt" role="37wK5m">
+                  <property role="Xl_RC" value="7812943990232401580" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="j8" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="iA" role="3cqZAp">
+          <node concept="2OqwBi" id="ju" role="3clFbG">
+            <node concept="2OqwBi" id="jv" role="2Oq$k0">
+              <node concept="2OqwBi" id="jx" role="2Oq$k0">
+                <node concept="2OqwBi" id="jz" role="2Oq$k0">
+                  <node concept="2OqwBi" id="j_" role="2Oq$k0">
+                    <node concept="2OqwBi" id="jB" role="2Oq$k0">
+                      <node concept="2OqwBi" id="jD" role="2Oq$k0">
+                        <node concept="37vLTw" id="jF" role="2Oq$k0">
+                          <ref role="3cqZAo" node="iD" resolve="b" />
+                        </node>
+                        <node concept="liA8E" id="jG" role="2OqNvi">
+                          <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
+                          <node concept="Xl_RD" id="jH" role="37wK5m">
+                            <property role="Xl_RC" value="transformationPlan" />
+                          </node>
+                          <node concept="1adDum" id="jI" role="37wK5m">
+                            <property role="1adDun" value="0x6c6d272a13d346aeL" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="jE" role="2OqNvi">
+                        <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
+                        <node concept="1adDum" id="jJ" role="37wK5m">
+                          <property role="1adDun" value="0x68015e26cc4d49dbL" />
+                        </node>
+                        <node concept="1adDum" id="jK" role="37wK5m">
+                          <property role="1adDun" value="0x8715b643faea1769L" />
+                        </node>
+                        <node concept="1adDum" id="jL" role="37wK5m">
+                          <property role="1adDun" value="0x7b1db36ecf0d05bL" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="jC" role="2OqNvi">
+                      <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
+                      <node concept="3clFbT" id="jM" role="37wK5m">
+                        <property role="3clFbU" value="true" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="jA" role="2OqNvi">
+                    <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
+                    <node concept="3clFbT" id="jN" role="37wK5m">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="j$" role="2OqNvi">
+                  <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
+                  <node concept="3clFbT" id="jO" role="37wK5m">
+                    <property role="3clFbU" value="false" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="jy" role="2OqNvi">
+                <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
+                <node concept="Xl_RD" id="jP" role="37wK5m">
+                  <property role="Xl_RC" value="7812943990232401582" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="jw" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="iB" role="3cqZAp">
+          <node concept="2OqwBi" id="jQ" role="3clFbG">
+            <node concept="2OqwBi" id="jR" role="2Oq$k0">
+              <node concept="2OqwBi" id="jT" role="2Oq$k0">
+                <node concept="2OqwBi" id="jV" role="2Oq$k0">
+                  <node concept="2OqwBi" id="jX" role="2Oq$k0">
+                    <node concept="2OqwBi" id="jZ" role="2Oq$k0">
+                      <node concept="2OqwBi" id="k1" role="2Oq$k0">
+                        <node concept="37vLTw" id="k3" role="2Oq$k0">
+                          <ref role="3cqZAo" node="iD" resolve="b" />
+                        </node>
+                        <node concept="liA8E" id="k4" role="2OqNvi">
+                          <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
+                          <node concept="Xl_RD" id="k5" role="37wK5m">
+                            <property role="Xl_RC" value="assertions" />
+                          </node>
+                          <node concept="1adDum" id="k6" role="37wK5m">
+                            <property role="1adDun" value="0x6c6d272a13d36ef9L" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="k2" role="2OqNvi">
+                        <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
+                        <node concept="1adDum" id="k7" role="37wK5m">
+                          <property role="1adDun" value="0x68015e26cc4d49dbL" />
+                        </node>
+                        <node concept="1adDum" id="k8" role="37wK5m">
+                          <property role="1adDun" value="0x8715b643faea1769L" />
+                        </node>
+                        <node concept="1adDum" id="k9" role="37wK5m">
+                          <property role="1adDun" value="0x6c6d272a13d37a56L" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="k0" role="2OqNvi">
+                      <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
+                      <node concept="3clFbT" id="ka" role="37wK5m">
+                        <property role="3clFbU" value="false" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="jY" role="2OqNvi">
+                    <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
+                    <node concept="3clFbT" id="kb" role="37wK5m">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="jW" role="2OqNvi">
+                  <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
+                  <node concept="3clFbT" id="kc" role="37wK5m">
+                    <property role="3clFbU" value="false" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="jU" role="2OqNvi">
+                <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
+                <node concept="Xl_RD" id="kd" role="37wK5m">
+                  <property role="Xl_RC" value="7812943990232411897" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="jS" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="iC" role="3cqZAp">
+          <node concept="2OqwBi" id="ke" role="3cqZAk">
+            <node concept="37vLTw" id="kf" role="2Oq$k0">
+              <ref role="3cqZAo" node="iD" resolve="b" />
+            </node>
+            <node concept="liA8E" id="kg" role="2OqNvi">
+              <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="iu" role="1B3o_S" />
+      <node concept="3uibUv" id="iv" role="3clF45">
+        <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
+      </node>
+    </node>
+    <node concept="2YIFZL" id="8H" role="jymVt">
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <property role="TrG5h" value="createDescriptorForTransformationMatchManyAssertion" />
-      <node concept="3clFbS" id="eq" role="3clF47">
-        <node concept="3cpWs8" id="et" role="3cqZAp">
-          <node concept="3cpWsn" id="eA" role="3cpWs9">
+      <node concept="3clFbS" id="kh" role="3clF47">
+        <node concept="3cpWs8" id="kk" role="3cqZAp">
+          <node concept="3cpWsn" id="kt" role="3cpWs9">
             <property role="TrG5h" value="b" />
-            <node concept="3uibUv" id="eB" role="1tU5fm">
+            <node concept="3uibUv" id="ku" role="1tU5fm">
               <ref role="3uigEE" to="bzg8:~ConceptDescriptorBuilder2" resolve="ConceptDescriptorBuilder2" />
             </node>
-            <node concept="2ShNRf" id="eC" role="33vP2m">
-              <node concept="1pGfFk" id="eD" role="2ShVmc">
+            <node concept="2ShNRf" id="kv" role="33vP2m">
+              <node concept="1pGfFk" id="kw" role="2ShVmc">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.&lt;init&gt;(java.lang.String,java.lang.String,long,long,long)" resolve="ConceptDescriptorBuilder2" />
-                <node concept="Xl_RD" id="eE" role="37wK5m">
+                <node concept="Xl_RD" id="kx" role="37wK5m">
                   <property role="Xl_RC" value="jetbrains.mps.lang.test.generator" />
                 </node>
-                <node concept="Xl_RD" id="eF" role="37wK5m">
+                <node concept="Xl_RD" id="ky" role="37wK5m">
                   <property role="Xl_RC" value="TransformationMatchManyAssertion" />
                 </node>
-                <node concept="1adDum" id="eG" role="37wK5m">
+                <node concept="1adDum" id="kz" role="37wK5m">
                   <property role="1adDun" value="0x68015e26cc4d49dbL" />
                 </node>
-                <node concept="1adDum" id="eH" role="37wK5m">
+                <node concept="1adDum" id="k$" role="37wK5m">
                   <property role="1adDun" value="0x8715b643faea1769L" />
                 </node>
-                <node concept="1adDum" id="eI" role="37wK5m">
+                <node concept="1adDum" id="k_" role="37wK5m">
                   <property role="1adDun" value="0x5812b95d667f29d9L" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="eu" role="3cqZAp">
-          <node concept="2OqwBi" id="eJ" role="3clFbG">
-            <node concept="37vLTw" id="eK" role="2Oq$k0">
-              <ref role="3cqZAo" node="eA" resolve="b" />
+        <node concept="3clFbF" id="kl" role="3cqZAp">
+          <node concept="2OqwBi" id="kA" role="3clFbG">
+            <node concept="37vLTw" id="kB" role="2Oq$k0">
+              <ref role="3cqZAo" node="kt" resolve="b" />
             </node>
-            <node concept="liA8E" id="eL" role="2OqNvi">
+            <node concept="liA8E" id="kC" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.class_(boolean,boolean,boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="class_" />
-              <node concept="3clFbT" id="eM" role="37wK5m">
+              <node concept="3clFbT" id="kD" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="eN" role="37wK5m">
+              <node concept="3clFbT" id="kE" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
-              <node concept="3clFbT" id="eO" role="37wK5m">
+              <node concept="3clFbT" id="kF" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="ev" role="3cqZAp">
-          <node concept="2OqwBi" id="eP" role="3clFbG">
-            <node concept="37vLTw" id="eQ" role="2Oq$k0">
-              <ref role="3cqZAo" node="cf" resolve="b" />
+        <node concept="3clFbF" id="km" role="3cqZAp">
+          <node concept="2OqwBi" id="kG" role="3clFbG">
+            <node concept="37vLTw" id="kH" role="2Oq$k0">
+              <ref role="3cqZAo" node="gi" resolve="b" />
             </node>
-            <node concept="liA8E" id="eR" role="2OqNvi">
+            <node concept="liA8E" id="kI" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.parent(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="parent" />
-              <node concept="1adDum" id="eS" role="37wK5m">
+              <node concept="1adDum" id="kJ" role="37wK5m">
                 <property role="1adDun" value="0x68015e26cc4d49dbL" />
               </node>
-              <node concept="1adDum" id="eT" role="37wK5m">
+              <node concept="1adDum" id="kK" role="37wK5m">
                 <property role="1adDun" value="0x8715b643faea1769L" />
               </node>
-              <node concept="1adDum" id="eU" role="37wK5m">
+              <node concept="1adDum" id="kL" role="37wK5m">
                 <property role="1adDun" value="0x7b1db36ecf0d058L" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="ew" role="3cqZAp">
-          <node concept="2OqwBi" id="eV" role="3clFbG">
-            <node concept="37vLTw" id="eW" role="2Oq$k0">
-              <ref role="3cqZAo" node="eA" resolve="b" />
+        <node concept="3clFbF" id="kn" role="3cqZAp">
+          <node concept="2OqwBi" id="kM" role="3clFbG">
+            <node concept="37vLTw" id="kN" role="2Oq$k0">
+              <ref role="3cqZAo" node="kt" resolve="b" />
             </node>
-            <node concept="liA8E" id="eX" role="2OqNvi">
+            <node concept="liA8E" id="kO" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="origin" />
-              <node concept="Xl_RD" id="eY" role="37wK5m">
+              <node concept="Xl_RD" id="kP" role="37wK5m">
                 <property role="Xl_RC" value="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/6346338635721157081" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="ex" role="3cqZAp">
-          <node concept="2OqwBi" id="eZ" role="3clFbG">
-            <node concept="37vLTw" id="f0" role="2Oq$k0">
-              <ref role="3cqZAo" node="eA" resolve="b" />
+        <node concept="3clFbF" id="ko" role="3cqZAp">
+          <node concept="2OqwBi" id="kQ" role="3clFbG">
+            <node concept="37vLTw" id="kR" role="2Oq$k0">
+              <ref role="3cqZAo" node="kt" resolve="b" />
             </node>
-            <node concept="liA8E" id="f1" role="2OqNvi">
+            <node concept="liA8E" id="kS" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.version(int):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="version" />
-              <node concept="3cmrfG" id="f2" role="37wK5m">
+              <node concept="3cmrfG" id="kT" role="37wK5m">
                 <property role="3cmrfH" value="2" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="ey" role="3cqZAp">
-          <node concept="2OqwBi" id="f3" role="3clFbG">
-            <node concept="2OqwBi" id="f4" role="2Oq$k0">
-              <node concept="2OqwBi" id="f6" role="2Oq$k0">
-                <node concept="2OqwBi" id="f8" role="2Oq$k0">
-                  <node concept="2OqwBi" id="fa" role="2Oq$k0">
-                    <node concept="2OqwBi" id="fc" role="2Oq$k0">
-                      <node concept="2OqwBi" id="fe" role="2Oq$k0">
-                        <node concept="37vLTw" id="fg" role="2Oq$k0">
-                          <ref role="3cqZAo" node="eA" resolve="b" />
+        <node concept="3clFbF" id="kp" role="3cqZAp">
+          <node concept="2OqwBi" id="kU" role="3clFbG">
+            <node concept="2OqwBi" id="kV" role="2Oq$k0">
+              <node concept="2OqwBi" id="kX" role="2Oq$k0">
+                <node concept="2OqwBi" id="kZ" role="2Oq$k0">
+                  <node concept="2OqwBi" id="l1" role="2Oq$k0">
+                    <node concept="2OqwBi" id="l3" role="2Oq$k0">
+                      <node concept="2OqwBi" id="l5" role="2Oq$k0">
+                        <node concept="37vLTw" id="l7" role="2Oq$k0">
+                          <ref role="3cqZAo" node="kt" resolve="b" />
                         </node>
-                        <node concept="liA8E" id="fh" role="2OqNvi">
+                        <node concept="liA8E" id="l8" role="2OqNvi">
                           <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
-                          <node concept="Xl_RD" id="fi" role="37wK5m">
+                          <node concept="Xl_RD" id="l9" role="37wK5m">
                             <property role="Xl_RC" value="inputModel" />
                           </node>
-                          <node concept="1adDum" id="fj" role="37wK5m">
+                          <node concept="1adDum" id="la" role="37wK5m">
                             <property role="1adDun" value="0x7b1db36ecf0d05eL" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="ff" role="2OqNvi">
+                      <node concept="liA8E" id="l6" role="2OqNvi">
                         <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
-                        <node concept="1adDum" id="fk" role="37wK5m">
+                        <node concept="1adDum" id="lb" role="37wK5m">
                           <property role="1adDun" value="0x68015e26cc4d49dbL" />
                         </node>
-                        <node concept="1adDum" id="fl" role="37wK5m">
+                        <node concept="1adDum" id="lc" role="37wK5m">
                           <property role="1adDun" value="0x8715b643faea1769L" />
                         </node>
-                        <node concept="1adDum" id="fm" role="37wK5m">
+                        <node concept="1adDum" id="ld" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf0d05bL" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="fd" role="2OqNvi">
+                    <node concept="liA8E" id="l4" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
-                      <node concept="3clFbT" id="fn" role="37wK5m">
+                      <node concept="3clFbT" id="le" role="37wK5m">
                         <property role="3clFbU" value="false" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="fb" role="2OqNvi">
+                  <node concept="liA8E" id="l2" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
-                    <node concept="3clFbT" id="fo" role="37wK5m">
+                    <node concept="3clFbT" id="lf" role="37wK5m">
                       <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="f9" role="2OqNvi">
+                <node concept="liA8E" id="l0" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
-                  <node concept="3clFbT" id="fp" role="37wK5m">
+                  <node concept="3clFbT" id="lg" role="37wK5m">
                     <property role="3clFbU" value="false" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="f7" role="2OqNvi">
+              <node concept="liA8E" id="kY" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="fq" role="37wK5m">
+                <node concept="Xl_RD" id="lh" role="37wK5m">
                   <property role="Xl_RC" value="6346338635721157083" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="f5" role="2OqNvi">
+            <node concept="liA8E" id="kW" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="ez" role="3cqZAp">
-          <node concept="2OqwBi" id="fr" role="3clFbG">
-            <node concept="2OqwBi" id="fs" role="2Oq$k0">
-              <node concept="2OqwBi" id="fu" role="2Oq$k0">
-                <node concept="2OqwBi" id="fw" role="2Oq$k0">
-                  <node concept="2OqwBi" id="fy" role="2Oq$k0">
-                    <node concept="2OqwBi" id="f$" role="2Oq$k0">
-                      <node concept="2OqwBi" id="fA" role="2Oq$k0">
-                        <node concept="37vLTw" id="fC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="eA" resolve="b" />
+        <node concept="3clFbF" id="kq" role="3cqZAp">
+          <node concept="2OqwBi" id="li" role="3clFbG">
+            <node concept="2OqwBi" id="lj" role="2Oq$k0">
+              <node concept="2OqwBi" id="ll" role="2Oq$k0">
+                <node concept="2OqwBi" id="ln" role="2Oq$k0">
+                  <node concept="2OqwBi" id="lp" role="2Oq$k0">
+                    <node concept="2OqwBi" id="lr" role="2Oq$k0">
+                      <node concept="2OqwBi" id="lt" role="2Oq$k0">
+                        <node concept="37vLTw" id="lv" role="2Oq$k0">
+                          <ref role="3cqZAo" node="kt" resolve="b" />
                         </node>
-                        <node concept="liA8E" id="fD" role="2OqNvi">
+                        <node concept="liA8E" id="lw" role="2OqNvi">
                           <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
-                          <node concept="Xl_RD" id="fE" role="37wK5m">
+                          <node concept="Xl_RD" id="lx" role="37wK5m">
                             <property role="Xl_RC" value="referenceModels" />
                           </node>
-                          <node concept="1adDum" id="fF" role="37wK5m">
+                          <node concept="1adDum" id="ly" role="37wK5m">
                             <property role="1adDun" value="0x7b1db36ecf0d060L" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="fB" role="2OqNvi">
+                      <node concept="liA8E" id="lu" role="2OqNvi">
                         <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
-                        <node concept="1adDum" id="fG" role="37wK5m">
+                        <node concept="1adDum" id="lz" role="37wK5m">
                           <property role="1adDun" value="0x68015e26cc4d49dbL" />
                         </node>
-                        <node concept="1adDum" id="fH" role="37wK5m">
+                        <node concept="1adDum" id="l$" role="37wK5m">
                           <property role="1adDun" value="0x8715b643faea1769L" />
                         </node>
-                        <node concept="1adDum" id="fI" role="37wK5m">
+                        <node concept="1adDum" id="l_" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf0d05bL" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="f_" role="2OqNvi">
+                    <node concept="liA8E" id="ls" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
-                      <node concept="3clFbT" id="fJ" role="37wK5m">
+                      <node concept="3clFbT" id="lA" role="37wK5m">
                         <property role="3clFbU" value="false" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="fz" role="2OqNvi">
+                  <node concept="liA8E" id="lq" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
-                    <node concept="3clFbT" id="fK" role="37wK5m">
+                    <node concept="3clFbT" id="lB" role="37wK5m">
                       <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="fx" role="2OqNvi">
+                <node concept="liA8E" id="lo" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
-                  <node concept="3clFbT" id="fL" role="37wK5m">
+                  <node concept="3clFbT" id="lC" role="37wK5m">
                     <property role="3clFbU" value="true" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="fv" role="2OqNvi">
+              <node concept="liA8E" id="lm" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="fM" role="37wK5m">
+                <node concept="Xl_RD" id="lD" role="37wK5m">
                   <property role="Xl_RC" value="6346338635721157084" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="ft" role="2OqNvi">
+            <node concept="liA8E" id="lk" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="e$" role="3cqZAp">
-          <node concept="2OqwBi" id="fN" role="3clFbG">
-            <node concept="2OqwBi" id="fO" role="2Oq$k0">
-              <node concept="2OqwBi" id="fQ" role="2Oq$k0">
-                <node concept="2OqwBi" id="fS" role="2Oq$k0">
-                  <node concept="2OqwBi" id="fU" role="2Oq$k0">
-                    <node concept="2OqwBi" id="fW" role="2Oq$k0">
-                      <node concept="2OqwBi" id="fY" role="2Oq$k0">
-                        <node concept="37vLTw" id="g0" role="2Oq$k0">
-                          <ref role="3cqZAo" node="eA" resolve="b" />
+        <node concept="3clFbF" id="kr" role="3cqZAp">
+          <node concept="2OqwBi" id="lE" role="3clFbG">
+            <node concept="2OqwBi" id="lF" role="2Oq$k0">
+              <node concept="2OqwBi" id="lH" role="2Oq$k0">
+                <node concept="2OqwBi" id="lJ" role="2Oq$k0">
+                  <node concept="2OqwBi" id="lL" role="2Oq$k0">
+                    <node concept="2OqwBi" id="lN" role="2Oq$k0">
+                      <node concept="2OqwBi" id="lP" role="2Oq$k0">
+                        <node concept="37vLTw" id="lR" role="2Oq$k0">
+                          <ref role="3cqZAo" node="kt" resolve="b" />
                         </node>
-                        <node concept="liA8E" id="g1" role="2OqNvi">
+                        <node concept="liA8E" id="lS" role="2OqNvi">
                           <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.aggregate(java.lang.String,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="aggregate" />
-                          <node concept="Xl_RD" id="g2" role="37wK5m">
+                          <node concept="Xl_RD" id="lT" role="37wK5m">
                             <property role="Xl_RC" value="transformationPlan" />
                           </node>
-                          <node concept="1adDum" id="g3" role="37wK5m">
+                          <node concept="1adDum" id="lU" role="37wK5m">
                             <property role="1adDun" value="0x7b1db36ecf0d063L" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="fZ" role="2OqNvi">
+                      <node concept="liA8E" id="lQ" role="2OqNvi">
                         <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.target(long,long,long):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="target" />
-                        <node concept="1adDum" id="g4" role="37wK5m">
+                        <node concept="1adDum" id="lV" role="37wK5m">
                           <property role="1adDun" value="0x68015e26cc4d49dbL" />
                         </node>
-                        <node concept="1adDum" id="g5" role="37wK5m">
+                        <node concept="1adDum" id="lW" role="37wK5m">
                           <property role="1adDun" value="0x8715b643faea1769L" />
                         </node>
-                        <node concept="1adDum" id="g6" role="37wK5m">
+                        <node concept="1adDum" id="lX" role="37wK5m">
                           <property role="1adDun" value="0x7b1db36ecf0d05bL" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="fX" role="2OqNvi">
+                    <node concept="liA8E" id="lO" role="2OqNvi">
                       <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.optional(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="optional" />
-                      <node concept="3clFbT" id="g7" role="37wK5m">
+                      <node concept="3clFbT" id="lY" role="37wK5m">
                         <property role="3clFbU" value="true" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="fV" role="2OqNvi">
+                  <node concept="liA8E" id="lM" role="2OqNvi">
                     <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.ordered(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="ordered" />
-                    <node concept="3clFbT" id="g8" role="37wK5m">
+                    <node concept="3clFbT" id="lZ" role="37wK5m">
                       <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="fT" role="2OqNvi">
+                <node concept="liA8E" id="lK" role="2OqNvi">
                   <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.multiple(boolean):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="multiple" />
-                  <node concept="3clFbT" id="g9" role="37wK5m">
+                  <node concept="3clFbT" id="m0" role="37wK5m">
                     <property role="3clFbU" value="false" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="fR" role="2OqNvi">
+              <node concept="liA8E" id="lI" role="2OqNvi">
                 <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.origin(java.lang.String):jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2$AggregationLinkBuilder" resolve="origin" />
-                <node concept="Xl_RD" id="ga" role="37wK5m">
+                <node concept="Xl_RD" id="m1" role="37wK5m">
                   <property role="Xl_RC" value="6346338635721157085" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="fP" role="2OqNvi">
+            <node concept="liA8E" id="lG" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2$AggregationLinkBuilder.done():jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder2" resolve="done" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="e_" role="3cqZAp">
-          <node concept="2OqwBi" id="gb" role="3cqZAk">
-            <node concept="37vLTw" id="gc" role="2Oq$k0">
-              <ref role="3cqZAo" node="eA" resolve="b" />
+        <node concept="3cpWs6" id="ks" role="3cqZAp">
+          <node concept="2OqwBi" id="m2" role="3cqZAk">
+            <node concept="37vLTw" id="m3" role="2Oq$k0">
+              <ref role="3cqZAo" node="kt" resolve="b" />
             </node>
-            <node concept="liA8E" id="gd" role="2OqNvi">
+            <node concept="liA8E" id="m4" role="2OqNvi">
               <ref role="37wK5l" to="bzg8:~ConceptDescriptorBuilder2.create():jetbrains.mps.smodel.runtime.ConceptDescriptor" resolve="create" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="er" role="1B3o_S" />
-      <node concept="3uibUv" id="es" role="3clF45">
+      <node concept="3Tm6S6" id="ki" role="1B3o_S" />
+      <node concept="3uibUv" id="kj" role="3clF45">
         <ref role="3uigEE" to="ze1i:~ConceptDescriptor" resolve="ConceptDescriptor" />
       </node>
     </node>
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/trace.info b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/trace.info
index 87dc76ac88c4..df818abc8f5b 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/trace.info
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/structure/trace.info
@@ -9,262 +9,370 @@
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1081236700938:jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
   <root>
     <file name="ConceptPresentationAspectImpl.java">
-      <unit at="11,0,79,0" name="jetbrains.mps.lang.test.generator.structure.ConceptPresentationAspectImpl" />
+      <unit at="11,0,104,0" name="jetbrains.mps.lang.test.generator.structure.ConceptPresentationAspectImpl" />
     </file>
     <file name="LanguageConceptSwitch.java">
-      <unit at="10,0,40,0" name="jetbrains.mps.lang.test.generator.structure.LanguageConceptSwitch" />
+      <unit at="10,0,46,0" name="jetbrains.mps.lang.test.generator.structure.LanguageConceptSwitch" />
     </file>
     <file name="StructureAspectDescriptor.java">
-      <unit at="14,0,127,0" name="jetbrains.mps.lang.test.generator.structure.StructureAspectDescriptor" />
+      <unit at="16,0,167,0" name="jetbrains.mps.lang.test.generator.structure.StructureAspectDescriptor" />
     </file>
   </root>
   <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093187774">
     <file name="ConceptPresentationAspectImpl.java">
-      <node id="554465258093187774" at="13,0,14,0" concept="1" trace="props_GeneratorTest" />
-      <node id="554465258093187774" at="33,42,34,76" concept="3" />
-      <node id="554465258093187774" at="34,76,35,35" concept="0" />
-      <node id="554465258093187774" at="35,35,36,45" concept="0" />
-      <node id="554465258093187774" at="37,9,38,35" concept="4" />
-      <node id="554465258093187774" at="32,47,37,9" concept="2" />
-      <scope id="554465258093187774" at="33,42,36,45">
+      <node id="554465258093187774" at="14,0,15,0" concept="1" trace="props_GeneratorTest" />
+      <node id="554465258093187774" at="43,42,44,76" concept="3" />
+      <node id="554465258093187774" at="44,76,45,35" concept="0" />
+      <node id="554465258093187774" at="45,35,46,45" concept="0" />
+      <node id="554465258093187774" at="47,9,48,35" concept="4" />
+      <node id="554465258093187774" at="42,47,47,9" concept="2" />
+      <scope id="554465258093187774" at="43,42,46,45">
         <var name="cpb" id="554465258093187774" />
       </scope>
-      <scope id="554465258093187774" at="32,47,38,35" />
+      <scope id="554465258093187774" at="42,47,48,35" />
     </file>
     <file name="LanguageConceptSwitch.java">
-      <node id="554465258093187774" at="13,0,14,0" concept="5" trace="GeneratorTest" />
-      <node id="554465258093187774" at="22,55,23,51" concept="0" />
+      <node id="554465258093187774" at="14,0,15,0" concept="5" trace="GeneratorTest" />
+      <node id="554465258093187774" at="26,59,27,51" concept="0" />
     </file>
     <file name="StructureAspectDescriptor.java">
-      <node id="554465258093187774" at="16,0,17,0" concept="1" trace="myConceptGeneratorTest" />
-      <node id="554465258093187774" at="39,47,40,38" concept="4" />
-      <node id="554465258093187774" at="68,71,69,180" concept="3" />
-      <node id="554465258093187774" at="69,180,70,33" concept="0" />
-      <node id="554465258093187774" at="70,33,71,71" concept="0" />
-      <node id="554465258093187774" at="71,71,72,119" concept="0" />
-      <node id="554465258093187774" at="72,119,73,17" concept="0" />
-      <node id="554465258093190244" at="73,17,74,68" concept="0" />
-      <node id="554465258093190247" at="74,68,75,198" concept="0" />
-      <node id="554465258093203559" at="75,198,76,194" concept="0" />
-      <node id="554465258093187774" at="76,194,77,22" concept="4" />
-      <node id="554465258093187774" at="68,0,79,0" concept="6" trace="createDescriptorForGeneratorTest#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
-      <scope id="554465258093187774" at="39,47,40,38" />
-      <scope id="554465258093187774" at="68,71,77,22">
+      <node id="554465258093187774" at="19,0,20,0" concept="1" trace="myConceptGeneratorTest" />
+      <node id="554465258093187774" at="46,47,47,38" concept="4" />
+      <node id="554465258093187774" at="88,71,89,180" concept="3" />
+      <node id="554465258093187774" at="89,180,90,33" concept="0" />
+      <node id="554465258093187774" at="90,33,91,71" concept="0" />
+      <node id="554465258093187774" at="91,71,92,119" concept="0" />
+      <node id="554465258093187774" at="92,119,93,17" concept="0" />
+      <node id="554465258093190244" at="93,17,94,68" concept="0" />
+      <node id="554465258093190247" at="94,68,95,198" concept="0" />
+      <node id="554465258093203559" at="95,198,96,194" concept="0" />
+      <node id="554465258093187774" at="96,194,97,22" concept="4" />
+      <node id="554465258093187774" at="88,0,99,0" concept="6" trace="createDescriptorForGeneratorTest#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="554465258093187774" at="46,47,47,38" />
+      <scope id="554465258093187774" at="88,71,97,22">
         <var name="b" id="554465258093187774" />
       </scope>
-      <scope id="554465258093187774" at="68,0,79,0" />
+      <scope id="554465258093187774" at="88,0,99,0" />
     </file>
   </root>
   <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093190250">
     <file name="ConceptPresentationAspectImpl.java">
-      <node id="554465258093190250" at="15,0,16,0" concept="1" trace="props_TestArgument" />
-      <node id="554465258093190250" at="48,41,49,76" concept="3" />
-      <node id="554465258093190250" at="49,76,50,44" concept="0" />
-      <node id="554465258093190250" at="51,9,52,34" concept="4" />
-      <node id="554465258093190250" at="47,46,51,9" concept="2" />
-      <scope id="554465258093190250" at="48,41,50,44">
+      <node id="554465258093190250" at="17,0,18,0" concept="1" trace="props_TestArgument" />
+      <node id="554465258093190250" at="65,41,66,76" concept="3" />
+      <node id="554465258093190250" at="66,76,67,44" concept="0" />
+      <node id="554465258093190250" at="68,9,69,34" concept="4" />
+      <node id="554465258093190250" at="64,46,68,9" concept="2" />
+      <scope id="554465258093190250" at="65,41,67,44">
         <var name="cpb" id="554465258093190250" />
       </scope>
-      <scope id="554465258093190250" at="47,46,52,34" />
+      <scope id="554465258093190250" at="64,46,69,34" />
     </file>
     <file name="LanguageConceptSwitch.java">
-      <node id="554465258093190250" at="15,0,16,0" concept="5" trace="TestArgument" />
-      <node id="554465258093190250" at="24,51,25,50" concept="0" />
+      <node id="554465258093190250" at="17,0,18,0" concept="5" trace="TestArgument" />
+      <node id="554465258093190250" at="29,69,30,50" concept="0" />
     </file>
     <file name="StructureAspectDescriptor.java">
-      <node id="554465258093190250" at="18,0,19,0" concept="1" trace="myConceptTestArgument" />
-      <node id="554465258093190250" at="43,46,44,37" concept="4" />
-      <node id="554465258093190250" at="81,34,82,75" concept="0" />
-      <node id="554465258093190250" at="89,70,90,179" concept="3" />
-      <node id="554465258093190250" at="90,179,91,19" concept="0" />
-      <node id="554465258093190250" at="91,19,92,71" concept="0" />
-      <node id="554465258093190250" at="92,71,93,119" concept="0" />
-      <node id="554465258093190250" at="93,119,94,17" concept="0" />
-      <node id="554465258093190250" at="94,17,95,22" concept="4" />
-      <node id="554465258093190250" at="89,0,97,0" concept="6" trace="createDescriptorForTestArgument#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
-      <scope id="554465258093190250" at="43,46,44,37" />
-      <scope id="554465258093190250" at="89,70,95,22">
+      <node id="554465258093190250" at="22,0,23,0" concept="1" trace="myConceptTestArgument" />
+      <node id="554465258093190250" at="52,46,53,37" concept="4" />
+      <node id="554465258093190250" at="101,34,102,75" concept="0" />
+      <node id="554465258093190250" at="118,70,119,179" concept="3" />
+      <node id="554465258093190250" at="119,179,120,19" concept="0" />
+      <node id="554465258093190250" at="120,19,121,71" concept="0" />
+      <node id="554465258093190250" at="121,71,122,119" concept="0" />
+      <node id="554465258093190250" at="122,119,123,17" concept="0" />
+      <node id="554465258093190250" at="123,17,124,22" concept="4" />
+      <node id="554465258093190250" at="118,0,126,0" concept="6" trace="createDescriptorForTestArgument#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="554465258093190250" at="52,46,53,37" />
+      <scope id="554465258093190250" at="118,70,124,22">
         <var name="b" id="554465258093190250" />
       </scope>
-      <scope id="554465258093190250" at="89,0,97,0" />
+      <scope id="554465258093190250" at="118,0,126,0" />
     </file>
   </root>
   <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093190254">
     <file name="ConceptPresentationAspectImpl.java">
-      <node id="554465258093190254" at="14,0,15,0" concept="1" trace="props_ModelArgument" />
-      <node id="554465258093190254" at="40,42,41,76" concept="3" />
-      <node id="554465258093190254" at="41,76,42,69" concept="0" />
-      <node id="554465258093190254" at="42,69,43,35" concept="0" />
-      <node id="554465258093190254" at="43,35,44,45" concept="0" />
-      <node id="554465258093190254" at="45,9,46,35" concept="4" />
-      <node id="554465258093190254" at="39,47,45,9" concept="2" />
-      <scope id="554465258093190254" at="40,42,44,45">
+      <node id="554465258093190254" at="15,0,16,0" concept="1" trace="props_ModelArgument" />
+      <node id="554465258093190254" at="50,42,51,76" concept="3" />
+      <node id="554465258093190254" at="51,76,52,69" concept="0" />
+      <node id="554465258093190254" at="52,69,53,35" concept="0" />
+      <node id="554465258093190254" at="53,35,54,45" concept="0" />
+      <node id="554465258093190254" at="55,9,56,35" concept="4" />
+      <node id="554465258093190254" at="49,47,55,9" concept="2" />
+      <scope id="554465258093190254" at="50,42,54,45">
         <var name="cpb" id="554465258093190254" />
       </scope>
-      <scope id="554465258093190254" at="39,47,46,35" />
+      <scope id="554465258093190254" at="49,47,56,35" />
     </file>
     <file name="LanguageConceptSwitch.java">
-      <node id="554465258093190254" at="14,0,15,0" concept="5" trace="ModelArgument" />
-      <node id="554465258093190254" at="23,51,24,51" concept="0" />
+      <node id="554465258093190254" at="15,0,16,0" concept="5" trace="ModelArgument" />
+      <node id="554465258093190254" at="27,51,28,51" concept="0" />
     </file>
     <file name="StructureAspectDescriptor.java">
-      <node id="554465258093190254" at="17,0,18,0" concept="1" trace="myConceptModelArgument" />
-      <node id="554465258093190254" at="41,47,42,38" concept="4" />
-      <node id="554465258093190254" at="79,71,80,180" concept="3" />
-      <node id="554465258093190254" at="80,180,81,34" concept="0" />
-      <node id="554465258093190254" at="82,75,83,119" concept="0" />
-      <node id="554465258093190254" at="83,119,84,17" concept="0" />
-      <node id="554465258093190258" at="84,17,85,197" concept="0" />
-      <node id="554465258093190254" at="85,197,86,21" concept="0" />
-      <node id="554465258093190254" at="86,21,87,22" concept="4" />
-      <node id="554465258093190254" at="79,0,89,0" concept="6" trace="createDescriptorForModelArgument#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
-      <scope id="554465258093190254" at="41,47,42,38" />
-      <scope id="554465258093190254" at="79,71,87,22">
+      <node id="554465258093190254" at="20,0,21,0" concept="1" trace="myConceptModelArgument" />
+      <node id="554465258093190254" at="48,47,49,38" concept="4" />
+      <node id="554465258093190254" at="99,71,100,180" concept="3" />
+      <node id="554465258093190254" at="100,180,101,34" concept="0" />
+      <node id="554465258093190254" at="102,75,103,119" concept="0" />
+      <node id="554465258093190254" at="103,119,104,17" concept="0" />
+      <node id="554465258093190258" at="104,17,105,197" concept="0" />
+      <node id="554465258093190254" at="105,197,106,21" concept="0" />
+      <node id="554465258093190254" at="106,21,107,22" concept="4" />
+      <node id="554465258093190254" at="99,0,109,0" concept="6" trace="createDescriptorForModelArgument#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="554465258093190254" at="48,47,49,38" />
+      <scope id="554465258093190254" at="99,71,107,22">
         <var name="b" id="554465258093190254" />
       </scope>
-      <scope id="554465258093190254" at="79,0,89,0" />
+      <scope id="554465258093190254" at="99,0,109,0" />
     </file>
   </root>
   <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093203543">
     <file name="ConceptPresentationAspectImpl.java">
-      <node id="554465258093203543" at="17,0,18,0" concept="1" trace="props_TransformationMatchAssertion" />
-      <node id="554465258093203543" at="60,57,61,76" concept="3" />
-      <node id="554465258093203543" at="61,76,62,68" concept="0" />
-      <node id="554465258093203543" at="62,68,63,62" concept="0" />
-      <node id="554465258093203543" at="63,62,64,60" concept="0" />
-      <node id="554465258093203543" at="65,9,66,50" concept="4" />
-      <node id="554465258093203543" at="59,62,65,9" concept="2" />
-      <scope id="554465258093203543" at="60,57,64,60">
+      <node id="554465258093203543" at="19,0,20,0" concept="1" trace="props_TransformationMatchAssertion" />
+      <node id="554465258093203543" at="77,57,78,76" concept="3" />
+      <node id="554465258093203543" at="78,76,79,68" concept="0" />
+      <node id="554465258093203543" at="79,68,80,62" concept="0" />
+      <node id="554465258093203543" at="80,62,81,60" concept="0" />
+      <node id="554465258093203543" at="82,9,83,50" concept="4" />
+      <node id="554465258093203543" at="76,62,82,9" concept="2" />
+      <scope id="554465258093203543" at="77,57,81,60">
         <var name="cpb" id="554465258093203543" />
       </scope>
-      <scope id="554465258093203543" at="59,62,66,50" />
+      <scope id="554465258093203543" at="76,62,83,50" />
     </file>
     <file name="LanguageConceptSwitch.java">
-      <node id="554465258093203543" at="17,0,18,0" concept="5" trace="TransformationMatchAssertion" />
-      <node id="554465258093203543" at="26,51,27,66" concept="0" />
+      <node id="554465258093203543" at="19,0,20,0" concept="5" trace="TransformationMatchAssertion" />
+      <node id="554465258093203543" at="31,51,32,66" concept="0" />
     </file>
     <file name="StructureAspectDescriptor.java">
-      <node id="554465258093203543" at="20,0,21,0" concept="1" trace="myConceptTransformationMatchAssertion" />
-      <node id="554465258093203543" at="47,62,48,53" concept="4" />
-      <node id="554465258093203543" at="104,86,105,195" concept="3" />
-      <node id="554465258093203543" at="105,195,106,34" concept="0" />
-      <node id="554465258093203543" at="107,75,108,119" concept="0" />
-      <node id="554465258093203543" at="108,119,109,17" concept="0" />
-      <node id="554465258093203550" at="109,17,110,201" concept="0" />
-      <node id="554465258093203552" at="110,201,111,205" concept="0" />
-      <node id="554465258093203555" at="111,205,112,208" concept="0" />
-      <node id="554465258093203543" at="112,208,113,22" concept="4" />
-      <node id="554465258093203543" at="104,0,115,0" concept="6" trace="createDescriptorForTransformationMatchAssertion#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
-      <scope id="554465258093203543" at="47,62,48,53" />
-      <scope id="554465258093203543" at="104,86,113,22">
+      <node id="554465258093203543" at="24,0,25,0" concept="1" trace="myConceptTransformationMatchAssertion" />
+      <node id="554465258093203543" at="56,62,57,53" concept="4" />
+      <node id="554465258093203543" at="133,86,134,195" concept="3" />
+      <node id="554465258093203543" at="134,195,135,34" concept="0" />
+      <node id="554465258093203543" at="136,75,137,119" concept="0" />
+      <node id="554465258093203543" at="137,119,138,17" concept="0" />
+      <node id="554465258093203550" at="138,17,139,201" concept="0" />
+      <node id="554465258093203552" at="139,201,140,205" concept="0" />
+      <node id="554465258093203555" at="140,205,141,208" concept="0" />
+      <node id="554465258093203543" at="141,208,142,22" concept="4" />
+      <node id="554465258093203543" at="133,0,144,0" concept="6" trace="createDescriptorForTransformationMatchAssertion#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="554465258093203543" at="56,62,57,53" />
+      <scope id="554465258093203543" at="133,86,142,22">
         <var name="b" id="554465258093203543" />
       </scope>
-      <scope id="554465258093203543" at="104,0,115,0" />
+      <scope id="554465258093203543" at="133,0,144,0" />
     </file>
   </root>
   <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093203544">
     <file name="ConceptPresentationAspectImpl.java">
-      <node id="554465258093203544" at="16,0,17,0" concept="1" trace="props_TestAssertion" />
-      <node id="554465258093203544" at="54,42,55,76" concept="3" />
-      <node id="554465258093203544" at="55,76,56,45" concept="0" />
-      <node id="554465258093203544" at="57,9,58,35" concept="4" />
-      <node id="554465258093203544" at="53,47,57,9" concept="2" />
-      <scope id="554465258093203544" at="54,42,56,45">
+      <node id="554465258093203544" at="18,0,19,0" concept="1" trace="props_TestAssertion" />
+      <node id="554465258093203544" at="71,42,72,76" concept="3" />
+      <node id="554465258093203544" at="72,76,73,45" concept="0" />
+      <node id="554465258093203544" at="74,9,75,35" concept="4" />
+      <node id="554465258093203544" at="70,47,74,9" concept="2" />
+      <scope id="554465258093203544" at="71,42,73,45">
         <var name="cpb" id="554465258093203544" />
       </scope>
-      <scope id="554465258093203544" at="53,47,58,35" />
+      <scope id="554465258093203544" at="70,47,75,35" />
     </file>
     <file name="LanguageConceptSwitch.java">
-      <node id="554465258093203544" at="16,0,17,0" concept="5" trace="TestAssertion" />
-      <node id="554465258093203544" at="25,50,26,51" concept="0" />
+      <node id="554465258093203544" at="18,0,19,0" concept="5" trace="TestAssertion" />
+      <node id="554465258093203544" at="30,50,31,51" concept="0" />
     </file>
     <file name="StructureAspectDescriptor.java">
-      <node id="554465258093203544" at="19,0,20,0" concept="1" trace="myConceptTestAssertion" />
-      <node id="554465258093203544" at="45,47,46,38" concept="4" />
-      <node id="554465258093203544" at="97,71,98,180" concept="3" />
-      <node id="554465258093203544" at="98,180,99,19" concept="0" />
-      <node id="554465258093203544" at="99,19,100,119" concept="0" />
-      <node id="554465258093203544" at="100,119,101,17" concept="0" />
-      <node id="554465258093203544" at="101,17,102,22" concept="4" />
-      <node id="554465258093203544" at="106,34,107,75" concept="0" />
-      <node id="554465258093203544" at="117,34,118,75" concept="0" />
-      <node id="554465258093203544" at="97,0,104,0" concept="6" trace="createDescriptorForTestAssertion#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
-      <scope id="554465258093203544" at="45,47,46,38" />
-      <scope id="554465258093203544" at="97,71,102,22">
+      <node id="554465258093203544" at="23,0,24,0" concept="1" trace="myConceptTestAssertion" />
+      <node id="554465258093203544" at="54,47,55,38" concept="4" />
+      <node id="554465258093203544" at="126,71,127,180" concept="3" />
+      <node id="554465258093203544" at="127,180,128,19" concept="0" />
+      <node id="554465258093203544" at="128,19,129,119" concept="0" />
+      <node id="554465258093203544" at="129,119,130,17" concept="0" />
+      <node id="554465258093203544" at="130,17,131,22" concept="4" />
+      <node id="554465258093203544" at="135,34,136,75" concept="0" />
+      <node id="554465258093203544" at="146,34,147,75" concept="0" />
+      <node id="554465258093203544" at="157,34,158,75" concept="0" />
+      <node id="554465258093203544" at="126,0,133,0" concept="6" trace="createDescriptorForTestAssertion#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="554465258093203544" at="54,47,55,38" />
+      <scope id="554465258093203544" at="126,71,131,22">
         <var name="b" id="554465258093203544" />
       </scope>
-      <scope id="554465258093203544" at="97,0,104,0" />
+      <scope id="554465258093203544" at="126,0,133,0" />
     </file>
   </root>
   <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/554465258093203547">
     <file name="ConceptPresentationAspectImpl.java">
       <node id="554465258093203547" at="12,0,13,0" concept="1" trace="props_ArgumentReference" />
-      <node id="554465258093203547" at="26,46,27,76" concept="3" />
-      <node id="554465258093203547" at="27,76,28,135" concept="0" />
-      <node id="554465258093203547" at="28,135,29,49" concept="0" />
-      <node id="554465258093203547" at="30,9,31,39" concept="4" />
-      <node id="554465258093203547" at="25,51,30,9" concept="2" />
-      <scope id="554465258093203547" at="26,46,29,49">
+      <node id="554465258093203547" at="29,46,30,76" concept="3" />
+      <node id="554465258093203547" at="30,76,31,135" concept="0" />
+      <node id="554465258093203547" at="31,135,32,49" concept="0" />
+      <node id="554465258093203547" at="33,9,34,39" concept="4" />
+      <node id="554465258093203547" at="28,51,33,9" concept="2" />
+      <scope id="554465258093203547" at="29,46,32,49">
         <var name="cpb" id="554465258093203547" />
       </scope>
-      <scope id="554465258093203547" at="25,51,31,39" />
+      <scope id="554465258093203547" at="28,51,34,39" />
     </file>
     <file name="LanguageConceptSwitch.java">
       <node id="554465258093203547" at="12,0,13,0" concept="5" trace="ArgumentReference" />
-      <node id="554465258093203547" at="21,116,22,55" concept="0" />
+      <node id="554465258093203547" at="24,116,25,55" concept="0" />
     </file>
     <file name="StructureAspectDescriptor.java">
-      <node id="554465258093203547" at="15,0,16,0" concept="1" trace="myConceptArgumentReference" />
-      <node id="554465258093203547" at="37,51,38,42" concept="4" />
-      <node id="554465258093203547" at="60,75,61,184" concept="3" />
-      <node id="554465258093203547" at="61,184,62,34" concept="0" />
-      <node id="554465258093203547" at="62,34,63,119" concept="0" />
-      <node id="554465258093203547" at="63,119,64,17" concept="0" />
-      <node id="554465258093203548" at="64,17,65,164" concept="0" />
-      <node id="554465258093203547" at="65,164,66,22" concept="4" />
-      <node id="554465258093203547" at="60,0,68,0" concept="6" trace="createDescriptorForArgumentReference#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
-      <scope id="554465258093203547" at="37,51,38,42" />
-      <scope id="554465258093203547" at="60,75,66,22">
+      <node id="554465258093203547" at="17,0,18,0" concept="1" trace="myConceptArgumentReference" />
+      <node id="554465258093203547" at="42,51,43,42" concept="4" />
+      <node id="554465258093203547" at="71,75,72,184" concept="3" />
+      <node id="554465258093203547" at="72,184,73,34" concept="0" />
+      <node id="554465258093203547" at="73,34,74,119" concept="0" />
+      <node id="554465258093203547" at="74,119,75,17" concept="0" />
+      <node id="554465258093203548" at="75,17,76,164" concept="0" />
+      <node id="554465258093203547" at="76,164,77,22" concept="4" />
+      <node id="554465258093203547" at="71,0,79,0" concept="6" trace="createDescriptorForArgumentReference#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="554465258093203547" at="42,51,43,42" />
+      <scope id="554465258093203547" at="71,75,77,22">
         <var name="b" id="554465258093203547" />
       </scope>
-      <scope id="554465258093203547" at="60,0,68,0" />
+      <scope id="554465258093203547" at="71,0,79,0" />
     </file>
   </root>
   <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/6346338635721157081">
     <file name="ConceptPresentationAspectImpl.java">
-      <node id="6346338635721157081" at="18,0,19,0" concept="1" trace="props_TransformationMatchManyAssertion" />
-      <node id="6346338635721157081" at="68,61,69,76" concept="3" />
-      <node id="6346338635721157081" at="69,76,70,70" concept="0" />
-      <node id="6346338635721157081" at="70,70,71,66" concept="0" />
-      <node id="6346338635721157081" at="71,66,72,64" concept="0" />
-      <node id="6346338635721157081" at="73,9,74,54" concept="4" />
-      <node id="6346338635721157081" at="67,66,73,9" concept="2" />
-      <scope id="6346338635721157081" at="68,61,72,64">
+      <node id="6346338635721157081" at="21,0,22,0" concept="1" trace="props_TransformationMatchManyAssertion" />
+      <node id="6346338635721157081" at="93,61,94,76" concept="3" />
+      <node id="6346338635721157081" at="94,76,95,70" concept="0" />
+      <node id="6346338635721157081" at="95,70,96,66" concept="0" />
+      <node id="6346338635721157081" at="96,66,97,64" concept="0" />
+      <node id="6346338635721157081" at="98,9,99,54" concept="4" />
+      <node id="6346338635721157081" at="92,66,98,9" concept="2" />
+      <scope id="6346338635721157081" at="93,61,97,64">
         <var name="cpb" id="6346338635721157081" />
       </scope>
-      <scope id="6346338635721157081" at="67,66,74,54" />
+      <scope id="6346338635721157081" at="92,66,99,54" />
     </file>
     <file name="LanguageConceptSwitch.java">
-      <node id="6346338635721157081" at="18,0,19,0" concept="5" trace="TransformationMatchManyAssertion" />
-      <node id="6346338635721157081" at="27,66,28,71" concept="0" />
+      <node id="6346338635721157081" at="21,0,22,0" concept="5" trace="TransformationMatchManyAssertion" />
+      <node id="6346338635721157081" at="33,74,34,71" concept="0" />
     </file>
     <file name="StructureAspectDescriptor.java">
-      <node id="6346338635721157081" at="21,0,22,0" concept="1" trace="myConceptTransformationMatchManyAssertion" />
-      <node id="6346338635721157081" at="49,66,50,57" concept="4" />
-      <node id="6346338635721157081" at="115,90,116,200" concept="3" />
-      <node id="6346338635721157081" at="116,200,117,34" concept="0" />
-      <node id="6346338635721157081" at="118,75,119,120" concept="0" />
-      <node id="6346338635721157081" at="119,120,120,17" concept="0" />
-      <node id="6346338635721157083" at="120,17,121,202" concept="0" />
-      <node id="6346338635721157084" at="121,202,122,206" concept="0" />
-      <node id="6346338635721157085" at="122,206,123,209" concept="0" />
-      <node id="6346338635721157081" at="123,209,124,22" concept="4" />
-      <node id="6346338635721157081" at="115,0,126,0" concept="6" trace="createDescriptorForTransformationMatchManyAssertion#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
-      <scope id="6346338635721157081" at="49,66,50,57" />
-      <scope id="6346338635721157081" at="115,90,124,22">
+      <node id="6346338635721157081" at="26,0,27,0" concept="1" trace="myConceptTransformationMatchManyAssertion" />
+      <node id="6346338635721157081" at="60,66,61,57" concept="4" />
+      <node id="6346338635721157081" at="155,90,156,200" concept="3" />
+      <node id="6346338635721157081" at="156,200,157,34" concept="0" />
+      <node id="6346338635721157081" at="158,75,159,120" concept="0" />
+      <node id="6346338635721157081" at="159,120,160,17" concept="0" />
+      <node id="6346338635721157083" at="160,17,161,202" concept="0" />
+      <node id="6346338635721157084" at="161,202,162,206" concept="0" />
+      <node id="6346338635721157085" at="162,206,163,209" concept="0" />
+      <node id="6346338635721157081" at="163,209,164,22" concept="4" />
+      <node id="6346338635721157081" at="155,0,166,0" concept="6" trace="createDescriptorForTransformationMatchManyAssertion#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="6346338635721157081" at="60,66,61,57" />
+      <scope id="6346338635721157081" at="155,90,164,22">
         <var name="b" id="6346338635721157081" />
       </scope>
-      <scope id="6346338635721157081" at="115,0,126,0" />
+      <scope id="6346338635721157081" at="155,0,166,0" />
+    </file>
+  </root>
+  <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/7812943990232401577">
+    <file name="ConceptPresentationAspectImpl.java">
+      <node id="7812943990232401577" at="20,0,21,0" concept="1" trace="props_TransformationMatchCustomConditions" />
+      <node id="7812943990232401577" at="85,64,86,76" concept="3" />
+      <node id="7812943990232401577" at="86,76,87,65" concept="0" />
+      <node id="7812943990232401577" at="87,65,88,69" concept="0" />
+      <node id="7812943990232401577" at="88,69,89,67" concept="0" />
+      <node id="7812943990232401577" at="90,9,91,57" concept="4" />
+      <node id="7812943990232401577" at="84,69,90,9" concept="2" />
+      <scope id="7812943990232401577" at="85,64,89,67">
+        <var name="cpb" id="7812943990232401577" />
+      </scope>
+      <scope id="7812943990232401577" at="84,69,91,57" />
+    </file>
+    <file name="LanguageConceptSwitch.java">
+      <node id="7812943990232401577" at="20,0,21,0" concept="5" trace="TransformationMatchCustomConditions" />
+      <node id="7812943990232401577" at="32,66,33,74" concept="0" />
+    </file>
+    <file name="StructureAspectDescriptor.java">
+      <node id="7812943990232401577" at="25,0,26,0" concept="1" trace="myConceptTransformationMatchCustomConditions" />
+      <node id="7812943990232401577" at="58,69,59,60" concept="4" />
+      <node id="7812943990232401577" at="144,93,145,203" concept="3" />
+      <node id="7812943990232401577" at="145,203,146,34" concept="0" />
+      <node id="7812943990232401577" at="147,75,148,120" concept="0" />
+      <node id="7812943990232401577" at="148,120,149,17" concept="0" />
+      <node id="7812943990232401580" at="149,17,150,203" concept="0" />
+      <node id="7812943990232401582" at="150,203,151,210" concept="0" />
+      <node id="7812943990232411897" at="151,210,152,204" concept="0" />
+      <node id="7812943990232401577" at="152,204,153,22" concept="4" />
+      <node id="7812943990232401577" at="144,0,155,0" concept="6" trace="createDescriptorForTransformationMatchCustomConditions#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="7812943990232401577" at="58,69,59,60" />
+      <scope id="7812943990232401577" at="144,93,153,22">
+        <var name="b" id="7812943990232401577" />
+      </scope>
+      <scope id="7812943990232401577" at="144,0,155,0" />
+    </file>
+  </root>
+  <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/7812943990232414806">
+    <file name="ConceptPresentationAspectImpl.java">
+      <node id="7812943990232414806" at="13,0,14,0" concept="1" trace="props_CustomAssertionBlock" />
+      <node id="7812943990232414806" at="36,49,37,76" concept="3" />
+      <node id="7812943990232414806" at="37,76,38,54" concept="0" />
+      <node id="7812943990232414806" at="38,54,39,52" concept="0" />
+      <node id="7812943990232414806" at="40,9,41,42" concept="4" />
+      <node id="7812943990232414806" at="35,54,40,9" concept="2" />
+      <scope id="7812943990232414806" at="36,49,39,52">
+        <var name="cpb" id="7812943990232414806" />
+      </scope>
+      <scope id="7812943990232414806" at="35,54,41,42" />
+    </file>
+    <file name="LanguageConceptSwitch.java">
+      <node id="7812943990232414806" at="13,0,14,0" concept="5" trace="CustomAssertionBlock" />
+      <node id="7812943990232414806" at="25,55,26,59" concept="0" />
+    </file>
+    <file name="StructureAspectDescriptor.java">
+      <node id="7812943990232414806" at="18,0,19,0" concept="1" trace="myConceptCustomAssertionBlock" />
+      <node id="7812943990232414806" at="44,54,45,45" concept="4" />
+      <node id="7812943990232414806" at="79,78,80,188" concept="3" />
+      <node id="7812943990232414806" at="80,188,81,34" concept="0" />
+      <node id="7812943990232414806" at="81,34,82,127" concept="0" />
+      <node id="7812943990232414806" at="82,127,83,120" concept="0" />
+      <node id="7812943990232414806" at="83,120,84,17" concept="0" />
+      <node id="7812943990232414806" at="84,17,85,54" concept="0" />
+      <node id="7812943990232414806" at="85,54,86,22" concept="4" />
+      <node id="7812943990232414806" at="79,0,88,0" concept="6" trace="createDescriptorForCustomAssertionBlock#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="7812943990232414806" at="44,54,45,45" />
+      <scope id="7812943990232414806" at="79,78,86,22">
+        <var name="b" id="7812943990232414806" />
+      </scope>
+      <scope id="7812943990232414806" at="79,0,88,0" />
+    </file>
+  </root>
+  <root nodeRef="r:fc8379f0-84d2-4927-817e-ae0057474174(jetbrains.mps.lang.test.generator.structure)/7812943990232429489">
+    <file name="ConceptPresentationAspectImpl.java">
+      <node id="7812943990232429489" at="16,0,17,0" concept="1" trace="props_Model_ConceptFunctionParameter" />
+      <node id="7812943990232429489" at="58,59,59,76" concept="3" />
+      <node id="7812943990232429489" at="59,76,60,39" concept="0" />
+      <node id="7812943990232429489" at="60,39,61,62" concept="0" />
+      <node id="7812943990232429489" at="62,9,63,52" concept="4" />
+      <node id="7812943990232429489" at="57,64,62,9" concept="2" />
+      <scope id="7812943990232429489" at="58,59,61,62">
+        <var name="cpb" id="7812943990232429489" />
+      </scope>
+      <scope id="7812943990232429489" at="57,64,63,52" />
+    </file>
+    <file name="LanguageConceptSwitch.java">
+      <node id="7812943990232429489" at="16,0,17,0" concept="5" trace="Model_ConceptFunctionParameter" />
+      <node id="7812943990232429489" at="28,51,29,69" concept="0" />
+    </file>
+    <file name="StructureAspectDescriptor.java">
+      <node id="7812943990232429489" at="21,0,22,0" concept="1" trace="myConceptModel_ConceptFunctionParameter" />
+      <node id="7812943990232429489" at="50,64,51,55" concept="4" />
+      <node id="7812943990232429489" at="109,88,110,198" concept="3" />
+      <node id="7812943990232429489" at="110,198,111,34" concept="0" />
+      <node id="7812943990232429489" at="111,34,112,136" concept="0" />
+      <node id="7812943990232429489" at="112,136,113,120" concept="0" />
+      <node id="7812943990232429489" at="113,120,114,17" concept="0" />
+      <node id="7812943990232429489" at="114,17,115,21" concept="0" />
+      <node id="7812943990232429489" at="115,21,116,22" concept="4" />
+      <node id="7812943990232429489" at="109,0,118,0" concept="6" trace="createDescriptorForModel_ConceptFunctionParameter#()Ljetbrains/mps/smodel/runtime/ConceptDescriptor;" />
+      <scope id="7812943990232429489" at="50,64,51,55" />
+      <scope id="7812943990232429489" at="109,88,116,22">
+        <var name="b" id="7812943990232429489" />
+      </scope>
+      <scope id="7812943990232429489" at="109,0,118,0" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/trace.info b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/trace.info
index 4abb1cd1c31b..220a4db6f8b9 100644
--- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/trace.info
+++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root>
     <file name="Language.java">
-      <unit at="20,0,68,0" name="jetbrains.mps.lang.test.generator.Language" />
+      <unit at="21,0,70,0" name="jetbrains.mps.lang.test.generator.Language" />
     </file>
   </root>
 </debug-info>
diff --git a/testbench/modules/generator-tests/smodel/jetbrains.mps.test.smodel.msd b/testbench/modules/generator-tests/smodel/jetbrains.mps.test.smodel.msd
index 2de01906b24f..e465e23c683c 100644
--- a/testbench/modules/generator-tests/smodel/jetbrains.mps.test.smodel.msd
+++ b/testbench/modules/generator-tests/smodel/jetbrains.mps.test.smodel.msd
@@ -15,6 +15,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
     <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="0" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/testbench/modules/generator-tests/smodel/models/jetbrains.mps.test.smodel@tests.mps b/testbench/modules/generator-tests/smodel/models/jetbrains.mps.test.smodel@tests.mps
index c1e7c7570ba1..45df3460b9e0 100644
--- a/testbench/modules/generator-tests/smodel/models/jetbrains.mps.test.smodel@tests.mps
+++ b/testbench/modules/generator-tests/smodel/models/jetbrains.mps.test.smodel@tests.mps
@@ -4,9 +4,26 @@
   <languages>
     <use id="68015e26-cc4d-49db-8715-b643faea1769" name="jetbrains.mps.lang.test.generator" version="0" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
   </languages>
   <imports />
   <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+    </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="361130699826193248" name="jetbrains.mps.lang.modelapi.structure.ModelPointer" flags="ng" index="1dCxOl">
         <property id="1863527487546097494" name="modelId" index="1XweGQ" />
@@ -16,6 +33,13 @@
         <property id="679099339649053841" name="value" index="1j_P7h" />
       </concept>
     </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
+        <child id="8427750732757990725" name="actual" index="3tpDZA" />
+        <child id="8427750732757990724" name="expected" index="3tpDZB" />
+      </concept>
+      <concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
+    </language>
     <language id="68015e26-cc4d-49db-8715-b643faea1769" name="jetbrains.mps.lang.test.generator">
       <concept id="554465258093203543" name="jetbrains.mps.lang.test.generator.structure.TransformationMatchAssertion" flags="ng" index="3FggHx">
         <child id="554465258093203555" name="transformationPlan" index="3FggHl" />
@@ -33,12 +57,24 @@
         <child id="554465258093203559" name="tests" index="3FggHh" />
         <child id="554465258093190247" name="arguments" index="3Fgkth" />
       </concept>
+      <concept id="7812943990232414806" name="jetbrains.mps.lang.test.generator.structure.CustomAssertionBlock" flags="ig" index="1ZJ_PW" />
+      <concept id="7812943990232401577" name="jetbrains.mps.lang.test.generator.structure.TransformationMatchCustomConditions" flags="ng" index="1ZJA63">
+        <child id="7812943990232411897" name="assertions" index="1ZJ$Bj" />
+        <child id="7812943990232401580" name="inputModel" index="1ZJA66" />
+      </concept>
+      <concept id="7812943990232429489" name="jetbrains.mps.lang.test.generator.structure.Model_ConceptFunctionParameter" flags="ng" index="1ZJDir" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG" />
     </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">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+    </language>
   </registry>
   <node concept="3FgkA8" id="7XtoUuTCygP">
     <property role="TrG5h" value="BasicTest1" />
@@ -62,6 +98,27 @@
         <ref role="3FggHE" node="354Yu58sl3Q" resolve="ClosuresOnlyPlan" />
       </node>
     </node>
+    <node concept="1ZJA63" id="6LH9MCjPjXk" role="3FggHh">
+      <node concept="3FggHH" id="6LH9MCjPjXL" role="1ZJA66">
+        <ref role="3FggHE" node="2kP5W5ySLxk" resolve="A" />
+      </node>
+      <node concept="1ZJ_PW" id="6LH9MCjPjXo" role="1ZJ$Bj">
+        <node concept="3clFbS" id="6LH9MCjPjXq" role="2VODD2">
+          <node concept="3vlDli" id="6LH9MCjPm7D" role="3cqZAp">
+            <node concept="3cmrfG" id="6LH9MCjPm7T" role="3tpDZB">
+              <property role="3cmrfH" value="1" />
+            </node>
+            <node concept="2OqwBi" id="6LH9MCjPmYA" role="3tpDZA">
+              <node concept="2OqwBi" id="6LH9MCjPmdC" role="2Oq$k0">
+                <node concept="1ZJDir" id="6LH9MCjPm85" role="2Oq$k0" />
+                <node concept="2RRcyG" id="6LH9MCjPnT_" role="2OqNvi" />
+              </node>
+              <node concept="34oBXx" id="6LH9MCjPpt5" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3Fgkto" id="2kP5W5ySLxk" role="3Fgkth">
       <property role="TrG5h" value="A" />
       <node concept="1dCxOl" id="2kP5W5yTe4F" role="3Fgkt4">
diff --git a/testbench/modules/generator-tests/smodel/test_gen.caches/jetbrains/mps/test/smodel/dependencies b/testbench/modules/generator-tests/smodel/test_gen.caches/jetbrains/mps/test/smodel/dependencies
index da98c747b997..83f269159aae 100644
--- a/testbench/modules/generator-tests/smodel/test_gen.caches/jetbrains/mps/test/smodel/dependencies
+++ b/testbench/modules/generator-tests/smodel/test_gen.caches/jetbrains/mps/test/smodel/dependencies
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
   <dependency className="jetbrains.mps.test.smodel.BasicTest1" file="BasicTest1.java">
+    <classNode dependClassName="java.lang.Runnable" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SModelOperations" />
     <classNode dependClassName="jetbrains.mps.lang.test.generator.rt.TransformHelper" />
+    <classNode dependClassName="junit.framework.Assert" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SModel" />
     <classNode dependClassName="org.junit.Before" />
     <classNode dependClassName="org.junit.Test" />
diff --git a/testbench/modules/generator-tests/smodel/test_gen.caches/jetbrains/mps/test/smodel/generated b/testbench/modules/generator-tests/smodel/test_gen.caches/jetbrains/mps/test/smodel/generated
index 51eaa7711c94..5fdc6789bc5d 100644
--- a/testbench/modules/generator-tests/smodel/test_gen.caches/jetbrains/mps/test/smodel/generated
+++ b/testbench/modules/generator-tests/smodel/test_gen.caches/jetbrains/mps/test/smodel/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="bh0n9l3496yxtgt35rt6ytdre6krzjr" />
+<dependencies version="2" modelHash="-5hn9j0sjwvvo3swcbwehw5vywg2medj" />
 
diff --git a/testbench/modules/generator-tests/smodel/test_gen/jetbrains/mps/test/smodel/BasicTest1.java b/testbench/modules/generator-tests/smodel/test_gen/jetbrains/mps/test/smodel/BasicTest1.java
index ca9b119da376..0b40b2c87fd0 100644
--- a/testbench/modules/generator-tests/smodel/test_gen/jetbrains/mps/test/smodel/BasicTest1.java
+++ b/testbench/modules/generator-tests/smodel/test_gen/jetbrains/mps/test/smodel/BasicTest1.java
@@ -7,6 +7,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import jetbrains.mps.lang.test.generator.rt.TransformHelper;
+import junit.framework.Assert;
+import jetbrains.mps.internal.collections.runtime.ListSequence;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SModelOperations;
 
 public class BasicTest1 extends BaseGeneratorTest {
   private SModel myArg_A;
@@ -41,5 +44,18 @@ public void testTransformAndMatch1() {
     SModel rm = myArg_NoClosures;
     assertMatch(t.getOutputModel(), rm);
   }
+  @Test
+  public void testTransformAndMatch2() {
+    TransformHelper t = newTransformer();
+    SModel i = myArg_A;
+    t.setInput(i);
+    t.transform();
+    final SModel outputModel = t.getOutputModel();
+    outputModel.getRepository().getModelAccess().runReadAction(new Runnable() {
+      public void run() {
+        Assert.assertEquals(1, ListSequence.fromList(SModelOperations.roots(outputModel, null)).count());
+      }
+    });
+  }
 
 }
diff --git a/testbench/modules/generator-tests/smodel/test_gen/jetbrains/mps/test/smodel/trace.info b/testbench/modules/generator-tests/smodel/test_gen/jetbrains/mps/test/smodel/trace.info
index d46ce8ff9d01..73b5329480db 100644
--- a/testbench/modules/generator-tests/smodel/test_gen/jetbrains/mps/test/smodel/trace.info
+++ b/testbench/modules/generator-tests/smodel/test_gen/jetbrains/mps/test/smodel/trace.info
@@ -6,45 +6,63 @@
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068581242864:jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
   <root nodeRef="r:8c2c686e-0560-4068-b995-6ed0bbb54d9a(jetbrains.mps.test.smodel@tests)/9177601187676038197">
     <file name="BasicTest1.java">
-      <node id="2681075272524175444" at="12,0,13,0" concept="1" trace="myArg_A" />
-      <node id="2681075272524175463" at="13,0,14,0" concept="1" trace="myArg_B" />
-      <node id="3550237152253148823" at="14,0,15,0" concept="1" trace="myArg_NoClosures" />
-      <node id="3550237152253137142" at="15,0,16,0" concept="1" trace="myArg_ClosuresOnlyPlan" />
-      <node id="2681075272524175444" at="18,34,19,99" concept="0" />
-      <node id="2681075272524175463" at="19,99,20,102" concept="0" />
-      <node id="3550237152253148823" at="20,102,21,111" concept="0" />
-      <node id="3550237152253137142" at="21,111,22,119" concept="0" />
-      <node id="2681075272524175470" at="26,40,27,41" concept="3" />
-      <node id="2681075272524175470" at="27,41,28,23" concept="3" />
-      <node id="2681075272524175470" at="28,23,29,18" concept="0" />
-      <node id="2681075272524175470" at="29,18,30,18" concept="0" />
-      <node id="2681075272524175470" at="30,18,31,24" concept="3" />
-      <node id="2681075272524175470" at="31,24,32,40" concept="0" />
-      <node id="3550237152253137119" at="35,40,36,41" concept="3" />
-      <node id="3550237152253137119" at="36,41,37,23" concept="3" />
-      <node id="3550237152253137119" at="37,23,38,18" concept="0" />
-      <node id="3550237152253137119" at="38,18,39,69" concept="0" />
-      <node id="3550237152253137119" at="39,69,40,18" concept="0" />
-      <node id="3550237152253137119" at="40,18,41,33" concept="3" />
-      <node id="3550237152253137119" at="41,33,42,40" concept="0" />
-      <node id="9177601187676038197" at="17,0,24,0" concept="2" trace="prepareArguments#()V" />
-      <node id="2681075272524175470" at="25,0,34,0" concept="2" trace="testTransformAndMatch0#()V" />
-      <node id="3550237152253137119" at="34,0,44,0" concept="2" trace="testTransformAndMatch1#()V" />
-      <scope id="9177601187676038197" at="18,34,22,119" />
-      <scope id="2681075272524175470" at="26,40,32,40">
+      <node id="2681075272524175444" at="15,0,16,0" concept="1" trace="myArg_A" />
+      <node id="2681075272524175463" at="16,0,17,0" concept="1" trace="myArg_B" />
+      <node id="3550237152253148823" at="17,0,18,0" concept="1" trace="myArg_NoClosures" />
+      <node id="3550237152253137142" at="18,0,19,0" concept="1" trace="myArg_ClosuresOnlyPlan" />
+      <node id="2681075272524175444" at="21,34,22,99" concept="0" />
+      <node id="2681075272524175463" at="22,99,23,102" concept="0" />
+      <node id="3550237152253148823" at="23,102,24,111" concept="0" />
+      <node id="3550237152253137142" at="24,111,25,119" concept="0" />
+      <node id="2681075272524175470" at="29,40,30,41" concept="3" />
+      <node id="2681075272524175470" at="30,41,31,23" concept="3" />
+      <node id="2681075272524175470" at="31,23,32,18" concept="0" />
+      <node id="2681075272524175470" at="32,18,33,18" concept="0" />
+      <node id="2681075272524175470" at="33,18,34,24" concept="3" />
+      <node id="2681075272524175470" at="34,24,35,40" concept="0" />
+      <node id="3550237152253137119" at="38,40,39,41" concept="3" />
+      <node id="3550237152253137119" at="39,41,40,23" concept="3" />
+      <node id="3550237152253137119" at="40,23,41,18" concept="0" />
+      <node id="3550237152253137119" at="41,18,42,69" concept="0" />
+      <node id="3550237152253137119" at="42,69,43,18" concept="0" />
+      <node id="3550237152253137119" at="43,18,44,33" concept="3" />
+      <node id="3550237152253137119" at="44,33,45,40" concept="0" />
+      <node id="7812943990232530772" at="48,40,49,41" concept="3" />
+      <node id="7812943990232530772" at="49,41,50,23" concept="3" />
+      <node id="7812943990232530772" at="50,23,51,18" concept="0" />
+      <node id="7812943990232530772" at="51,18,52,18" concept="0" />
+      <node id="7812943990232530772" at="52,18,53,50" concept="3" />
+      <node id="7812943990232539625" at="55,25,56,105" concept="0" />
+      <node id="7812943990232530772" at="55,0,58,0" concept="2" trace="run#()V" />
+      <node id="7812943990232530772" at="53,50,58,7" concept="0" />
+      <node id="9177601187676038197" at="20,0,27,0" concept="2" trace="prepareArguments#()V" />
+      <node id="2681075272524175470" at="28,0,37,0" concept="2" trace="testTransformAndMatch0#()V" />
+      <node id="3550237152253137119" at="37,0,47,0" concept="2" trace="testTransformAndMatch1#()V" />
+      <node id="7812943990232530772" at="47,0,60,0" concept="2" trace="testTransformAndMatch2#()V" />
+      <scope id="7812943990232530772" at="55,25,56,105" />
+      <scope id="7812943990232530772" at="55,0,58,0" />
+      <scope id="9177601187676038197" at="21,34,25,119" />
+      <scope id="2681075272524175470" at="29,40,35,40">
         <var name="i" id="2681075272524175470" />
         <var name="rm" id="2681075272524175470" />
         <var name="t" id="2681075272524175470" />
       </scope>
-      <scope id="9177601187676038197" at="17,0,24,0" />
-      <scope id="3550237152253137119" at="35,40,42,40">
+      <scope id="9177601187676038197" at="20,0,27,0" />
+      <scope id="3550237152253137119" at="38,40,45,40">
         <var name="i" id="3550237152253137119" />
         <var name="rm" id="3550237152253137119" />
         <var name="t" id="3550237152253137119" />
       </scope>
-      <scope id="2681075272524175470" at="25,0,34,0" />
-      <scope id="3550237152253137119" at="34,0,44,0" />
-      <unit id="9177601187676038197" at="11,0,46,0" name="jetbrains.mps.test.smodel.BasicTest1" />
+      <scope id="2681075272524175470" at="28,0,37,0" />
+      <scope id="3550237152253137119" at="37,0,47,0" />
+      <scope id="7812943990232530772" at="48,40,58,7">
+        <var name="i" id="7812943990232530772" />
+        <var name="outputModel" id="7812943990232530772" />
+        <var name="t" id="7812943990232530772" />
+      </scope>
+      <scope id="7812943990232530772" at="47,0,60,0" />
+      <unit id="7812943990232530772" at="54,67,58,5" name="jetbrains.mps.test.smodel.BasicTest1$1" />
+      <unit id="9177601187676038197" at="14,0,62,0" name="jetbrains.mps.test.smodel.BasicTest1" />
     </file>
   </root>
 </debug-info>