diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed901cb289..caf6d375ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,10 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 - Hyperlink: `HyperlinkUtil.openInBrowser()` behaves like no-op instead of raising an exception on null or empty URLs.
 - Asynccell: Stops polling for the calculated value in case the poll-request throws an exception and shows to the user, that the calculation has failed together with the thrown exception, instead of spamming the log on each poll with the exception.
 
+### Added
+
+- The comparator language now supports a diff tool that can be activated through the `show diff` checkbox.
+
 # March 2024
 
 ## com.mbeddr.mpsutil
@@ -142,7 +146,15 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 ### Changed
 
-- Added possiblity to update the ToolWindow contents of context action 2 evenif the Window is not visible.
+- Added possibility to update the ToolWindow contents of context action 2 even if the Window is not visible.
+
+## com.mbeddr.doc.aspect
+
+### Added
+
+* For documentation annotations of concepts there is a new flag `override children` in the inspector. It allows to show the document of a node even if the currently selected child node would have its own documentation.
+* By default, this new behavior is switched off. The `documentationAspectConfiguration` extension point now has a configuration option `allowOverrideChildren` which has to be set to true in order to use the override functionality.
+* A cache has been added to speed up the look-up and display of concept-specific documentation in the documentation view.
 
 # September 2023
 
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index 688cf972c7..de28708ddd 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -7620,6 +7620,41 @@
               </node>
             </node>
           </node>
+          <node concept="1SiIV0" id="6HovwvvzfY2" role="3bR37C">
+            <node concept="3bR9La" id="6HovwvvzfY3" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="6HovwvvzfY6" role="3bR37C">
+            <node concept="3bR9La" id="6HovwvvzfY7" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="6HovwvvzfY8" role="3bR37C">
+            <node concept="3bR9La" id="6HovwvvzfY9" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="2RIzFJ84PQv" role="3bR37C">
+            <node concept="3bR9La" id="2RIzFJ84PQw" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="2RIzFJ84PQx" role="3bR37C">
+            <node concept="3bR9La" id="2RIzFJ84PQy" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="2RIzFJ84PQz" role="3bR37C">
+            <node concept="3bR9La" id="2RIzFJ84PQ$" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="2RIzFJ84PQ_" role="3bR37C">
+            <node concept="3bR9La" id="2RIzFJ84PQA" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
+            </node>
+          </node>
         </node>
         <node concept="1BupzO" id="4PRpvcZJNpF" role="3bR31x">
           <property role="3ZfqAx" value="languageModels" />
@@ -7643,16 +7678,21 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4BQS8fdsw3f" role="3bR37C">
-          <node concept="Rbm2T" id="4BQS8fdsw3g" role="1SiIV1">
-            <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4BQS8fdsw3h" role="3bR37C">
           <node concept="Rbm2T" id="4BQS8fdsw3i" role="1SiIV1">
             <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
           </node>
         </node>
+        <node concept="1SiIV0" id="6GJZxHzA9pX" role="3bR37C">
+          <node concept="3bR9La" id="6GJZxHzA9pY" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="NgM4xWL$1T" role="3bR37C">
+          <node concept="Rbm2T" id="NgM4xWL$1U" role="1SiIV1">
+            <ref role="1E1Vl2" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="776vT$mQZbf" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7733,6 +7773,26 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
           </node>
         </node>
+        <node concept="1SiIV0" id="6HovwvvzfYn" role="3bR37C">
+          <node concept="3bR9La" id="6HovwvvzfYo" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:39HJr_hyEzS" resolve="jetbrains.mps.ide.vcs.platform" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6HovwvvzfYp" role="3bR37C">
+          <node concept="3bR9La" id="6HovwvvzfYq" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6HovwvvzfYr" role="3bR37C">
+          <node concept="3bR9La" id="6HovwvvzfYs" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6GJZxHzA9qn" role="3bR37C">
+          <node concept="3bR9La" id="6GJZxHzA9qo" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4oNjwzxq1FR" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -8345,6 +8405,9 @@
       <node concept="m$_yC" id="7wOeVMeCel8" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
       </node>
+      <node concept="m$_yC" id="6HovwvvzhsW" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:RJsmGEieyQ" resolve="jetbrains.mps.vcs" />
+      </node>
     </node>
     <node concept="2G$12M" id="3quoVcnNsFs" role="3989C9">
       <property role="TrG5h" value="group.httpsupport" />
@@ -18644,6 +18707,21 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="3KxJFmNUEug" role="3bR37C">
+          <node concept="3bR9La" id="3KxJFmNUEuh" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4V_wlz9WRN4" role="3bR37C">
+          <node concept="3bR9La" id="4V_wlz9WRN5" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6L4p" resolve="jetbrains.mps.lang.behavior" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7VnJHsAbmDt" role="3bR37C">
+          <node concept="3bR9La" id="7VnJHsAbmDu" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:6fQhGuklQWU" resolve="de.q60.mps.collections.libs" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="5NpY9mns5GC" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl
index dbd278eeec..86dffeca88 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl
@@ -14,6 +14,8 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+    <dependency reexport="true">38a074ed-e5ad-4b2d-be31-ca436911b8aa(com.mbeddr.doc.aspect)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
@@ -29,6 +31,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
@@ -43,8 +46,11 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -59,13 +65,39 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
+    <module reference="2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)" version="0" />
+    <module reference="38a074ed-e5ad-4b2d-be31-ca436911b8aa(com.mbeddr.doc.aspect)" version="0" />
     <module reference="3c21902d-b582-4557-b697-84a4dcddff3a(com.mbeddr.doc.aspect.exampleLanguage)" version="0" />
+    <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+    <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
+    <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+    <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+    <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
+    <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
+    <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
+    <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
+    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
+    <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
+    <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com.mbeddr.doc.aspect.exampleLanguage.plugin.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com.mbeddr.doc.aspect.exampleLanguage.plugin.mps
new file mode 100644
index 0000000000..2d2f045ba8
--- /dev/null
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com.mbeddr.doc.aspect.exampleLanguage.plugin.mps
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:a302ee2c-8054-49be-a61b-a22005873d10(com.mbeddr.doc.aspect.exampleLanguage.plugin)">
+  <persistence version="9" />
+  <languages>
+    <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
+    <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="pgte" ref="r:e361f9f2-2afa-4fbe-b895-bdd4fbfe44fa(com.mbeddr.doc.aspect.plugin)" />
+    <import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
+      <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <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="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
+      <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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <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="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <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" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </concept>
+    </language>
+    <language id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension">
+      <concept id="126958800891274162" name="jetbrains.mps.lang.extension.structure.Extension" flags="ig" index="1lYeZD">
+        <reference id="126958800891274597" name="extensionPoint" index="1lYe$Y" />
+      </concept>
+    </language>
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
+      <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
+        <reference id="3751132065236767084" name="decl" index="q3mfh" />
+        <reference id="9097849371505568270" name="point" index="1QQUv3" />
+      </concept>
+      <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
+        <reference id="19209059688387895" name="decl" index="2VtyIY" />
+      </concept>
+    </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>
+  </registry>
+  <node concept="2DaZZR" id="1SjQlrSIbaD" />
+  <node concept="1lYeZD" id="3qokpdXS6Iq">
+    <property role="TrG5h" value="ExampleDocAspectConfigExt" />
+    <ref role="1lYe$Y" to="pgte:1T8cMxCROk6" resolve="documentationAspectConfiguration" />
+    <node concept="3Tm1VV" id="3qokpdXS6Ir" role="1B3o_S" />
+    <node concept="2tJIrI" id="3qokpdXS6QO" role="jymVt" />
+    <node concept="312cEg" id="2JMQ0QpYAFM" role="jymVt">
+      <property role="TrG5h" value="instance" />
+      <node concept="3Tm6S6" id="2JMQ0QpY$hN" role="1B3o_S" />
+      <node concept="3uibUv" id="2JMQ0QpYAD1" role="1tU5fm">
+        <ref role="3uigEE" to="pgte:1T8cMxCROto" resolve="IDocumentationAspectConfiguration" />
+      </node>
+      <node concept="10Nm6u" id="2JMQ0QpYAT0" role="33vP2m" />
+    </node>
+    <node concept="2tJIrI" id="2JMQ0QpYE0C" role="jymVt" />
+    <node concept="q3mfD" id="2JMQ0QpYATl" role="jymVt">
+      <property role="TrG5h" value="activate" />
+      <ref role="2VtyIY" to="90d:3zLwYDe0CPy" resolve="activate" />
+      <node concept="3Tm1VV" id="2JMQ0QpYATn" role="1B3o_S" />
+      <node concept="3clFbS" id="2JMQ0QpYATp" role="3clF47">
+        <node concept="3clFbF" id="2JMQ0QpYBzu" role="3cqZAp">
+          <node concept="37vLTI" id="2JMQ0QpYBPR" role="3clFbG">
+            <node concept="37vLTw" id="2JMQ0QpYBzt" role="37vLTJ">
+              <ref role="3cqZAo" node="2JMQ0QpYAFM" resolve="instance" />
+            </node>
+            <node concept="2ShNRf" id="2JMQ0QpYqoJ" role="37vLTx">
+              <node concept="YeOm9" id="2JMQ0QpYwBJ" role="2ShVmc">
+                <node concept="1Y3b0j" id="2JMQ0QpYwBM" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <property role="373rjd" value="true" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <ref role="1Y3XeK" to="pgte:1T8cMxCROto" resolve="IDocumentationAspectConfiguration" />
+                  <node concept="3Tm1VV" id="2JMQ0QpYwBN" role="1B3o_S" />
+                  <node concept="3clFb_" id="2JMQ0QpYwC1" role="jymVt">
+                    <property role="TrG5h" value="showReferenceConceptDocumentation" />
+                    <node concept="3Tm1VV" id="2JMQ0QpYwC3" role="1B3o_S" />
+                    <node concept="10P_77" id="2JMQ0QpYwC4" role="3clF45" />
+                    <node concept="3clFbS" id="2JMQ0QpYwC8" role="3clF47">
+                      <node concept="3clFbF" id="2JMQ0QpYxoy" role="3cqZAp">
+                        <node concept="3clFbT" id="2JMQ0QpYxox" role="3clFbG" />
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="2JMQ0QpYwCa" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                  <node concept="2tJIrI" id="2JMQ0QpYwCb" role="jymVt" />
+                  <node concept="3clFb_" id="2JMQ0QpYwCc" role="jymVt">
+                    <property role="TrG5h" value="allowOverrideChildren" />
+                    <node concept="3Tm1VV" id="2JMQ0QpYwCe" role="1B3o_S" />
+                    <node concept="10P_77" id="2JMQ0QpYwCf" role="3clF45" />
+                    <node concept="3clFbS" id="2JMQ0QpYwCv" role="3clF47">
+                      <node concept="3clFbF" id="2JMQ0QpYxGY" role="3cqZAp">
+                        <node concept="3clFbT" id="2JMQ0QpYxGX" role="3clFbG">
+                          <property role="3clFbU" value="true" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="2JMQ0QpYwCx" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="2JMQ0QpYATs" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="2JMQ0QpYDVd" role="jymVt" />
+    <node concept="q3mfD" id="2JMQ0QpYD3V" role="jymVt">
+      <property role="TrG5h" value="deactivate" />
+      <ref role="2VtyIY" to="90d:3zLwYDe0BDO" resolve="deactivate" />
+      <node concept="3Tm1VV" id="2JMQ0QpYD3X" role="1B3o_S" />
+      <node concept="3clFbS" id="2JMQ0QpYD3Z" role="3clF47">
+        <node concept="3clFbF" id="2JMQ0QpYDAl" role="3cqZAp">
+          <node concept="37vLTI" id="2JMQ0QpYDMw" role="3clFbG">
+            <node concept="10Nm6u" id="2JMQ0QpYDO5" role="37vLTx" />
+            <node concept="37vLTw" id="2JMQ0QpYDAk" role="37vLTJ">
+              <ref role="3cqZAo" node="2JMQ0QpYAFM" resolve="instance" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="2JMQ0QpYD42" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="3qokpdXS6Iv" role="jymVt" />
+    <node concept="q3mfD" id="3qokpdXS6Iw" role="jymVt">
+      <property role="TrG5h" value="get" />
+      <ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
+      <node concept="3Tm1VV" id="3qokpdXS6Iy" role="1B3o_S" />
+      <node concept="3clFbS" id="3qokpdXS6I$" role="3clF47">
+        <node concept="3clFbF" id="2JMQ0QpYCRF" role="3cqZAp">
+          <node concept="37vLTw" id="2JMQ0Qq3bL4" role="3clFbG">
+            <ref role="3cqZAo" node="2JMQ0QpYAFM" resolve="instance" />
+          </node>
+        </node>
+      </node>
+      <node concept="q3mfm" id="3qokpdXS6I_" role="3clF45">
+        <ref role="q3mfh" to="90d:3zLwYDe0sv$" />
+        <ref role="1QQUv3" node="3qokpdXS6Iw" resolve="get" />
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/documentation.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/documentation.mps
index 696aa6393c..dd981c1a39 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/documentation.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/documentation.mps
@@ -20,6 +20,7 @@
       </concept>
       <concept id="7810506636291686467" name="com.mbeddr.doc.aspect.structure.DocumentedPropertyItemAnnotation" flags="ng" index="fANS$" />
       <concept id="1058510331725720478" name="com.mbeddr.doc.aspect.structure.DocumentedConceptAnnotation" flags="ng" index="3n9NSn">
+        <property id="2265458908609337334" name="overrideChildren" index="33_X4D" />
         <property id="1881564090922902400" name="priority" index="17ySGi" />
         <reference id="1058510331725761196" name="concept" index="3nadW_" />
       </concept>
@@ -242,6 +243,21 @@
           </node>
         </node>
       </node>
+      <node concept="1_0VNX" id="1XKxHZsLVso" role="1_0VJ0">
+        <property role="TrG5h" value="CostAttribute" />
+        <property role="1_0VJr" value="Cost attribute" />
+        <node concept="1_0LV8" id="1XKxHZsLVtc" role="1_0VJ0">
+          <node concept="19SGf9" id="1XKxHZsLVtd" role="1_0LWR">
+            <node concept="19SUe$" id="1XKxHZsLVte" role="19SJt6">
+              <property role="19SUeA" value="This is an attribute for defining cost via an expression." />
+            </node>
+          </node>
+        </node>
+        <node concept="3n9NSn" id="1XKxHZsLVtj" role="lGtFl">
+          <property role="33_X4D" value="true" />
+          <ref role="3nadW_" to="hauh:1XKxHZsLKOm" resolve="CostAttribute" />
+        </node>
+      </node>
     </node>
     <node concept="1_0j5j" id="N8ix8jdWiy" role="1DXQ57">
       <ref role="1_0j5g" node="N8ix8jdWgc" resolve="Theory" />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/editor.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/editor.mps
index fe1c45355e..5190a287d0 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/editor.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/editor.mps
@@ -18,6 +18,7 @@
         <child id="1176897874615" name="nodeFactory" index="4_6I_" />
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
       </concept>
+      <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
       <concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
       <concept id="1237375020029" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineChildrenStyleClassItem" flags="ln" index="pj6Ft" />
@@ -31,6 +32,7 @@
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
+      <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
@@ -201,6 +203,38 @@
           </node>
         </node>
       </node>
+      <node concept="3F0ifn" id="1XKxHZsLKKL" role="3EZMnx">
+        <property role="3F0ifm" value="attributes:" />
+        <node concept="pVoyu" id="1XKxHZsLKKM" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F2HdR" id="1XKxHZsLKKN" role="3EZMnx">
+        <ref role="1NtTu8" to="hauh:1XKxHZsLKHO" resolve="attributes" />
+        <node concept="l2Vlx" id="1XKxHZsLKKO" role="2czzBx" />
+        <node concept="pVoyu" id="1XKxHZsLKKP" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pj6Ft" id="1XKxHZsLKKQ" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="lj46D" id="1XKxHZsLKKR" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="4$FPG" id="1XKxHZsLKKS" role="4_6I_">
+          <node concept="3clFbS" id="1XKxHZsLKKT" role="2VODD2">
+            <node concept="3cpWs6" id="1XKxHZsLKKU" role="3cqZAp">
+              <node concept="2ShNRf" id="1XKxHZsLKKV" role="3cqZAk">
+                <node concept="3zrR0B" id="1XKxHZsLKKW" role="2ShVmc">
+                  <node concept="3Tqbb2" id="1XKxHZsLKKX" role="3zrR0E">
+                    <ref role="ehGHo" to="hauh:7NPCd7DDwAT" resolve="IEdge" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
   <node concept="24kQdi" id="4MORkbYxo7">
@@ -218,5 +252,23 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="1XKxHZsLKOS">
+    <ref role="1XX52x" to="hauh:1XKxHZsLKOm" resolve="CostAttribute" />
+    <node concept="3EZMnI" id="1XKxHZsLKOU" role="2wV5jI">
+      <node concept="PMmxH" id="1XKxHZsLKP1" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="2iRfu4" id="1XKxHZsLKOX" role="2iSdaV" />
+      <node concept="3F0ifn" id="1XKxHZsLQ2D" role="3EZMnx">
+        <property role="3F0ifm" value=":" />
+        <node concept="11L4FC" id="1XKxHZsLQ2I" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F1sOY" id="1XKxHZsLKPe" role="3EZMnx">
+        <ref role="1NtTu8" to="hauh:1XKxHZsLKOs" resolve="expression" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/structure.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/structure.mps
index fdbbd2f948..d12e99d33a 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/structure.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/structure.mps
@@ -93,6 +93,13 @@
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="7NPCd7DDwAT" resolve="IEdge" />
     </node>
+    <node concept="1TJgyj" id="1XKxHZsLKHO" role="1TKVEi">
+      <property role="IQ2ns" value="2265458908607220596" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="attributes" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="1XKxHZsLKOl" resolve="IAttribute" />
+    </node>
     <node concept="PrWs8" id="1MEM7Lwxekd" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -131,5 +138,25 @@
       <ref role="PrY4T" node="1MEM7LwytpY" resolve="INode" />
     </node>
   </node>
+  <node concept="PlHQZ" id="1XKxHZsLKOl">
+    <property role="TrG5h" value="IAttribute" />
+    <property role="EcuMT" value="2265458908607221012" />
+  </node>
+  <node concept="1TIwiD" id="1XKxHZsLKOm">
+    <property role="EcuMT" value="2265458908607221014" />
+    <property role="TrG5h" value="CostAttribute" />
+    <property role="34LRSv" value="cost" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <node concept="PrWs8" id="1XKxHZsLKOp" role="PzmwI">
+      <ref role="PrY4T" node="1XKxHZsLKOl" resolve="IAttribute" />
+    </node>
+    <node concept="1TJgyj" id="1XKxHZsLKOs" role="1TKVEi">
+      <property role="IQ2ns" value="2265458908607221020" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="expression" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/models/com/mbeddr/doc/aspect/exampleLanguage/sandbox.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/models/com/mbeddr/doc/aspect/exampleLanguage/sandbox.mps
index e60e28f462..37e2705614 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/models/com/mbeddr/doc/aspect/exampleLanguage/sandbox.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/models/com/mbeddr/doc/aspect/exampleLanguage/sandbox.mps
@@ -12,6 +12,11 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
     </language>
     <language id="1e00450a-fc72-4f66-9571-30e5e083c1fa" name="com.mbeddr.doc.aspect.exampleLanguage.extended">
       <concept id="9004279853425732280" name="com.mbeddr.doc.aspect.exampleLanguage.extended.structure.UndirectedEdge" flags="ng" index="2lk0DD" />
@@ -20,6 +25,9 @@
       <concept id="86363842539034081" name="com.mbeddr.doc.aspect.exampleLanguage.structure.Node" flags="ng" index="aMcqk">
         <child id="1881564090922296934" name="expression" index="17$kVO" />
       </concept>
+      <concept id="2265458908607221014" name="com.mbeddr.doc.aspect.exampleLanguage.structure.CostAttribute" flags="ng" index="33HSJ9">
+        <child id="2265458908607221020" name="expression" index="33HSJ3" />
+      </concept>
       <concept id="2065683815623914867" name="com.mbeddr.doc.aspect.exampleLanguage.structure.ColoredNode" flags="ng" index="1W8VOf">
         <property id="2065683815623914868" name="color" index="1W8VO8" />
       </concept>
@@ -28,6 +36,7 @@
         <reference id="2065683815623615658" name="target" index="1WbyNm" />
       </concept>
       <concept id="2065683815623615751" name="com.mbeddr.doc.aspect.exampleLanguage.structure.Graph" flags="ng" index="1WbyPV">
+        <child id="2265458908607220596" name="attributes" index="33HSQF" />
         <child id="2065683815623615752" name="nodes" index="1WbyPO" />
         <child id="2065683815623615754" name="edges" index="1WbyPQ" />
       </concept>
@@ -88,6 +97,21 @@
       <property role="TrG5h" value="N5" />
       <property role="1W8VO8" value="1" />
     </node>
+    <node concept="33HSJ9" id="1XKxHZsLUK_" role="33HSQF">
+      <node concept="3cpWs3" id="1XKxHZsLVr2" role="33HSJ3">
+        <node concept="3cmrfG" id="1XKxHZsLVr5" role="3uHU7w">
+          <property role="3cmrfH" value="30" />
+        </node>
+        <node concept="3cpWs3" id="1XKxHZsLVbL" role="3uHU7B">
+          <node concept="3cmrfG" id="1XKxHZsLUKD" role="3uHU7B">
+            <property role="3cmrfH" value="10" />
+          </node>
+          <node concept="3cmrfG" id="1XKxHZsLVbO" role="3uHU7w">
+            <property role="3cmrfH" value="20" />
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/editor.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/editor.mps
index 1cacfcdf3d..5dbb7f6866 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/editor.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/editor.mps
@@ -43,6 +43,7 @@
         <property id="168363875802087287" name="showInUI" index="2gpH_U" />
         <property id="5944657839012629576" name="presentation" index="2BUmq6" />
       </concept>
+      <concept id="1239814640496" name="jetbrains.mps.lang.editor.structure.CellLayout_VerticalGrid" flags="nn" index="2EHx9g" />
       <concept id="1149850725784" name="jetbrains.mps.lang.editor.structure.CellModel_AttributedNodeCell" flags="ng" index="2SsqMj" />
       <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
         <property id="1186403713874" name="color" index="Vb096" />
@@ -54,6 +55,7 @@
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
+      <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
       <concept id="1139535219966" name="jetbrains.mps.lang.editor.structure.CellActionMapDeclaration" flags="ig" index="1h_SRR">
@@ -282,15 +284,28 @@
       <node concept="2SsqMj" id="UK_oBpA4Fi" role="3EZMnx" />
       <node concept="2iRkQZ" id="UK_oBpA4Fe" role="2iSdaV" />
     </node>
-    <node concept="3EZMnI" id="1CsE99t_Me7" role="6VMZX">
-      <node concept="2iRfu4" id="1CsE99t_Me8" role="2iSdaV" />
-      <node concept="3F0ifn" id="1CsE99t_Me4" role="3EZMnx">
-        <property role="3F0ifm" value="priority" />
+    <node concept="3EZMnI" id="1XKxHZsTPvT" role="6VMZX">
+      <node concept="2EHx9g" id="1XKxHZsTPwz" role="2iSdaV" />
+      <node concept="3EZMnI" id="1CsE99t_Me7" role="3EZMnx">
+        <node concept="2iRfu4" id="1CsE99t_Me8" role="2iSdaV" />
+        <node concept="3F0ifn" id="1CsE99t_Me4" role="3EZMnx">
+          <property role="3F0ifm" value="priority" />
+        </node>
+        <node concept="3F0A7n" id="1CsE99t_Meg" role="3EZMnx">
+          <property role="1$x2rV" value="0" />
+          <property role="1O74Pk" value="true" />
+          <ref role="1NtTu8" to="748g:1CsE99t_Me0" resolve="priority" />
+        </node>
       </node>
-      <node concept="3F0A7n" id="1CsE99t_Meg" role="3EZMnx">
-        <property role="1$x2rV" value="0" />
-        <property role="1O74Pk" value="true" />
-        <ref role="1NtTu8" to="748g:1CsE99t_Me0" resolve="priority" />
+      <node concept="3EZMnI" id="1XKxHZsTPwb" role="3EZMnx">
+        <node concept="VPM3Z" id="1XKxHZsTPwd" role="3F10Kt" />
+        <node concept="3F0ifn" id="1XKxHZsTPwp" role="3EZMnx">
+          <property role="3F0ifm" value="override children" />
+        </node>
+        <node concept="2iRfu4" id="1XKxHZsTPwg" role="2iSdaV" />
+        <node concept="3F0A7n" id="1XKxHZsTPwv" role="3EZMnx">
+          <ref role="1NtTu8" to="748g:1XKxHZsTPvQ" resolve="overrideChildren" />
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps
index 55c5d9ea10..96341750c2 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps
@@ -6,9 +6,12 @@
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
-  <imports />
+  <imports>
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+  </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
       <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
@@ -23,13 +26,48 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ng" index="2frcj7">
+        <child id="2323553266850475953" name="modifiers" index="2frcjj" />
+      </concept>
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <concept id="4678410916365116210" name="jetbrains.mps.baseLanguage.structure.DefaultModifier" flags="ng" index="2JFqV2" />
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1221565133444" name="isFinal" index="1EXbeo" />
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <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="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS" />
+      <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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
@@ -47,6 +85,19 @@
         <child id="8029776554053057803" name="objectType" index="luc8K" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="3542851458883438784" name="jetbrains.mps.lang.smodel.structure.LanguageId" flags="nn" index="2V$Bhx">
         <property id="3542851458883439831" name="namespace" index="2V$B1Q" />
@@ -54,6 +105,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">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -90,8 +144,137 @@
       <node concept="3clFbS" id="1T8cMxCROxn" role="3clF47" />
       <node concept="3Tm1VV" id="1T8cMxCROxo" role="1B3o_S" />
       <node concept="10P_77" id="1T8cMxCShjv" role="3clF45" />
+      <node concept="P$JXv" id="3KxJFmNUFo7" role="lGtFl">
+        <node concept="TZ5HA" id="3KxJFmNUFo8" role="TZ5H$">
+          <node concept="1dT_AC" id="3KxJFmNUFo9" role="1dT_Ay">
+            <property role="1dT_AB" value="For references under the cursor, show the documentation of the referenced concept." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="2z92rvRqna3" role="TZ5H$">
+          <node concept="1dT_AC" id="2z92rvRqna4" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="2z92rvRqnaB" role="TZ5H$">
+          <node concept="1dT_AC" id="2z92rvRqnaC" role="1dT_Ay">
+            <property role="1dT_AB" value="Activate this flag to show the documentation of the referencing concept instead." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3Tm1VV" id="1T8cMxCROtp" role="1B3o_S" />
+    <node concept="3UR2Jj" id="3qokpdXQck2" role="lGtFl">
+      <node concept="TZ5HA" id="3qokpdXQck3" role="TZ5H$">
+        <node concept="1dT_AC" id="3qokpdXQck4" role="1dT_Ay">
+          <property role="1dT_AB" value="Provide an extension point in your application to configure this." />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5N03sBKzJsf" role="jymVt" />
+    <node concept="3clFb_" id="5N03sBKzJsV" role="jymVt">
+      <property role="TrG5h" value="allowOverrideChildren" />
+      <node concept="3clFbS" id="5N03sBKzJsW" role="3clF47">
+        <node concept="3clFbF" id="5N03sBKzKvE" role="3cqZAp">
+          <node concept="10M0yZ" id="5N03sBKzKwm" role="3clFbG">
+            <ref role="3cqZAo" node="5X4OV7_Et82" resolve="DEFAULT_ALLOW_OVERRIDE_CHILDREN" />
+            <ref role="1PxDUh" node="3qokpdXQc0N" resolve="DefaultDocAspectConfiguration" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5N03sBKzJsX" role="1B3o_S" />
+      <node concept="10P_77" id="5N03sBKzJsY" role="3clF45" />
+      <node concept="P$JXv" id="5N03sBKzJsZ" role="lGtFl">
+        <node concept="TZ5HA" id="5N03sBKzJt0" role="TZ5H$">
+          <node concept="1dT_AC" id="5N03sBKzJt1" role="1dT_Ay">
+            <property role="1dT_AB" value="Flag to activate the overrideChildren flag of DocumentedConceptAnnotation nodes." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="5N03sBKzJt2" role="TZ5H$">
+          <node concept="1dT_AC" id="5N03sBKzJt3" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="5N03sBKzJt4" role="TZ5H$">
+          <node concept="1dT_AC" id="5N03sBKzJt5" role="1dT_Ay">
+            <property role="1dT_AB" value="Note: Activate this if any DocumentedConceptAnnotation in your application uses" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="5N03sBKzJt6" role="TZ5H$">
+          <node concept="1dT_AC" id="5N03sBKzJt7" role="1dT_Ay">
+            <property role="1dT_AB" value="the overrideChildren flag. Although a cache will be used to ensure that the IDE" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="5N03sBKzJt8" role="TZ5H$">
+          <node concept="1dT_AC" id="5N03sBKzJt9" role="1dT_Ay">
+            <property role="1dT_AB" value="performance is acceptable, selecting nodes in the editor while the documentation" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="5N03sBKzJta" role="TZ5H$">
+          <node concept="1dT_AC" id="5N03sBKzJtb" role="1dT_Ay">
+            <property role="1dT_AB" value="view is opened might have a slight delay when the concept of the node hasn't been " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="5N03sBKzJtc" role="TZ5H$">
+          <node concept="1dT_AC" id="5N03sBKzJtd" role="1dT_Ay">
+            <property role="1dT_AB" value="encountered in the current IDE session." />
+          </node>
+        </node>
+      </node>
+      <node concept="2JFqV2" id="5N03sBKzK4p" role="2frcjj" />
+    </node>
+    <node concept="2tJIrI" id="5N03sBKzJss" role="jymVt" />
+  </node>
+  <node concept="312cEu" id="3qokpdXQc0N">
+    <property role="TrG5h" value="DefaultDocAspectConfiguration" />
+    <property role="1EXbeo" value="true" />
+    <node concept="Wx3nA" id="5X4OV7_Et82" role="jymVt">
+      <property role="TrG5h" value="DEFAULT_ALLOW_OVERRIDE_CHILDREN" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm1VV" id="5X4OV7_Eqnx" role="1B3o_S" />
+      <node concept="10P_77" id="5X4OV7_Et1r" role="1tU5fm" />
+      <node concept="3clFbT" id="5X4OV7_Etf$" role="33vP2m" />
+    </node>
+    <node concept="2tJIrI" id="5X4OV7_Eq1m" role="jymVt" />
+    <node concept="3Tm1VV" id="3qokpdXQc0O" role="1B3o_S" />
+    <node concept="3uibUv" id="5N03sBKzK$l" role="EKbjA">
+      <ref role="3uigEE" node="1T8cMxCROto" resolve="IDocumentationAspectConfiguration" />
+    </node>
+    <node concept="3clFb_" id="3qokpdXQc2t" role="jymVt">
+      <property role="TrG5h" value="showReferenceConceptDocumentation" />
+      <node concept="3Tm1VV" id="3qokpdXQc2v" role="1B3o_S" />
+      <node concept="10P_77" id="3qokpdXQc2w" role="3clF45" />
+      <node concept="3clFbS" id="3qokpdXQc2$" role="3clF47">
+        <node concept="3clFbF" id="3qokpdXQc2B" role="3cqZAp">
+          <node concept="3clFbT" id="3qokpdXQc2A" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3qokpdXQc2_" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3qokpdXQcd5" role="jymVt" />
+    <node concept="3clFb_" id="3qokpdXQc2C" role="jymVt">
+      <property role="TrG5h" value="allowOverrideChildren" />
+      <node concept="3Tm1VV" id="3qokpdXQc2E" role="1B3o_S" />
+      <node concept="10P_77" id="3qokpdXQc2F" role="3clF45" />
+      <node concept="3clFbS" id="3qokpdXQc2Z" role="3clF47">
+        <node concept="3clFbF" id="3qokpdXQc32" role="3cqZAp">
+          <node concept="37vLTw" id="5X4OV7_Et_v" role="3clFbG">
+            <ref role="3cqZAo" node="5X4OV7_Et82" resolve="DEFAULT_ALLOW_OVERRIDE_CHILDREN" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3qokpdXQc30" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="3UR2Jj" id="5X4OV7_F$Aa" role="lGtFl">
+      <node concept="TZ5HA" id="5X4OV7_F$Ab" role="TZ5H$">
+        <node concept="1dT_AC" id="5X4OV7_F$Ac" role="1dT_Ay">
+          <property role="1dT_AB" value="Defaults for DocAspect extension point." />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/structure.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/structure.mps
index 01902e6b24..c5412f0664 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/structure.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/structure.mps
@@ -60,6 +60,11 @@
       <property role="TrG5h" value="priority" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
+    <node concept="1TJgyi" id="1XKxHZsTPvQ" role="1TKVEl">
+      <property role="IQ2nx" value="2265458908609337334" />
+      <property role="TrG5h" value="overrideChildren" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
     <node concept="1TJgyj" id="UK_oBpA4EG" role="1TKVEi">
       <property role="20kJfa" value="concept" />
       <property role="20lbJX" value="fLJekj4/_1" />
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd
index c4c50ef479..c69f9c126c 100644
--- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd
+++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd
@@ -16,6 +16,9 @@
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
     <dependency reexport="false">38a074ed-e5ad-4b2d-be31-ca436911b8aa(com.mbeddr.doc.aspect)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)</dependency>
+    <dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
@@ -50,6 +53,7 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
     <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
@@ -60,6 +64,7 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps
index f70aab17af..de28711a24 100644
--- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps
+++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps
@@ -20,8 +20,14 @@
     <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
     <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
     <import index="pgte" ref="r:e361f9f2-2afa-4fbe-b895-bdd4fbfe44fa(com.mbeddr.doc.aspect.plugin)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="1i04" ref="r:3270011d-8b2d-4938-8dff-d256a759e017(jetbrains.mps.lang.behavior.structure)" />
+    <import index="sgh3" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.cache(de.q60.mps.collections.libs/)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="4gky" ref="r:e1dfab1d-c7a7-43e7-9f26-028afd483e82(com.mbeddr.doc.behavior)" implicit="true" />
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -42,6 +48,10 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -49,6 +59,18 @@
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
+        <child id="1076505808688" name="condition" index="2$JKZa" />
+      </concept>
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
+        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
+      </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -59,6 +81,7 @@
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
@@ -79,6 +102,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -102,6 +128,7 @@
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
         <child id="1206060520071" name="elsifClauses" index="3eNLev" />
@@ -109,7 +136,9 @@
       <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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
@@ -128,9 +157,13 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
+        <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
@@ -141,6 +174,7 @@
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
@@ -181,13 +215,29 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
+        <property id="5858074156537516431" name="text" index="x79VB" />
+      </concept>
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
+      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
+        <reference id="6832197706140518108" name="param" index="zr_51" />
+      </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
+        <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
+        <property id="8465538089690881934" name="text" index="TUZQ4" />
+        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
+      </concept>
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
+      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
+        <child id="2667874559098216723" name="text" index="3HnX3l" />
+      </concept>
       <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
@@ -204,16 +254,22 @@
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
+      <concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
+      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
         <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
       </concept>
+      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
+        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
+      </concept>
       <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1180457458947" name="jetbrains.mps.lang.smodel.structure.Concept_GetAllSuperConcepts" flags="nn" index="3oJPKh" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
@@ -235,6 +291,9 @@
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </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">
@@ -301,6 +360,7 @@
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
+      <concept id="31378964227347002" name="jetbrains.mps.baseLanguage.collections.structure.SelectNotNullOperation" flags="ng" index="1KnU$U" />
       <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
@@ -311,35 +371,1297 @@
       <property role="TrG5h" value="getDocumentation" />
       <node concept="37vLTG" id="tBHOvWeyo$" role="3clF46">
         <property role="TrG5h" value="concept" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3bZ5Sz" id="tBHOvWeyoU" role="1tU5fm" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3bZ5Sz" id="tBHOvWeyoU" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1o6EjwiUgZA" role="3clF46">
+        <property role="TrG5h" value="property" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="qmep2m01fl" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="tBHOvWez_9" role="3clF45" />
+      <node concept="3Tm1VV" id="tBHOvWexSI" role="1B3o_S" />
+      <node concept="3clFbS" id="tBHOvWexSJ" role="3clF47" />
+    </node>
+    <node concept="3Tm1VV" id="tBHOvWexRa" role="1B3o_S" />
+    <node concept="3uibUv" id="5NpY9mnsaJ9" role="3HQHJm">
+      <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
+    </node>
+    <node concept="2tJIrI" id="qmep2m01hn" role="jymVt" />
+  </node>
+  <node concept="312cEu" id="qh7UMGioaa">
+    <property role="TrG5h" value="DocumentationAspectHelper" />
+    <node concept="2tJIrI" id="qh7UMGip8X" role="jymVt" />
+    <node concept="2YIFZL" id="1XKxHZsSs$9" role="jymVt">
+      <property role="TrG5h" value="getDocumentation" />
+      <node concept="37vLTG" id="1XKxHZsSvB0" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="1XKxHZsSvB1" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1XKxHZsSvB2" role="3clF46">
+        <property role="TrG5h" value="selectedNode" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3Tqbb2" id="1XKxHZsSwCm" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1XKxHZsSvB4" role="3clF46">
+        <property role="TrG5h" value="property" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="1XKxHZsSvB5" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="1XKxHZsSs$c" role="3clF47">
+        <node concept="3cpWs8" id="1XKxHZsUjEH" role="3cqZAp">
+          <node concept="3cpWsn" id="1XKxHZsUjEI" role="3cpWs9">
+            <property role="TrG5h" value="localDocNode" />
+            <node concept="3Tqbb2" id="1GfgNpVRbK$" role="1tU5fm" />
+            <node concept="1rXfSq" id="1XKxHZsUjEJ" role="33vP2m">
+              <ref role="37wK5l" node="2DFA9RLm5bh" resolve="getDocumentationForConcept" />
+              <node concept="37vLTw" id="1XKxHZsUjEK" role="37wK5m">
+                <ref role="3cqZAo" node="1XKxHZsSvB0" resolve="repository" />
+              </node>
+              <node concept="2OqwBi" id="1XKxHZsSBhJ" role="37wK5m">
+                <node concept="37vLTw" id="11K_5nNfofu" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1XKxHZsSvB2" resolve="selectedNode" />
+                </node>
+                <node concept="2yIwOk" id="1XKxHZsSBhK" role="2OqNvi" />
+              </node>
+              <node concept="37vLTw" id="1XKxHZsUjEM" role="37wK5m">
+                <ref role="3cqZAo" node="1XKxHZsSvB4" resolve="property" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1XKxHZsUpiK" role="3cqZAp" />
+        <node concept="3clFbJ" id="5ut4bh9pIaA" role="3cqZAp">
+          <node concept="3clFbS" id="5ut4bh9pIaC" role="3clFbx">
+            <node concept="3SKdUt" id="5ut4bh9pKgg" role="3cqZAp">
+              <node concept="1PaTwC" id="5ut4bh9pKgh" role="1aUNEU">
+                <node concept="3oM_SD" id="5ut4bh9pKzB" role="1PaTwD">
+                  <property role="3oM_SC" value="check" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pKzD" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pKzG" role="1PaTwD">
+                  <property role="3oM_SC" value="chain" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pKzK" role="1PaTwD">
+                  <property role="3oM_SC" value="of" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pKzP" role="1PaTwD">
+                  <property role="3oM_SC" value="ancestors" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pKzV" role="1PaTwD">
+                  <property role="3oM_SC" value="of" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pK$2" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pK$K" role="1PaTwD">
+                  <property role="3oM_SC" value="selected" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pK$T" role="1PaTwD">
+                  <property role="3oM_SC" value="node" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pK_3" role="1PaTwD">
+                  <property role="3oM_SC" value="if" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pK_e" role="1PaTwD">
+                  <property role="3oM_SC" value="there" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pK_q" role="1PaTwD">
+                  <property role="3oM_SC" value="is" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pK_B" role="1PaTwD">
+                  <property role="3oM_SC" value="one" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pK_P" role="1PaTwD">
+                  <property role="3oM_SC" value="with" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pKA4" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="5ut4bh9pL43" role="3cqZAp">
+              <node concept="1PaTwC" id="5ut4bh9pL44" role="1aUNEU">
+                <node concept="3oM_SD" id="5ut4bh9pL5M" role="1PaTwD">
+                  <property role="3oM_SC" value="a" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pLnS" role="1PaTwD">
+                  <property role="3oM_SC" value="DocumentedConceptAnnotation" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pLo3" role="1PaTwD">
+                  <property role="3oM_SC" value="where" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pLof" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pLos" role="1PaTwD">
+                  <property role="3oM_SC" value="overrideChildren" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pLoM" role="1PaTwD">
+                  <property role="3oM_SC" value="flag" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pLp9" role="1PaTwD">
+                  <property role="3oM_SC" value="is" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pLph" role="1PaTwD">
+                  <property role="3oM_SC" value="set." />
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="5ut4bh9pNrO" role="3cqZAp">
+              <node concept="1PaTwC" id="5ut4bh9pNrP" role="1aUNEU">
+                <node concept="3oM_SD" id="5ut4bh9pNJF" role="1PaTwD">
+                  <property role="3oM_SC" value="this" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNJH" role="1PaTwD">
+                  <property role="3oM_SC" value="might" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNJK" role="1PaTwD">
+                  <property role="3oM_SC" value="have" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNJO" role="1PaTwD">
+                  <property role="3oM_SC" value="an" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNJT" role="1PaTwD">
+                  <property role="3oM_SC" value="impact" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNKe" role="1PaTwD">
+                  <property role="3oM_SC" value="on" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNKl" role="1PaTwD">
+                  <property role="3oM_SC" value="IDE" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNKt" role="1PaTwD">
+                  <property role="3oM_SC" value="performance" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNKA" role="1PaTwD">
+                  <property role="3oM_SC" value="when" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNKK" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNLk" role="1PaTwD">
+                  <property role="3oM_SC" value="documentation" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNLw" role="1PaTwD">
+                  <property role="3oM_SC" value="view" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNLH" role="1PaTwD">
+                  <property role="3oM_SC" value="is" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pNLV" role="1PaTwD">
+                  <property role="3oM_SC" value="opened" />
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="5ut4bh9pOgo" role="3cqZAp">
+              <node concept="1PaTwC" id="5ut4bh9pOgp" role="1aUNEU">
+                <node concept="3oM_SD" id="5ut4bh9pOiA" role="1PaTwD">
+                  <property role="3oM_SC" value="and" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOAR" role="1PaTwD">
+                  <property role="3oM_SC" value="cache" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOB2" role="1PaTwD">
+                  <property role="3oM_SC" value="misses" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOBe" role="1PaTwD">
+                  <property role="3oM_SC" value="occur" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOBr" role="1PaTwD">
+                  <property role="3oM_SC" value="(i.e.," />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOCY" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pODi" role="1PaTwD">
+                  <property role="3oM_SC" value="user" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOBD" role="1PaTwD">
+                  <property role="3oM_SC" value="never" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOBS" role="1PaTwD">
+                  <property role="3oM_SC" value="selected" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOC8" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOCp" role="1PaTwD">
+                  <property role="3oM_SC" value="node" />
+                </node>
+                <node concept="3oM_SD" id="5ut4bh9pOCz" role="1PaTwD">
+                  <property role="3oM_SC" value="before)." />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="1XKxHZsSGQz" role="3cqZAp">
+              <node concept="3cpWsn" id="1XKxHZsSGQA" role="3cpWs9">
+                <property role="TrG5h" value="n" />
+                <node concept="3Tqbb2" id="1XKxHZsSGQx" role="1tU5fm" />
+                <node concept="2OqwBi" id="1XKxHZsUs$K" role="33vP2m">
+                  <node concept="37vLTw" id="1XKxHZsSHqA" role="2Oq$k0">
+                    <ref role="3cqZAo" node="1XKxHZsSvB2" resolve="selectedNode" />
+                  </node>
+                  <node concept="1mfA1w" id="1XKxHZsUt1a" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="2$JKZl" id="1XKxHZsUn9_" role="3cqZAp">
+              <node concept="3clFbS" id="1XKxHZsUn9B" role="2LFqv$">
+                <node concept="3cpWs8" id="1GfgNpVITr1" role="3cqZAp">
+                  <node concept="3cpWsn" id="1GfgNpVITr2" role="3cpWs9">
+                    <property role="TrG5h" value="ancestorDocNode" />
+                    <node concept="3Tqbb2" id="1GfgNpVQVTr" role="1tU5fm" />
+                    <node concept="1rXfSq" id="1GfgNpVITr3" role="33vP2m">
+                      <ref role="37wK5l" node="2DFA9RLm5bh" resolve="getDocForConceptCached" />
+                      <node concept="37vLTw" id="1GfgNpVITr4" role="37wK5m">
+                        <ref role="3cqZAo" node="1XKxHZsSvB0" resolve="repository" />
+                      </node>
+                      <node concept="2OqwBi" id="1GfgNpVITr5" role="37wK5m">
+                        <node concept="37vLTw" id="1GfgNpVITr6" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1XKxHZsSGQA" resolve="n" />
+                        </node>
+                        <node concept="2yIwOk" id="1GfgNpVITr7" role="2OqNvi" />
+                      </node>
+                      <node concept="10Nm6u" id="1GfgNpVITr8" role="37wK5m" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="1GfgNpVISWi" role="3cqZAp">
+                  <node concept="3clFbS" id="1GfgNpVISWk" role="3clFbx">
+                    <node concept="3SKdUt" id="1XKxHZt0C8q" role="3cqZAp">
+                      <node concept="1PaTwC" id="1XKxHZt0C8r" role="1aUNEU">
+                        <node concept="3oM_SD" id="1XKxHZt0CxD" role="1PaTwD">
+                          <property role="3oM_SC" value="the" />
+                        </node>
+                        <node concept="3oM_SD" id="1XKxHZt0CxF" role="1PaTwD">
+                          <property role="3oM_SC" value="ancestor's" />
+                        </node>
+                        <node concept="3oM_SD" id="1XKxHZt0CUz" role="1PaTwD">
+                          <property role="3oM_SC" value="documentation" />
+                        </node>
+                        <node concept="3oM_SD" id="1XKxHZt0CUJ" role="1PaTwD">
+                          <property role="3oM_SC" value="node" />
+                        </node>
+                        <node concept="3oM_SD" id="1XKxHZt0CUO" role="1PaTwD">
+                          <property role="3oM_SC" value="should" />
+                        </node>
+                        <node concept="3oM_SD" id="1XKxHZt0CVa" role="1PaTwD">
+                          <property role="3oM_SC" value="have" />
+                        </node>
+                        <node concept="3oM_SD" id="1XKxHZt0CVh" role="1PaTwD">
+                          <property role="3oM_SC" value="an" />
+                        </node>
+                        <node concept="3oM_SD" id="1XKxHZt0CVp" role="1PaTwD">
+                          <property role="3oM_SC" value="annotation," />
+                        </node>
+                        <node concept="3oM_SD" id="1XKxHZt0CVy" role="1PaTwD">
+                          <property role="3oM_SC" value="retrieve" />
+                        </node>
+                        <node concept="3oM_SD" id="1XKxHZt0CVG" role="1PaTwD">
+                          <property role="3oM_SC" value="it" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="1GfgNpVMyDG" role="3cqZAp">
+                      <node concept="3cpWsn" id="1GfgNpVMyDH" role="3cpWs9">
+                        <property role="TrG5h" value="dca" />
+                        <node concept="3Tqbb2" id="1GfgNpVMx6B" role="1tU5fm">
+                          <ref role="ehGHo" to="748g:UK_oBp_UIu" resolve="DocumentedConceptAnnotation" />
+                        </node>
+                        <node concept="1rXfSq" id="1GfgNpVMyDI" role="33vP2m">
+                          <ref role="37wK5l" node="1GfgNpVL_IS" resolve="getAnnotation" />
+                          <node concept="37vLTw" id="1GfgNpVMyDJ" role="37wK5m">
+                            <ref role="3cqZAo" node="1GfgNpVITr2" resolve="ancestorDocNode" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbJ" id="1XKxHZsWmWJ" role="3cqZAp">
+                      <node concept="3clFbS" id="1XKxHZsWmWL" role="3clFbx">
+                        <node concept="3SKdUt" id="5ut4bh9pLPA" role="3cqZAp">
+                          <node concept="1PaTwC" id="5ut4bh9pLPB" role="1aUNEU">
+                            <node concept="3oM_SD" id="5ut4bh9pMeQ" role="1PaTwD">
+                              <property role="3oM_SC" value="check" />
+                            </node>
+                            <node concept="3oM_SD" id="5ut4bh9pMeS" role="1PaTwD">
+                              <property role="3oM_SC" value="override" />
+                            </node>
+                            <node concept="3oM_SD" id="5ut4bh9pMeV" role="1PaTwD">
+                              <property role="3oM_SC" value="flag" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3cpWs8" id="1XKxHZsWrqC" role="3cqZAp">
+                          <node concept="3cpWsn" id="1XKxHZsWrqD" role="3cpWs9">
+                            <property role="TrG5h" value="override" />
+                            <node concept="10P_77" id="1XKxHZsWr5Z" role="1tU5fm" />
+                            <node concept="2OqwBi" id="1XKxHZsWrqE" role="33vP2m">
+                              <node concept="37vLTw" id="1XKxHZsWrqG" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1GfgNpVMyDH" resolve="dca" />
+                              </node>
+                              <node concept="3TrcHB" id="1XKxHZsWrqI" role="2OqNvi">
+                                <ref role="3TsBF5" to="748g:1XKxHZsTPvQ" resolve="overrideChildren" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbJ" id="1XKxHZsWsph" role="3cqZAp">
+                          <node concept="3clFbS" id="1XKxHZsWspj" role="3clFbx">
+                            <node concept="3SKdUt" id="1XKxHZsWuY8" role="3cqZAp">
+                              <node concept="1PaTwC" id="1XKxHZsWuY9" role="1aUNEU">
+                                <node concept="3oM_SD" id="1XKxHZsWuYe" role="1PaTwD">
+                                  <property role="3oM_SC" value="we" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvmr" role="1PaTwD">
+                                  <property role="3oM_SC" value="found" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvmR" role="1PaTwD">
+                                  <property role="3oM_SC" value="an" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvmV" role="1PaTwD">
+                                  <property role="3oM_SC" value="ancestor" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvoR" role="1PaTwD">
+                                  <property role="3oM_SC" value="whose" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvp8" role="1PaTwD">
+                                  <property role="3oM_SC" value="concept-documentation" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvnH" role="1PaTwD">
+                                  <property role="3oM_SC" value="has" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvpU" role="1PaTwD">
+                                  <property role="3oM_SC" value="its" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvnX" role="1PaTwD">
+                                  <property role="3oM_SC" value="overrideChild" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvoe" role="1PaTwD">
+                                  <property role="3oM_SC" value="flag" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWvqd" role="1PaTwD">
+                                  <property role="3oM_SC" value="set" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3SKdUt" id="1XKxHZsWvPw" role="3cqZAp">
+                              <node concept="1PaTwC" id="1XKxHZsWvPx" role="1aUNEU">
+                                <node concept="3oM_SD" id="1XKxHZsWwdY" role="1PaTwD">
+                                  <property role="3oM_SC" value="show" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWwe0" role="1PaTwD">
+                                  <property role="3oM_SC" value="the" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWwe3" role="1PaTwD">
+                                  <property role="3oM_SC" value="ancestors" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWwei" role="1PaTwD">
+                                  <property role="3oM_SC" value="concept-documentation" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWwen" role="1PaTwD">
+                                  <property role="3oM_SC" value="instead" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWwet" role="1PaTwD">
+                                  <property role="3oM_SC" value="of" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWwe$" role="1PaTwD">
+                                  <property role="3oM_SC" value="the" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWweG" role="1PaTwD">
+                                  <property role="3oM_SC" value="selectedNode's" />
+                                </node>
+                                <node concept="3oM_SD" id="1XKxHZsWweP" role="1PaTwD">
+                                  <property role="3oM_SC" value="documentation" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWs6" id="1XKxHZsWwIx" role="3cqZAp">
+                              <node concept="37vLTw" id="1XKxHZsWxsY" role="3cqZAk">
+                                <ref role="3cqZAo" node="1GfgNpVITr2" resolve="ancestorDocNode" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="1XKxHZsWsUY" role="3clFbw">
+                            <ref role="3cqZAo" node="1XKxHZsWrqD" resolve="override" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="1GfgNpVMKgN" role="3clFbw">
+                        <node concept="37vLTw" id="1GfgNpVMJdD" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1GfgNpVMyDH" resolve="dca" />
+                        </node>
+                        <node concept="3x8VRR" id="1GfgNpVMMIk" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="1GfgNpVR1CF" role="3clFbw">
+                    <node concept="37vLTw" id="1GfgNpVIVI5" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1GfgNpVITr2" resolve="ancestorDocNode" />
+                    </node>
+                    <node concept="3x8VRR" id="1GfgNpVR3Vd" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3clFbF" id="1XKxHZsWtCF" role="3cqZAp">
+                  <node concept="37vLTI" id="1XKxHZsWu3C" role="3clFbG">
+                    <node concept="2OqwBi" id="1XKxHZsWukA" role="37vLTx">
+                      <node concept="37vLTw" id="1XKxHZsWu8d" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1XKxHZsSGQA" resolve="n" />
+                      </node>
+                      <node concept="1mfA1w" id="1XKxHZsWuzj" role="2OqNvi" />
+                    </node>
+                    <node concept="37vLTw" id="1XKxHZsWtCD" role="37vLTJ">
+                      <ref role="3cqZAo" node="1XKxHZsSGQA" resolve="n" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="1XKxHZsUnCm" role="2$JKZa">
+                <node concept="37vLTw" id="1XKxHZsUnv6" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1XKxHZsSGQA" resolve="n" />
+                </node>
+                <node concept="3x8VRR" id="1XKxHZsUo9o" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="1Wc70l" id="6SZYYyywY1E" role="3clFbw">
+            <node concept="3fqX7Q" id="6SZYYyyx3mZ" role="3uHU7w">
+              <node concept="1rXfSq" id="6SZYYyyx3n1" role="3fr31v">
+                <ref role="37wK5l" node="6SZYYyywZfu" resolve="isBlacklistedForOverride" />
+                <node concept="37vLTw" id="6SZYYyyx4_J" role="37wK5m">
+                  <ref role="3cqZAo" node="1XKxHZsSvB2" resolve="selectedNode" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5N03sBK_s9S" role="3uHU7B">
+              <node concept="1rXfSq" id="5N03sBK_rV1" role="2Oq$k0">
+                <ref role="37wK5l" node="5ut4bh9phV1" resolve="config" />
+              </node>
+              <node concept="liA8E" id="5N03sBK_sN$" role="2OqNvi">
+                <ref role="37wK5l" to="pgte:5N03sBKzJsV" resolve="allowOverrideChildren" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1XKxHZsWxJh" role="3cqZAp" />
+        <node concept="3SKdUt" id="1XKxHZsWywH" role="3cqZAp">
+          <node concept="1PaTwC" id="1XKxHZsWyVA" role="1aUNEU">
+            <node concept="3oM_SD" id="1XKxHZsWzka" role="1PaTwD">
+              <property role="3oM_SC" value="no" />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWzkk" role="1PaTwD">
+              <property role="3oM_SC" value="ancestor" />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWzkv" role="1PaTwD">
+              <property role="3oM_SC" value="with" />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWzle" role="1PaTwD">
+              <property role="3oM_SC" value="overrideFlag" />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWzlj" role="1PaTwD">
+              <property role="3oM_SC" value="set," />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWzlx" role="1PaTwD">
+              <property role="3oM_SC" value="just" />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWzlK" role="1PaTwD">
+              <property role="3oM_SC" value="show" />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWzna" role="1PaTwD">
+              <property role="3oM_SC" value="documentation" />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWznj" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWzn_" role="1PaTwD">
+              <property role="3oM_SC" value="selected" />
+            </node>
+            <node concept="3oM_SD" id="1XKxHZsWznS" role="1PaTwD">
+              <property role="3oM_SC" value="node" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="1GfgNpVRCeH" role="3cqZAp">
+          <node concept="37vLTw" id="1GfgNpVRGdL" role="3cqZAk">
+            <ref role="3cqZAo" node="1XKxHZsUjEI" resolve="localDocNode" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1XKxHZsSqFL" role="1B3o_S" />
+      <node concept="3Tqbb2" id="1XKxHZsSsoZ" role="3clF45" />
+      <node concept="P$JXv" id="1GfgNpVWOVT" role="lGtFl">
+        <node concept="TZ5HA" id="1GfgNpVWOVU" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWOVV" role="1dT_Ay">
+            <property role="1dT_AB" value="Get the documentation node for a given selected node/property." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWPfG" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWPfH" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWPAm" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWPAn" role="1dT_Ay">
+            <property role="1dT_AB" value="This will take into account the following settings of the documentation annotations:" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWPPE" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWPPF" role="1dT_Ay">
+            <property role="1dT_AB" value="- priority: if there is more than one documentation annotation for the given node," />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWQco" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWQcp" role="1dT_Ay">
+            <property role="1dT_AB" value="  the one with the higher priority will be returned" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWQz8" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWQz9" role="1dT_Ay">
+            <property role="1dT_AB" value="- overrideChildren: the documentation node for the given selected node will only be " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWRgI" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWRgJ" role="1dT_Ay">
+            <property role="1dT_AB" value="  returned if there is no ancestor of the selected node which has a documentation node" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWRB$" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWRB_" role="1dT_Ay">
+            <property role="1dT_AB" value="  with the override-flag set. If there is such an ancestor, its documentation will be shown" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWRYs" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWRYt" role="1dT_Ay">
+            <property role="1dT_AB" value="  instead of the selected node's documentation." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWSGd" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWSGe" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWSVJ" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWSVK" role="1dT_Ay">
+            <property role="1dT_AB" value="Note that the retrieval of documentation nodes uses caching, as searching through the " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVWTiF" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVWTiG" role="1dT_Ay">
+            <property role="1dT_AB" value="ancestors might be expensive." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="1GfgNpVWOVW" role="3nqlJM">
+          <property role="TUZQ4" value="the current repository (opened with IDE)" />
+          <node concept="zr_55" id="1GfgNpVWOVY" role="zr_5Q">
+            <ref role="zr_51" node="1XKxHZsSvB0" resolve="repository" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="1GfgNpVWOVZ" role="3nqlJM">
+          <property role="TUZQ4" value="the node at the cursor" />
+          <node concept="zr_55" id="1GfgNpVWOW1" role="zr_5Q">
+            <ref role="zr_51" node="1XKxHZsSvB2" resolve="selectedNode" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="1GfgNpVWOW2" role="3nqlJM">
+          <property role="TUZQ4" value="the property at the cursor (or null)" />
+          <node concept="zr_55" id="1GfgNpVWOW4" role="zr_5Q">
+            <ref role="zr_51" node="1XKxHZsSvB4" resolve="property" />
+          </node>
+        </node>
+        <node concept="x79VA" id="1GfgNpVWOW5" role="3nqlJM">
+          <property role="x79VB" value="a documentation node, if any" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6SZYYyywieq" role="jymVt" />
+    <node concept="2YIFZL" id="6SZYYyywZfu" role="jymVt">
+      <property role="TrG5h" value="isBlacklistedForOverride" />
+      <node concept="3clFbS" id="6SZYYyywqMt" role="3clF47">
+        <node concept="3cpWs8" id="6SZYYyywIX6" role="3cqZAp">
+          <node concept="3cpWsn" id="6SZYYyywIX7" role="3cpWs9">
+            <property role="TrG5h" value="rootConcept" />
+            <node concept="3bZ5Sz" id="6SZYYyywHZZ" role="1tU5fm" />
+            <node concept="2OqwBi" id="6SZYYyywIX8" role="33vP2m">
+              <node concept="2OqwBi" id="6SZYYyywIX9" role="2Oq$k0">
+                <node concept="37vLTw" id="6SZYYyywIXa" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6SZYYyyw$Mv" resolve="n" />
+                </node>
+                <node concept="2Rxl7S" id="6SZYYyywIXb" role="2OqNvi" />
+              </node>
+              <node concept="2yIwOk" id="6SZYYyywIXc" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6SZYYyywANq" role="3cqZAp">
+          <node concept="22lmx$" id="6SZYYyyxIxf" role="3clFbG">
+            <node concept="17R0WA" id="6SZYYyyxLuN" role="3uHU7w">
+              <node concept="35c_gC" id="6SZYYyyxN0o" role="3uHU7w">
+                <ref role="35c_gD" to="1i04:hP3h7Gq" resolve="ConceptBehavior" />
+              </node>
+              <node concept="37vLTw" id="6SZYYyyxJYC" role="3uHU7B">
+                <ref role="3cqZAo" node="6SZYYyywIX7" resolve="rootConcept" />
+              </node>
+            </node>
+            <node concept="22lmx$" id="6SZYYyyx9G$" role="3uHU7B">
+              <node concept="17R0WA" id="6SZYYyywSlk" role="3uHU7B">
+                <node concept="37vLTw" id="6SZYYyywIXd" role="3uHU7B">
+                  <ref role="3cqZAo" node="6SZYYyywIX7" resolve="rootConcept" />
+                </node>
+                <node concept="35c_gC" id="6SZYYyywUeI" role="3uHU7w">
+                  <ref role="35c_gD" to="tpee:fz12cDA" resolve="ClassConcept" />
+                </node>
+              </node>
+              <node concept="17R0WA" id="6SZYYyyxdqB" role="3uHU7w">
+                <node concept="37vLTw" id="6SZYYyyxb$H" role="3uHU7B">
+                  <ref role="3cqZAo" node="6SZYYyywIX7" resolve="rootConcept" />
+                </node>
+                <node concept="35c_gC" id="6SZYYyyxgtf" role="3uHU7w">
+                  <ref role="35c_gD" to="tpee:g7HP654" resolve="Interface" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6SZYYyyw$Mv" role="3clF46">
+        <property role="TrG5h" value="n" />
+        <node concept="3Tqbb2" id="6SZYYyyw$Mu" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="6SZYYyywqzu" role="3clF45" />
+      <node concept="3Tm6S6" id="6SZYYyywnDq" role="1B3o_S" />
+      <node concept="P$JXv" id="6SZYYyyx5R$" role="lGtFl">
+        <node concept="TZ5HA" id="6SZYYyyx5R_" role="TZ5H$">
+          <node concept="1dT_AC" id="6SZYYyyx5RA" role="1dT_Ay">
+            <property role="1dT_AB" value="Usually there is no mbeddr-doc documentation for baselang, blacklist the corresponding roots." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="4V_wlz9VahQ" role="TZ5H$">
+          <node concept="1dT_AC" id="4V_wlz9VahR" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="4V_wlz9VahW" role="TZ5H$">
+          <node concept="1dT_AC" id="4V_wlz9VahX" role="1dT_Ay">
+            <property role="1dT_AB" value="Note: The idea here is to do a quick check which can be done without much overhead." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1GfgNpVLtKR" role="jymVt" />
+    <node concept="Wx3nA" id="2DFA9RLkOfY" role="jymVt">
+      <property role="TrG5h" value="cache" />
+      <node concept="3Tm6S6" id="2DFA9RLl1cR" role="1B3o_S" />
+      <node concept="3uibUv" id="2DFA9RLkRkP" role="1tU5fm">
+        <ref role="3uigEE" to="sgh3:~Cache" resolve="Cache" />
+        <node concept="1LlUBW" id="2DFA9RLkRLr" role="11_B2D">
+          <node concept="3bZ5Sz" id="2DFA9RLkSej" role="1Lm7xW" />
+          <node concept="3uibUv" id="2DFA9RLkSFc" role="1Lm7xW">
+            <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="1GfgNpVSE1t" role="11_B2D">
+          <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+          <node concept="3Tqbb2" id="1GfgNpVSGmN" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="2OqwBi" id="2DFA9RLkXKB" role="33vP2m">
+        <node concept="2OqwBi" id="2DFA9RLkVrI" role="2Oq$k0">
+          <node concept="2YIFZM" id="2DFA9RLkV2x" role="2Oq$k0">
+            <ref role="37wK5l" to="sgh3:~CacheBuilder.newBuilder()" resolve="newBuilder" />
+            <ref role="1Pybhc" to="sgh3:~CacheBuilder" resolve="CacheBuilder" />
+          </node>
+          <node concept="liA8E" id="2DFA9RLkWu4" role="2OqNvi">
+            <ref role="37wK5l" to="sgh3:~CacheBuilder.maximumSize(long)" resolve="maximumSize" />
+            <node concept="3cmrfG" id="2DFA9RLkWMO" role="37wK5m">
+              <property role="3cmrfH" value="5000" />
+            </node>
+          </node>
+        </node>
+        <node concept="liA8E" id="2DFA9RLkYWI" role="2OqNvi">
+          <ref role="37wK5l" to="sgh3:~CacheBuilder.build()" resolve="build" />
+          <node concept="1LlUBW" id="2DFA9RLl0fN" role="3PaCim">
+            <node concept="3bZ5Sz" id="2DFA9RLl0fO" role="1Lm7xW" />
+            <node concept="3uibUv" id="2DFA9RLl0fP" role="1Lm7xW">
+              <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+            </node>
+          </node>
+          <node concept="3uibUv" id="1GfgNpVSIDz" role="3PaCim">
+            <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+            <node concept="3Tqbb2" id="1GfgNpVSID$" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="1GfgNpVVt$C" role="lGtFl">
+        <node concept="TZ5HA" id="1GfgNpVVt$D" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVt$E" role="1dT_Ay">
+            <property role="1dT_AB" value="Cache for concept/property to corresponding node in documentation." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1XKxHZsSu63" role="jymVt" />
+    <node concept="2YIFZL" id="2DFA9RLm5bh" role="jymVt">
+      <property role="TrG5h" value="getDocForConceptCached" />
+      <node concept="3clFbS" id="2DFA9RLl5jQ" role="3clF47">
+        <node concept="3SKdUt" id="1GfgNpVL205" role="3cqZAp">
+          <node concept="1PaTwC" id="1GfgNpVL206" role="1aUNEU">
+            <node concept="3oM_SD" id="1GfgNpVL4aN" role="1PaTwD">
+              <property role="3oM_SC" value="get" />
+            </node>
+            <node concept="3oM_SD" id="1GfgNpVL4aP" role="1PaTwD">
+              <property role="3oM_SC" value="documentation" />
+            </node>
+            <node concept="3oM_SD" id="1GfgNpVL4aS" role="1PaTwD">
+              <property role="3oM_SC" value="node" />
+            </node>
+            <node concept="3oM_SD" id="1GfgNpVL4aW" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="1GfgNpVL4b1" role="1PaTwD">
+              <property role="3oM_SC" value="cache" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="1GfgNpVOWOS" role="3cqZAp">
+          <node concept="3cpWsn" id="1GfgNpVOWOT" role="3cpWs9">
+            <property role="TrG5h" value="key" />
+            <node concept="1LlUBW" id="1GfgNpVOVuY" role="1tU5fm">
+              <node concept="3bZ5Sz" id="1GfgNpVOVv3" role="1Lm7xW" />
+              <node concept="3uibUv" id="1GfgNpVOVv4" role="1Lm7xW">
+                <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+              </node>
+            </node>
+            <node concept="1Ls8ON" id="1GfgNpVOWOU" role="33vP2m">
+              <node concept="37vLTw" id="1GfgNpVOWOV" role="1Lso8e">
+                <ref role="3cqZAo" node="2DFA9RLl8eY" resolve="concept" />
+              </node>
+              <node concept="37vLTw" id="1GfgNpVOWOW" role="1Lso8e">
+                <ref role="3cqZAo" node="2DFA9RLl8f0" resolve="property" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="1GfgNpVOgQi" role="3cqZAp">
+          <node concept="3cpWsn" id="1GfgNpVOgQj" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="2OqwBi" id="1GfgNpVOgQk" role="33vP2m">
+              <node concept="37vLTw" id="1GfgNpVOgQl" role="2Oq$k0">
+                <ref role="3cqZAo" node="2DFA9RLkOfY" resolve="cache" />
+              </node>
+              <node concept="liA8E" id="1GfgNpVOgQm" role="2OqNvi">
+                <ref role="37wK5l" to="sgh3:~Cache.getIfPresent(java.lang.Object)" resolve="getIfPresent" />
+                <node concept="37vLTw" id="1GfgNpVOWOX" role="37wK5m">
+                  <ref role="3cqZAo" node="1GfgNpVOWOT" resolve="key" />
+                </node>
+              </node>
+            </node>
+            <node concept="3uibUv" id="1GfgNpVSKVd" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+              <node concept="3Tqbb2" id="1GfgNpVSKVe" role="11_B2D" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="1GfgNpVOo9E" role="3cqZAp">
+          <node concept="3clFbS" id="1GfgNpVOo9G" role="3clFbx">
+            <node concept="3SKdUt" id="1GfgNpVO$w1" role="3cqZAp">
+              <node concept="1PaTwC" id="1GfgNpVO$w2" role="1aUNEU">
+                <node concept="3oM_SD" id="1GfgNpVOAuM" role="1PaTwD">
+                  <property role="3oM_SC" value="not" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVOAuO" role="1PaTwD">
+                  <property role="3oM_SC" value="in" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVOAuR" role="1PaTwD">
+                  <property role="3oM_SC" value="cache" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVPLWi" role="1PaTwD">
+                  <property role="3oM_SC" value="or" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVPM6o" role="1PaTwD">
+                  <property role="3oM_SC" value="outdated," />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVPMbo" role="1PaTwD">
+                  <property role="3oM_SC" value="compute" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVPMlj" role="1PaTwD">
+                  <property role="3oM_SC" value="it" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVPMlr" role="1PaTwD">
+                  <property role="3oM_SC" value="and" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVPMqu" role="1PaTwD">
+                  <property role="3oM_SC" value="put" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVPMvy" role="1PaTwD">
+                  <property role="3oM_SC" value="in" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVPMvH" role="1PaTwD">
+                  <property role="3oM_SC" value="cache" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="1GfgNpVTHe8" role="3cqZAp">
+              <node concept="37vLTI" id="1GfgNpVTJiZ" role="3clFbG">
+                <node concept="2YIFZM" id="1GfgNpVTMtU" role="37vLTx">
+                  <ref role="37wK5l" to="33ny:~Optional.ofNullable(java.lang.Object)" resolve="ofNullable" />
+                  <ref role="1Pybhc" to="33ny:~Optional" resolve="Optional" />
+                  <node concept="1rXfSq" id="1GfgNpVJAd4" role="37wK5m">
+                    <ref role="37wK5l" node="6SZYYyyjxld" resolve="getDocumentationAux" />
+                    <node concept="37vLTw" id="1GfgNpVJAd5" role="37wK5m">
+                      <ref role="3cqZAo" node="2DFA9RLl8eW" resolve="repository" />
+                    </node>
+                    <node concept="37vLTw" id="1GfgNpVJAd6" role="37wK5m">
+                      <ref role="3cqZAo" node="2DFA9RLl8eY" resolve="concept" />
+                    </node>
+                    <node concept="37vLTw" id="1GfgNpVJAd7" role="37wK5m">
+                      <ref role="3cqZAo" node="2DFA9RLl8f0" resolve="property" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="1GfgNpVTHe6" role="37vLTJ">
+                  <ref role="3cqZAo" node="1GfgNpVOgQj" resolve="result" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="1GfgNpVQkXj" role="3cqZAp">
+              <node concept="2OqwBi" id="1GfgNpVQlWR" role="3clFbG">
+                <node concept="37vLTw" id="1GfgNpVQkXh" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2DFA9RLkOfY" resolve="cache" />
+                </node>
+                <node concept="liA8E" id="1GfgNpVQoOd" role="2OqNvi">
+                  <ref role="37wK5l" to="sgh3:~Cache.put(java.lang.Object,java.lang.Object)" resolve="put" />
+                  <node concept="37vLTw" id="1GfgNpVQrcc" role="37wK5m">
+                    <ref role="3cqZAo" node="1GfgNpVOWOT" resolve="key" />
+                  </node>
+                  <node concept="37vLTw" id="1GfgNpVQus6" role="37wK5m">
+                    <ref role="3cqZAo" node="1GfgNpVOgQj" resolve="result" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="22lmx$" id="1GfgNpVPzFC" role="3clFbw">
+            <node concept="3fqX7Q" id="1GfgNpVPEOh" role="3uHU7w">
+              <node concept="1rXfSq" id="1GfgNpVPEOj" role="3fr31v">
+                <ref role="37wK5l" node="1GfgNpVOJDd" resolve="isValidCacheEntry" />
+                <node concept="37vLTw" id="1GfgNpVPEOk" role="37wK5m">
+                  <ref role="3cqZAo" node="1GfgNpVOgQj" resolve="result" />
+                </node>
+                <node concept="37vLTw" id="1GfgNpVPJH2" role="37wK5m">
+                  <ref role="3cqZAo" node="2DFA9RLl8eY" resolve="concept" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbC" id="1GfgNpVOvzR" role="3uHU7B">
+              <node concept="37vLTw" id="1GfgNpVOogB" role="3uHU7B">
+                <ref role="3cqZAo" node="1GfgNpVOgQj" resolve="result" />
+              </node>
+              <node concept="10Nm6u" id="1GfgNpVOy4V" role="3uHU7w" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="2DFA9RLm80f" role="3cqZAp">
+          <node concept="3K4zz7" id="1GfgNpVU38f" role="3cqZAk">
+            <node concept="10Nm6u" id="1GfgNpVU5lp" role="3K4E3e" />
+            <node concept="2OqwBi" id="1GfgNpVU855" role="3K4GZi">
+              <node concept="37vLTw" id="1GfgNpVU7bL" role="2Oq$k0">
+                <ref role="3cqZAo" node="1GfgNpVOgQj" resolve="result" />
+              </node>
+              <node concept="liA8E" id="1GfgNpVUaFu" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="1GfgNpVTYqb" role="3K4Cdx">
+              <node concept="37vLTw" id="2DFA9RLopLZ" role="2Oq$k0">
+                <ref role="3cqZAo" node="1GfgNpVOgQj" resolve="result" />
+              </node>
+              <node concept="liA8E" id="1GfgNpVU10l" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Optional.isEmpty()" resolve="isEmpty" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="2DFA9RLl8eW" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="2DFA9RLl8eX" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2DFA9RLl8eY" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3bZ5Sz" id="2DFA9RLl8eZ" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2DFA9RLl8f0" role="3clF46">
+        <property role="TrG5h" value="property" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="2DFA9RLl8f1" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="1GfgNpVQCUH" role="3clF45" />
+      <node concept="3Tm6S6" id="2DFA9RLl3tL" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="1GfgNpVOAuV" role="jymVt" />
+    <node concept="2YIFZL" id="1GfgNpVOJDd" role="jymVt">
+      <property role="TrG5h" value="isValidCacheEntry" />
+      <node concept="3clFbS" id="1GfgNpVOJDg" role="3clF47">
+        <node concept="3clFbJ" id="1GfgNpVSW9M" role="3cqZAp">
+          <node concept="3clFbS" id="1GfgNpVSW9O" role="3clFbx">
+            <node concept="3SKdUt" id="1GfgNpVT6j_" role="3cqZAp">
+              <node concept="1PaTwC" id="1GfgNpVT6jA" role="1aUNEU">
+                <node concept="3oM_SD" id="1GfgNpVT6jF" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT6jH" role="1PaTwD">
+                  <property role="3oM_SC" value="cache" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8xX" role="1PaTwD">
+                  <property role="3oM_SC" value="entry" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8y1" role="1PaTwD">
+                  <property role="3oM_SC" value="is" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8ym" role="1PaTwD">
+                  <property role="3oM_SC" value="&quot;no" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8y$" role="1PaTwD">
+                  <property role="3oM_SC" value="documentation" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8z3" role="1PaTwD">
+                  <property role="3oM_SC" value="node&quot;," />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8zr" role="1PaTwD">
+                  <property role="3oM_SC" value="we" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8z$" role="1PaTwD">
+                  <property role="3oM_SC" value="cannot" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8zI" role="1PaTwD">
+                  <property role="3oM_SC" value="check" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8zT" role="1PaTwD">
+                  <property role="3oM_SC" value="if" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8$5" role="1PaTwD">
+                  <property role="3oM_SC" value="this" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8$q" role="1PaTwD">
+                  <property role="3oM_SC" value="is" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8$C" role="1PaTwD">
+                  <property role="3oM_SC" value="still" />
+                </node>
+                <node concept="3oM_SD" id="1GfgNpVT8$Z" role="1PaTwD">
+                  <property role="3oM_SC" value="valid" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="1GfgNpVTi9V" role="3cqZAp">
+              <node concept="3clFbT" id="1GfgNpVTkrG" role="3cqZAk">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="1GfgNpVT0NV" role="3clFbw">
+            <node concept="37vLTw" id="1GfgNpVSYpO" role="2Oq$k0">
+              <ref role="3cqZAo" node="1GfgNpVP5_n" resolve="docNode" />
+            </node>
+            <node concept="liA8E" id="1GfgNpVT42U" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Optional.isEmpty()" resolve="isEmpty" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="1GfgNpVTmEL" role="9aQIa">
+            <node concept="3clFbS" id="1GfgNpVTmEM" role="9aQI4">
+              <node concept="3SKdUt" id="1GfgNpVVApW" role="3cqZAp">
+                <node concept="1PaTwC" id="1GfgNpVVApX" role="1aUNEU">
+                  <node concept="3oM_SD" id="1GfgNpVVBae" role="1PaTwD">
+                    <property role="3oM_SC" value="this" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVBag" role="1PaTwD">
+                    <property role="3oM_SC" value="will" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVBaj" role="1PaTwD">
+                    <property role="3oM_SC" value="check" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVBan" role="1PaTwD">
+                    <property role="3oM_SC" value="two" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVBas" role="1PaTwD">
+                    <property role="3oM_SC" value="properties:" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3SKdUt" id="1GfgNpVVBW8" role="3cqZAp">
+                <node concept="1PaTwC" id="1GfgNpVVBW9" role="1aUNEU">
+                  <node concept="3oM_SD" id="1GfgNpVVCG1" role="1PaTwD">
+                    <property role="3oM_SC" value="1." />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVCG3" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVCG6" role="1PaTwD">
+                    <property role="3oM_SC" value="docNode" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVCGa" role="1PaTwD">
+                    <property role="3oM_SC" value="must" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVCGf" role="1PaTwD">
+                    <property role="3oM_SC" value="have" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVCGl" role="1PaTwD">
+                    <property role="3oM_SC" value="a" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVCGs" role="1PaTwD">
+                    <property role="3oM_SC" value="documentation" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVCG$" role="1PaTwD">
+                    <property role="3oM_SC" value="annotation" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3SKdUt" id="1GfgNpVVDv1" role="3cqZAp">
+                <node concept="1PaTwC" id="1GfgNpVVDv2" role="1aUNEU">
+                  <node concept="3oM_SD" id="1GfgNpVVEah" role="1PaTwD">
+                    <property role="3oM_SC" value="2." />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVEaj" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVEam" role="1PaTwD">
+                    <property role="3oM_SC" value="annotation" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVEaq" role="1PaTwD">
+                    <property role="3oM_SC" value="must" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVEaG" role="1PaTwD">
+                    <property role="3oM_SC" value="match" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVEaM" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVELI" role="1PaTwD">
+                    <property role="3oM_SC" value="concept" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVELQ" role="1PaTwD">
+                    <property role="3oM_SC" value="we" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVELZ" role="1PaTwD">
+                    <property role="3oM_SC" value="are" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVEM9" role="1PaTwD">
+                    <property role="3oM_SC" value="looking" />
+                  </node>
+                  <node concept="3oM_SD" id="1GfgNpVVEMk" role="1PaTwD">
+                    <property role="3oM_SC" value="for" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="1GfgNpVP7E7" role="3cqZAp">
+                <node concept="3cpWsn" id="1GfgNpVP7E8" role="3cpWs9">
+                  <property role="TrG5h" value="dca" />
+                  <node concept="3Tqbb2" id="1GfgNpVP7E9" role="1tU5fm">
+                    <ref role="ehGHo" to="748g:UK_oBp_UIu" resolve="DocumentedConceptAnnotation" />
+                  </node>
+                  <node concept="1rXfSq" id="1GfgNpVP7Ea" role="33vP2m">
+                    <ref role="37wK5l" node="1GfgNpVL_IS" resolve="getAnnotation" />
+                    <node concept="2OqwBi" id="1GfgNpVTsAN" role="37wK5m">
+                      <node concept="37vLTw" id="1GfgNpVP7Ec" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1GfgNpVP5_n" resolve="docNode" />
+                      </node>
+                      <node concept="liA8E" id="1GfgNpVTvnR" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="1GfgNpVTCIa" role="3cqZAp">
+                <node concept="1Wc70l" id="1GfgNpVTCIc" role="3cqZAk">
+                  <node concept="2OqwBi" id="1GfgNpVTCId" role="3uHU7B">
+                    <node concept="37vLTw" id="1GfgNpVTCIe" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1GfgNpVP7E8" resolve="dca" />
+                    </node>
+                    <node concept="3x8VRR" id="1GfgNpVTCIf" role="2OqNvi" />
+                  </node>
+                  <node concept="17R0WA" id="1GfgNpVTCIg" role="3uHU7w">
+                    <node concept="2OqwBi" id="1GfgNpVTCIh" role="3uHU7B">
+                      <node concept="37vLTw" id="1GfgNpVTCIi" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1GfgNpVP7E8" resolve="dca" />
+                      </node>
+                      <node concept="3TrEf2" id="1GfgNpVTCIj" role="2OqNvi">
+                        <ref role="3Tt5mk" to="748g:UK_oBpA4EG" resolve="concept" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="1GfgNpVTCIk" role="3uHU7w">
+                      <node concept="37vLTw" id="1GfgNpVTCIl" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1GfgNpVPv6W" resolve="concept" />
+                      </node>
+                      <node concept="FGMqu" id="1GfgNpVTCIm" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="1GfgNpVOFQc" role="1B3o_S" />
+      <node concept="10P_77" id="1GfgNpVOJoR" role="3clF45" />
+      <node concept="37vLTG" id="1GfgNpVP5_n" role="3clF46">
+        <property role="TrG5h" value="docNode" />
+        <node concept="3uibUv" id="1GfgNpVSPqZ" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+          <node concept="3Tqbb2" id="1GfgNpVSRGV" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1GfgNpVPv6W" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <node concept="3bZ5Sz" id="1GfgNpVPvy4" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="1o6EjwiUgZA" role="3clF46">
-        <property role="TrG5h" value="property" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="qmep2m01fl" role="1tU5fm">
-          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+      <node concept="P$JXv" id="1GfgNpVVulo" role="lGtFl">
+        <node concept="TZ5HA" id="1GfgNpVVulp" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVulq" role="1dT_Ay">
+            <property role="1dT_AB" value="Check if a given cache entry (i.e., a documentation node) is still valid." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVVv__" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVv_A" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVVwkw" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVwkx" role="1dT_Ay">
+            <property role="1dT_AB" value="If the documentation annotation has been moved to a different location or " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVVwNB" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVwNC" role="1dT_Ay">
+            <property role="1dT_AB" value="the documented concept has been changed, this will be detected here." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVVxxJ" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVxxK" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVVyfT" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVyfU" role="1dT_Ay">
+            <property role="1dT_AB" value="Note: If the cache stores the information that there is no documentation node" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVVyY5" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVyY6" role="1dT_Ay">
+            <property role="1dT_AB" value="for a given concept, this cannot be checked here. Thus, if a documentation annotation" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVVzGj" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVzGk" role="1dT_Ay">
+            <property role="1dT_AB" value="is being added after this null-entry has been stored in the cache, only reloading all" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1GfgNpVV$qz" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVV$q$" role="1dT_Ay">
+            <property role="1dT_AB" value="classes or restarting MPS will fix this." />
+          </node>
         </node>
       </node>
-      <node concept="3Tqbb2" id="tBHOvWez_9" role="3clF45" />
-      <node concept="3Tm1VV" id="tBHOvWexSI" role="1B3o_S" />
-      <node concept="3clFbS" id="tBHOvWexSJ" role="3clF47" />
-    </node>
-    <node concept="3Tm1VV" id="tBHOvWexRa" role="1B3o_S" />
-    <node concept="3uibUv" id="5NpY9mnsaJ9" role="3HQHJm">
-      <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
     </node>
-    <node concept="2tJIrI" id="qmep2m01hn" role="jymVt" />
-  </node>
-  <node concept="312cEu" id="qh7UMGioaa">
-    <property role="TrG5h" value="DocumentationAspectHelper" />
-    <node concept="2tJIrI" id="qh7UMGip8X" role="jymVt" />
+    <node concept="2tJIrI" id="2DFA9RLm9pV" role="jymVt" />
     <node concept="2YIFZL" id="qh7UMGipbd" role="jymVt">
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="getDocumentation" />
+      <property role="TrG5h" value="getDocumentationOld" />
       <node concept="3clFbS" id="qh7UMGipbg" role="3clF47">
+        <node concept="3clFbF" id="6SZYYyyjXH9" role="3cqZAp">
+          <node concept="1rXfSq" id="6SZYYyyjXH8" role="3clFbG">
+            <ref role="37wK5l" node="6SZYYyyjxld" resolve="getDocumentationAux" />
+            <node concept="37vLTw" id="6SZYYyyjYxX" role="37wK5m">
+              <ref role="3cqZAo" node="qh7UMGiq55" resolve="repository" />
+            </node>
+            <node concept="37vLTw" id="6SZYYyyjZtd" role="37wK5m">
+              <ref role="3cqZAo" node="qh7UMGipdd" resolve="concept" />
+            </node>
+            <node concept="37vLTw" id="6SZYYyyk0Q3" role="37wK5m">
+              <ref role="3cqZAo" node="1o6EjwiUgm7" resolve="property" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="qh7UMGip9e" role="1B3o_S" />
+      <node concept="37vLTG" id="qh7UMGiq55" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="qh7UMGiqr7" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="qh7UMGipdd" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3bZ5Sz" id="qh7UMGipdc" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1o6EjwiUgm7" role="3clF46">
+        <property role="TrG5h" value="property" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="qmep2lZQkS" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="qh7UMGiC3j" role="3clF45" />
+      <node concept="P$JXv" id="qh7UMGiEZg" role="lGtFl">
+        <node concept="TZ5HI" id="1XKxHZsW5vn" role="3nqlJM">
+          <node concept="TZ5HA" id="1XKxHZsW5vo" role="3HnX3l">
+            <node concept="1dT_AC" id="1XKxHZsW7gh" role="1dT_Ay">
+              <property role="1dT_AB" value="Use getDocumentation(node) instead." />
+            </node>
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1XKxHZsULOU" role="TZ5H$">
+          <node concept="1dT_AC" id="1XKxHZsULOV" role="1dT_Ay">
+            <property role="1dT_AB" value="This method does not handle the override-child logic, so it is deprecated now and will be deleted." />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1XKxHZsW5vp" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6SZYYyyjrZw" role="jymVt" />
+    <node concept="2YIFZL" id="6SZYYyyjxld" role="jymVt">
+      <property role="TrG5h" value="getDocumentationAux" />
+      <node concept="37vLTG" id="6SZYYyyjzc5" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="6SZYYyyjzc6" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6SZYYyyjzc7" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3bZ5Sz" id="6SZYYyyjzc8" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6SZYYyyjzc9" role="3clF46">
+        <property role="TrG5h" value="property" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="6SZYYyyjzca" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="6SZYYyyjxlg" role="3clF47">
         <node concept="3cpWs8" id="69s3uhHTelK" role="3cqZAp">
           <node concept="3cpWsn" id="69s3uhHTelL" role="3cpWs9">
             <property role="TrG5h" value="language" />
@@ -352,14 +1674,14 @@
                 <ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
                 <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository)" resolve="getInstance" />
                 <node concept="37vLTw" id="qh7UMGiqvd" role="37wK5m">
-                  <ref role="3cqZAo" node="qh7UMGiq55" resolve="repository" />
+                  <ref role="3cqZAo" node="6SZYYyyjzc5" resolve="repository" />
                 </node>
               </node>
               <node concept="liA8E" id="69s3uhHTelR" role="2OqNvi">
                 <ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage)" resolve="getLanguage" />
                 <node concept="2OqwBi" id="69s3uhHTelS" role="37wK5m">
                   <node concept="37vLTw" id="69s3uhHTelT" role="2Oq$k0">
-                    <ref role="3cqZAo" node="qh7UMGipdd" resolve="concept" />
+                    <ref role="3cqZAo" node="6SZYYyyjzc7" resolve="concept" />
                   </node>
                   <node concept="liA8E" id="69s3uhHTelU" role="2OqNvi">
                     <ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage()" resolve="getLanguage" />
@@ -458,10 +1780,10 @@
                       <node concept="liA8E" id="qh7UMGiCwz" role="2OqNvi">
                         <ref role="37wK5l" node="tBHOvWexSF" resolve="getDocumentation" />
                         <node concept="37vLTw" id="qh7UMGiCw$" role="37wK5m">
-                          <ref role="3cqZAo" node="qh7UMGipdd" resolve="concept" />
+                          <ref role="3cqZAo" node="6SZYYyyjzc7" resolve="concept" />
                         </node>
                         <node concept="37vLTw" id="1o6EjwiUha5" role="37wK5m">
-                          <ref role="3cqZAo" node="1o6EjwiUgm7" resolve="property" />
+                          <ref role="3cqZAo" node="6SZYYyyjzc9" resolve="property" />
                         </node>
                       </node>
                     </node>
@@ -492,6 +1814,7 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="6SZYYyyk9Vl" role="3cqZAp" />
         <node concept="3SKdUt" id="3G5jYxl6xlj" role="3cqZAp">
           <node concept="1PaTwC" id="3G5jYxl6xlk" role="1aUNEU">
             <node concept="3oM_SD" id="3G5jYxl6xKt" role="1PaTwD">
@@ -523,13 +1846,13 @@
             <node concept="1rXfSq" id="4LTL3HuDl4F" role="33vP2m">
               <ref role="37wK5l" node="4LTL3HuCZ4$" resolve="findSolutionDoc" />
               <node concept="37vLTw" id="4LTL3HuDmhv" role="37wK5m">
-                <ref role="3cqZAo" node="qh7UMGiq55" resolve="repository" />
+                <ref role="3cqZAo" node="6SZYYyyjzc5" resolve="repository" />
               </node>
               <node concept="37vLTw" id="4LTL3HuDoDG" role="37wK5m">
-                <ref role="3cqZAo" node="qh7UMGipdd" resolve="concept" />
+                <ref role="3cqZAo" node="6SZYYyyjzc7" resolve="concept" />
               </node>
               <node concept="37vLTw" id="4LTL3HuDqbT" role="37wK5m">
-                <ref role="3cqZAo" node="1o6EjwiUgm7" resolve="property" />
+                <ref role="3cqZAo" node="6SZYYyyjzc9" resolve="property" />
               </node>
             </node>
           </node>
@@ -623,28 +1946,9 @@
           <node concept="10Nm6u" id="qh7UMGiy1a" role="3cqZAk" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="qh7UMGip9e" role="1B3o_S" />
-      <node concept="37vLTG" id="qh7UMGiq55" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="qh7UMGiqr7" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="qh7UMGipdd" role="3clF46">
-        <property role="TrG5h" value="concept" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3bZ5Sz" id="qh7UMGipdc" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1o6EjwiUgm7" role="3clF46">
-        <property role="TrG5h" value="property" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="qmep2lZQkS" role="1tU5fm">
-          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="qh7UMGiC3j" role="3clF45" />
-      <node concept="P$JXv" id="qh7UMGiEZg" role="lGtFl">
+      <node concept="3Tm6S6" id="6SZYYyyjv4p" role="1B3o_S" />
+      <node concept="3Tqbb2" id="6SZYYyyjTF4" role="3clF45" />
+      <node concept="P$JXv" id="6SZYYyyk1_w" role="lGtFl">
         <node concept="TZ5HA" id="qh7UMGiEZh" role="TZ5H$">
           <node concept="1dT_AC" id="qh7UMGiEZi" role="1dT_Ay">
             <property role="1dT_AB" value="Retrieves the documentation node for the given concept by searching first in the documentation aspect of the concept " />
@@ -657,13 +1961,12 @@
         </node>
         <node concept="TZ5HA" id="7ts$qmyJV5D" role="TZ5H$">
           <node concept="1dT_AC" id="7ts$qmyJV5E" role="1dT_Ay">
-            <property role="1dT_AB" value="solution that depends on the concepts language." />
+            <property role="1dT_AB" value="solution that depends on the concept's language." />
           </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2NM$qy7XpEN" role="jymVt" />
-    <node concept="2tJIrI" id="7ts$qmyJVIT" role="jymVt" />
     <node concept="2YIFZL" id="4LTL3HuCZ4$" role="jymVt">
       <property role="TrG5h" value="findSolutionDoc" />
       <node concept="37vLTG" id="4LTL3HuD1h_" role="3clF46">
@@ -878,7 +2181,7 @@
         </node>
         <node concept="TZ5HA" id="7ts$qmyJXRg" role="TZ5H$">
           <node concept="1dT_AC" id="7ts$qmyJXRh" role="1dT_Ay">
-            <property role="1dT_AB" value="language of the concept" />
+            <property role="1dT_AB" value="language of the concept." />
           </node>
         </node>
       </node>
@@ -1613,23 +2916,6 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="1T8cMxCS4TB" role="3cqZAp">
-          <node concept="3cpWsn" id="1T8cMxCS4TC" role="3cpWs9">
-            <property role="TrG5h" value="configuration" />
-            <node concept="3uibUv" id="1T8cMxCS52W" role="1tU5fm">
-              <ref role="3uigEE" to="pgte:1T8cMxCROto" resolve="IDocumentationAspectConfiguration" />
-            </node>
-            <node concept="2OqwBi" id="1T8cMxCS4TD" role="33vP2m">
-              <node concept="2OqwBi" id="1T8cMxCS4TE" role="2Oq$k0">
-                <node concept="2O5UvJ" id="1T8cMxCS4TF" role="2Oq$k0">
-                  <ref role="2O5UnU" to="pgte:1T8cMxCROk6" resolve="documentationAspectConfiguration" />
-                </node>
-                <node concept="SfwO_" id="1T8cMxCS4TG" role="2OqNvi" />
-              </node>
-              <node concept="1uHKPH" id="1T8cMxCS4TH" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbJ" id="qmep2m2liy" role="3cqZAp">
           <node concept="3clFbS" id="qmep2m2liz" role="3clFbx">
             <node concept="3cpWs8" id="68WEpgCynYz" role="3cqZAp">
@@ -1641,41 +2927,54 @@
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="1T8cMxCSdU9" role="3cqZAp">
-              <node concept="3cpWsn" id="1T8cMxCSdUc" role="3cpWs9">
-                <property role="TrG5h" value="showReferenceConceptDocumentation" />
-                <node concept="10P_77" id="1T8cMxCSdU7" role="1tU5fm" />
-                <node concept="3K4zz7" id="1T8cMxCSeJU" role="33vP2m">
-                  <node concept="2OqwBi" id="1T8cMxCSf2K" role="3K4E3e">
-                    <node concept="37vLTw" id="1T8cMxCSeTm" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1T8cMxCS4TC" resolve="configuration" />
+            <node concept="3clFbJ" id="68WEpgCyVT8" role="3cqZAp">
+              <node concept="3clFbS" id="68WEpgCyVTa" role="3clFbx">
+                <node concept="3SKdUt" id="2z92rvRpYFL" role="3cqZAp">
+                  <node concept="1PaTwC" id="2z92rvRpYFM" role="1aUNEU">
+                    <node concept="3oM_SD" id="2z92rvRpZTC" role="1PaTwD">
+                      <property role="3oM_SC" value="don't" />
                     </node>
-                    <node concept="liA8E" id="1T8cMxCSfiw" role="2OqNvi">
-                      <ref role="37wK5l" to="pgte:1T8cMxCROxk" resolve="showReferenceConceptDocumentation" />
+                    <node concept="3oM_SD" id="2z92rvRpZ2o" role="1PaTwD">
+                      <property role="3oM_SC" value="follow" />
                     </node>
-                  </node>
-                  <node concept="3clFbT" id="1T8cMxCSfsf" role="3K4GZi" />
-                  <node concept="3y3z36" id="1T8cMxCSe_$" role="3K4Cdx">
-                    <node concept="10Nm6u" id="1T8cMxCSeAA" role="3uHU7w" />
-                    <node concept="37vLTw" id="1T8cMxCSeka" role="3uHU7B">
-                      <ref role="3cqZAo" node="1T8cMxCS4TC" resolve="configuration" />
+                    <node concept="3oM_SD" id="2z92rvRpZ2v" role="1PaTwD">
+                      <property role="3oM_SC" value="the" />
                     </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="68WEpgCyVT8" role="3cqZAp">
-              <node concept="3clFbS" id="68WEpgCyVTa" role="3clFbx">
-                <node concept="3cpWs8" id="11K_5nNfofq" role="3cqZAp">
-                  <node concept="3cpWsn" id="11K_5nNfofr" role="3cpWs9">
-                    <property role="TrG5h" value="concept" />
-                    <property role="3TUv4t" value="true" />
-                    <node concept="3bZ5Sz" id="11K_5nNfofs" role="1tU5fm" />
-                    <node concept="2OqwBi" id="11K_5nNfoft" role="33vP2m">
-                      <node concept="2yIwOk" id="11K_5nNfofv" role="2OqNvi" />
-                      <node concept="37vLTw" id="68WEpgC$QwK" role="2Oq$k0">
-                        <ref role="3cqZAo" node="68WEpgCynYA" resolve="n" />
-                      </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ2C" role="1PaTwD">
+                      <property role="3oM_SC" value="reference" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ2N" role="1PaTwD">
+                      <property role="3oM_SC" value="at" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ30" role="1PaTwD">
+                      <property role="3oM_SC" value="the" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZUh" role="1PaTwD">
+                      <property role="3oM_SC" value="cursor," />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ3N" role="1PaTwD">
+                      <property role="3oM_SC" value="but" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ48" role="1PaTwD">
+                      <property role="3oM_SC" value="show" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ7j" role="1PaTwD">
+                      <property role="3oM_SC" value="documentation" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZSX" role="1PaTwD">
+                      <property role="3oM_SC" value="for" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ5j" role="1PaTwD">
+                      <property role="3oM_SC" value="the" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ5K" role="1PaTwD">
+                      <property role="3oM_SC" value="reference" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ6f" role="1PaTwD">
+                      <property role="3oM_SC" value="node" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRpZ6K" role="1PaTwD">
+                      <property role="3oM_SC" value="itself" />
                     </node>
                   </node>
                 </node>
@@ -1684,26 +2983,25 @@
                     <property role="3TUv4t" value="true" />
                     <property role="TrG5h" value="conceptDoc" />
                     <node concept="3Tqbb2" id="11K_5nNfog1" role="1tU5fm" />
-                    <node concept="2YIFZM" id="11K_5nNfog2" role="33vP2m">
-                      <ref role="1Pybhc" node="qh7UMGioaa" resolve="DocumentationAspectHelper" />
-                      <ref role="37wK5l" node="qh7UMGipbd" resolve="getDocumentation" />
-                      <node concept="2OqwBi" id="68WEpgC$SOA" role="37wK5m">
-                        <node concept="2JrnkZ" id="68WEpgC$SzH" role="2Oq$k0">
-                          <node concept="2OqwBi" id="68WEpgC$R2J" role="2JrQYb">
-                            <node concept="37vLTw" id="68WEpgC$QPo" role="2Oq$k0">
+                    <node concept="1rXfSq" id="1GfgNpVXlZA" role="33vP2m">
+                      <ref role="37wK5l" node="1XKxHZsSs$9" resolve="getDocumentation" />
+                      <node concept="2OqwBi" id="1GfgNpVXlsH" role="37wK5m">
+                        <node concept="2JrnkZ" id="1GfgNpVXlsI" role="2Oq$k0">
+                          <node concept="2OqwBi" id="1GfgNpVXlsJ" role="2JrQYb">
+                            <node concept="37vLTw" id="1GfgNpVXlsK" role="2Oq$k0">
                               <ref role="3cqZAo" node="68WEpgCynYA" resolve="n" />
                             </node>
-                            <node concept="I4A8Y" id="68WEpgC$Rpw" role="2OqNvi" />
+                            <node concept="I4A8Y" id="1GfgNpVXlsL" role="2OqNvi" />
                           </node>
                         </node>
-                        <node concept="liA8E" id="68WEpgC$Tbc" role="2OqNvi">
+                        <node concept="liA8E" id="1GfgNpVXlsM" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="11K_5nNfog8" role="37wK5m">
-                        <ref role="3cqZAo" node="11K_5nNfofr" resolve="concept" />
+                      <node concept="37vLTw" id="1GfgNpVXlsN" role="37wK5m">
+                        <ref role="3cqZAo" node="68WEpgCynYA" resolve="n" />
                       </node>
-                      <node concept="10Nm6u" id="68WEpgC$TpF" role="37wK5m" />
+                      <node concept="10Nm6u" id="1GfgNpVXlsO" role="37wK5m" />
                     </node>
                   </node>
                 </node>
@@ -1722,9 +3020,111 @@
                     <node concept="3x8VRR" id="68WEpgCyr0h" role="2OqNvi" />
                   </node>
                 </node>
+                <node concept="3SKdUt" id="2z92rvRq0nG" role="3cqZAp">
+                  <node concept="1PaTwC" id="2z92rvRq0nH" role="1aUNEU">
+                    <node concept="3oM_SD" id="2z92rvRq0IH" role="1PaTwD">
+                      <property role="3oM_SC" value="if" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRq0IK" role="1PaTwD">
+                      <property role="3oM_SC" value="the" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRq0IP" role="1PaTwD">
+                      <property role="3oM_SC" value="reference" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRq0IW" role="1PaTwD">
+                      <property role="3oM_SC" value="concept" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRq0J5" role="1PaTwD">
+                      <property role="3oM_SC" value="doesn't" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRq0Jg" role="1PaTwD">
+                      <property role="3oM_SC" value="have" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRq0Jt" role="1PaTwD">
+                      <property role="3oM_SC" value="a" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRq0JG" role="1PaTwD">
+                      <property role="3oM_SC" value="documentation" />
+                    </node>
+                    <node concept="3oM_SD" id="2z92rvRq0JX" role="1PaTwD">
+                      <property role="3oM_SC" value="annotation," />
+                    </node>
+                    <node concept="3oM_SD" id="6SZYYyyj62L" role="1PaTwD">
+                      <property role="3oM_SC" value="fall" />
+                    </node>
+                    <node concept="3oM_SD" id="6SZYYyyj63c" role="1PaTwD">
+                      <property role="3oM_SC" value="through" />
+                    </node>
+                    <node concept="3oM_SD" id="6SZYYyyj63C" role="1PaTwD">
+                      <property role="3oM_SC" value="and" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3SKdUt" id="6SZYYyyj6ue" role="3cqZAp">
+                  <node concept="1PaTwC" id="6SZYYyyj6uf" role="1aUNEU">
+                    <node concept="3oM_SD" id="6SZYYyyj6Py" role="1PaTwD">
+                      <property role="3oM_SC" value="show" />
+                    </node>
+                    <node concept="3oM_SD" id="6SZYYyyj6P$" role="1PaTwD">
+                      <property role="3oM_SC" value="the" />
+                    </node>
+                    <node concept="3oM_SD" id="6SZYYyyj6PB" role="1PaTwD">
+                      <property role="3oM_SC" value="target's" />
+                    </node>
+                    <node concept="3oM_SD" id="6SZYYyyj6PF" role="1PaTwD">
+                      <property role="3oM_SC" value="documentation" />
+                    </node>
+                    <node concept="3oM_SD" id="6SZYYyyj6PK" role="1PaTwD">
+                      <property role="3oM_SC" value="anyway" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="3qokpdXQLXn" role="3clFbw">
+                <node concept="1rXfSq" id="3qokpdXQLiQ" role="2Oq$k0">
+                  <ref role="37wK5l" node="5ut4bh9phV1" resolve="getConfig" />
+                </node>
+                <node concept="liA8E" id="3qokpdXQMvJ" role="2OqNvi">
+                  <ref role="37wK5l" to="pgte:1T8cMxCROxk" resolve="showReferenceConceptDocumentation" />
+                </node>
               </node>
-              <node concept="37vLTw" id="68WEpgCyWaa" role="3clFbw">
-                <ref role="3cqZAo" node="1T8cMxCSdUc" resolve="showReferenceConceptDocumentation" />
+            </node>
+            <node concept="3clFbH" id="6SZYYyyj1UO" role="3cqZAp" />
+            <node concept="3SKdUt" id="6SZYYyyj5hH" role="3cqZAp">
+              <node concept="1PaTwC" id="6SZYYyyj5Eg" role="1aUNEU">
+                <node concept="3oM_SD" id="6SZYYyyj5Eh" role="1PaTwD">
+                  <property role="3oM_SC" value="follow" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj60d" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj60o" role="1PaTwD">
+                  <property role="3oM_SC" value="reference" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj60s" role="1PaTwD">
+                  <property role="3oM_SC" value="and" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj60D" role="1PaTwD">
+                  <property role="3oM_SC" value="show" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj60J" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj60Y" role="1PaTwD">
+                  <property role="3oM_SC" value="documentation" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj61v" role="1PaTwD">
+                  <property role="3oM_SC" value="of" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj61L" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj624" role="1PaTwD">
+                  <property role="3oM_SC" value="target" />
+                </node>
+                <node concept="3oM_SD" id="6SZYYyyj61e" role="1PaTwD">
+                  <property role="3oM_SC" value="node" />
+                </node>
               </node>
             </node>
             <node concept="3cpWs8" id="qmep2m2li$" role="3cqZAp">
@@ -1801,6 +3201,117 @@
       </node>
       <node concept="3Tm1VV" id="qmep2m2lii" role="1B3o_S" />
     </node>
+    <node concept="2tJIrI" id="5ut4bh9p4ZU" role="jymVt" />
+    <node concept="2YIFZL" id="5ut4bh9phV1" role="jymVt">
+      <property role="TrG5h" value="config" />
+      <node concept="3clFbS" id="5ut4bh9pe2T" role="3clF47">
+        <node concept="3SKdUt" id="5ut4bh9qaqX" role="3cqZAp">
+          <node concept="1PaTwC" id="5ut4bh9qaqY" role="1aUNEU">
+            <node concept="3oM_SD" id="5ut4bh9qaMx" role="1PaTwD">
+              <property role="3oM_SC" value="one" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaMz" role="1PaTwD">
+              <property role="3oM_SC" value="day," />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaMA" role="1PaTwD">
+              <property role="3oM_SC" value="we" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaME" role="1PaTwD">
+              <property role="3oM_SC" value="might" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaMJ" role="1PaTwD">
+              <property role="3oM_SC" value="implement" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaMP" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaMW" role="1PaTwD">
+              <property role="3oM_SC" value="more" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaN4" role="1PaTwD">
+              <property role="3oM_SC" value="elaborated" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaNd" role="1PaTwD">
+              <property role="3oM_SC" value="scheme" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaNn" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaNy" role="1PaTwD">
+              <property role="3oM_SC" value="choosing" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaNI" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaNV" role="1PaTwD">
+              <property role="3oM_SC" value="proper" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaO9" role="1PaTwD">
+              <property role="3oM_SC" value="extension" />
+            </node>
+            <node concept="3oM_SD" id="5ut4bh9qaOo" role="1PaTwD">
+              <property role="3oM_SC" value="point" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2JMQ0Qq3aKr" role="3cqZAp">
+          <node concept="3cpWsn" id="2JMQ0Qq3aKs" role="3cpWs9">
+            <property role="TrG5h" value="extensions" />
+            <node concept="A3Dl8" id="2JMQ0Qq3aph" role="1tU5fm">
+              <node concept="3uibUv" id="2JMQ0Qq3apk" role="A3Ik2">
+                <ref role="3uigEE" to="pgte:1T8cMxCROto" resolve="IDocumentationAspectConfiguration" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2JMQ0Qq3aKt" role="33vP2m">
+              <node concept="2OqwBi" id="2JMQ0Qq3aKu" role="2Oq$k0">
+                <node concept="2O5UvJ" id="2JMQ0Qq3aKv" role="2Oq$k0">
+                  <ref role="2O5UnU" to="pgte:1T8cMxCROk6" resolve="documentationAspectConfiguration" />
+                </node>
+                <node concept="SfwO_" id="2JMQ0Qq3aKw" role="2OqNvi" />
+              </node>
+              <node concept="1KnU$U" id="2JMQ0Qq3aKx" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="5R9SlUlNz7o" role="3cqZAp">
+          <node concept="3cpWsn" id="5R9SlUlNz7p" role="3cpWs9">
+            <property role="TrG5h" value="config" />
+            <node concept="3uibUv" id="5R9SlUlNlA4" role="1tU5fm">
+              <ref role="3uigEE" to="pgte:1T8cMxCROto" resolve="IDocumentationAspectConfiguration" />
+            </node>
+            <node concept="2OqwBi" id="5R9SlUlNz7q" role="33vP2m">
+              <node concept="37vLTw" id="2JMQ0Qq3aKy" role="2Oq$k0">
+                <ref role="3cqZAo" node="2JMQ0Qq3aKs" resolve="seq" />
+              </node>
+              <node concept="1uHKPH" id="5R9SlUlNz7u" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="66zcVGDcgKP" role="3cqZAp">
+          <node concept="3K4zz7" id="66zcVGDchB3" role="3clFbG">
+            <node concept="37vLTw" id="66zcVGDcjNK" role="3K4E3e">
+              <ref role="3cqZAo" node="5R9SlUlNz7p" resolve="config" />
+            </node>
+            <node concept="3y3z36" id="66zcVGDcjbX" role="3K4Cdx">
+              <node concept="37vLTw" id="66zcVGDcgKN" role="3uHU7B">
+                <ref role="3cqZAo" node="5R9SlUlNz7p" resolve="config" />
+              </node>
+              <node concept="10Nm6u" id="66zcVGDciub" role="3uHU7w" />
+            </node>
+            <node concept="2ShNRf" id="3qokpdXQprP" role="3K4GZi">
+              <node concept="HV5vD" id="3qokpdXQE31" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="HV5vE" to="pgte:3qokpdXQc0N" resolve="DefaultDocAspectConfiguration" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="5ut4bh9pdQ7" role="3clF45">
+        <ref role="3uigEE" to="pgte:1T8cMxCROto" resolve="IDocumentationAspectConfiguration" />
+      </node>
+      <node concept="3Tm6S6" id="5ut4bh9pbJi" role="1B3o_S" />
+    </node>
     <node concept="2tJIrI" id="qmep2m2kBx" role="jymVt" />
     <node concept="2YIFZL" id="qmep2m2vvj" role="jymVt">
       <property role="TrG5h" value="getPropertyUnderCursor" />
@@ -1947,6 +3458,47 @@
       <node concept="3Tm1VV" id="qmep2m2viH" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="qmep2m2jLR" role="jymVt" />
+    <node concept="2YIFZL" id="1GfgNpVL_IS" role="jymVt">
+      <property role="TrG5h" value="getAnnotation" />
+      <node concept="3clFbS" id="1GfgNpVL_IV" role="3clF47">
+        <node concept="3clFbF" id="1GfgNpVMpKm" role="3cqZAp">
+          <node concept="2OqwBi" id="1GfgNpVMnEu" role="3clFbG">
+            <node concept="2OqwBi" id="1GfgNpVMi82" role="2Oq$k0">
+              <node concept="2OqwBi" id="1GfgNpVMi83" role="2Oq$k0">
+                <node concept="37vLTw" id="1GfgNpVMi84" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1GfgNpVMjPb" resolve="documentationNode" />
+                </node>
+                <node concept="3Tsc0h" id="1GfgNpVMi85" role="2OqNvi">
+                  <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
+                </node>
+              </node>
+              <node concept="v3k3i" id="1GfgNpVMi86" role="2OqNvi">
+                <node concept="chp4Y" id="1GfgNpVMi87" role="v3oSu">
+                  <ref role="cht4Q" to="748g:UK_oBp_UIu" resolve="DocumentedConceptAnnotation" />
+                </node>
+              </node>
+            </node>
+            <node concept="1uHKPH" id="1GfgNpVMoHw" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="1GfgNpVLy5A" role="1B3o_S" />
+      <node concept="3Tqbb2" id="1GfgNpVMr4y" role="3clF45">
+        <ref role="ehGHo" to="748g:UK_oBp_UIu" resolve="DocumentedConceptAnnotation" />
+      </node>
+      <node concept="37vLTG" id="1GfgNpVMjPb" role="3clF46">
+        <property role="TrG5h" value="documentationNode" />
+        <node concept="3Tqbb2" id="1GfgNpVMjPa" role="1tU5fm" />
+      </node>
+      <node concept="P$JXv" id="1GfgNpVVZTd" role="lGtFl">
+        <node concept="TZ5HA" id="1GfgNpVVZTe" role="TZ5H$">
+          <node concept="1dT_AC" id="1GfgNpVVZTf" role="1dT_Ay">
+            <property role="1dT_AB" value="Retrieve annotation for a given documentationNode (e.g., a section or an item)." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2DFA9RLkKeE" role="jymVt" />
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd
index af9bb6ecc6..7ffb96cfc8 100644
--- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd
+++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd
@@ -34,7 +34,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="1" />
     <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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
index 717a5d848d..2b2a50bcca 100644
--- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
+++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
@@ -15,7 +15,6 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
@@ -555,6 +554,13 @@
         <ref role="3uigEE" node="24MikXOfIA3" resolve="DocumentationHandler" />
       </node>
     </node>
+    <node concept="2BZ0e9" id="2uG4XYD$7kf" role="2uRRBA">
+      <property role="TrG5h" value="lastSelection" />
+      <node concept="3Tm6S6" id="2uG4XYD$7kg" role="1B3o_S" />
+      <node concept="3uibUv" id="2uG4XYD$oqA" role="1tU5fm">
+        <ref role="3uigEE" to="lwvz:~SingularSelection" resolve="SingularSelection" />
+      </node>
+    </node>
     <node concept="2uRRBT" id="5ucAXohL$xS" role="2uRRB$">
       <node concept="3clFbS" id="5ucAXohL$xT" role="2VODD2">
         <node concept="3clFbF" id="24MikXOgRxl" role="3cqZAp">
@@ -973,13 +979,6 @@
         </node>
       </node>
     </node>
-    <node concept="2BZ0e9" id="2uG4XYD$7kf" role="2uRRBA">
-      <property role="TrG5h" value="lastSelection" />
-      <node concept="3Tm6S6" id="2uG4XYD$7kg" role="1B3o_S" />
-      <node concept="3uibUv" id="2uG4XYD$oqA" role="1tU5fm">
-        <ref role="3uigEE" to="lwvz:~SingularSelection" resolve="SingularSelection" />
-      </node>
-    </node>
   </node>
   <node concept="2wDNrl" id="1KDc5EfHUF3">
     <property role="TrG5h" value="TabbedDocViewer" />
@@ -1212,11 +1211,8 @@
                 <node concept="2WthIp" id="18EYPZeyOxo" role="2Oq$k0" />
                 <node concept="2XshWL" id="18EYPZeyOxq" role="2OqNvi">
                   <ref role="2WH_rO" node="1CsE99tCRef" resolve="hasDoc" />
-                  <node concept="2OqwBi" id="18EYPZeyPth" role="2XxRq1">
-                    <node concept="37vLTw" id="18EYPZeyPmb" role="2Oq$k0">
-                      <ref role="3cqZAo" node="18EYPZeyMBy" resolve="selectedNode" />
-                    </node>
-                    <node concept="2yIwOk" id="18EYPZeyPEQ" role="2OqNvi" />
+                  <node concept="37vLTw" id="18EYPZeyPmb" role="2XxRq1">
+                    <ref role="3cqZAo" node="18EYPZeyMBy" resolve="selectedNode" />
                   </node>
                   <node concept="2EnYce" id="2MiGV0HSqeg" role="2XxRq1">
                     <node concept="2OqwBi" id="18EYPZeyQX4" role="2Oq$k0">
@@ -2877,19 +2873,19 @@
       <property role="TrG5h" value="hasDoc" />
       <node concept="10P_77" id="1CsE99tCSgo" role="3clF45" />
       <node concept="3clFbS" id="1CsE99tCReh" role="3clF47">
-        <node concept="3clFbF" id="1CsE99tCSkn" role="3cqZAp">
-          <node concept="3y3z36" id="1CsE99tCTcg" role="3clFbG">
-            <node concept="10Nm6u" id="1CsE99tCTjo" role="3uHU7w" />
-            <node concept="2YIFZM" id="1CsE99tCSmY" role="3uHU7B">
-              <ref role="37wK5l" to="ttl0:qh7UMGipbd" resolve="getDocumentation" />
+        <node concept="3clFbF" id="1GfgNpVWE9m" role="3cqZAp">
+          <node concept="3y3z36" id="1XKxHZsRYBC" role="3clFbG">
+            <node concept="10Nm6u" id="1XKxHZsRYBD" role="3uHU7w" />
+            <node concept="2YIFZM" id="1XKxHZsXFqa" role="3uHU7B">
               <ref role="1Pybhc" to="ttl0:qh7UMGioaa" resolve="DocumentationAspectHelper" />
-              <node concept="37vLTw" id="1CsE99tCSZI" role="37wK5m">
+              <ref role="37wK5l" to="ttl0:1XKxHZsSs$9" resolve="getDocumentation" />
+              <node concept="37vLTw" id="1XKxHZsXFqb" role="37wK5m">
                 <ref role="3cqZAo" node="1CsE99tCStE" resolve="repository" />
               </node>
-              <node concept="37vLTw" id="1CsE99tCT2W" role="37wK5m">
-                <ref role="3cqZAo" node="1CsE99tCSE2" resolve="concept" />
+              <node concept="37vLTw" id="1XKxHZsXFqc" role="37wK5m">
+                <ref role="3cqZAo" node="1CsE99tCSE2" resolve="selectedNode" />
               </node>
-              <node concept="10Nm6u" id="1CsE99tCT5T" role="37wK5m" />
+              <node concept="10Nm6u" id="1XKxHZsXFqd" role="37wK5m" />
             </node>
           </node>
         </node>
@@ -2897,8 +2893,8 @@
       <node concept="3Tm6S6" id="1CsE99tCScR" role="1B3o_S" />
       <node concept="37vLTG" id="1CsE99tCSE2" role="3clF46">
         <property role="3TUv4t" value="true" />
-        <property role="TrG5h" value="concept" />
-        <node concept="3bZ5Sz" id="1CsE99tCSQu" role="1tU5fm" />
+        <property role="TrG5h" value="selectedNode" />
+        <node concept="3Tqbb2" id="1XKxHZsXpPf" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="1CsE99tCStE" role="3clF46">
         <property role="3TUv4t" value="true" />
@@ -3230,16 +3226,15 @@
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs8" id="11K_5nNfofq" role="3cqZAp">
-                <node concept="3cpWsn" id="11K_5nNfofr" role="3cpWs9">
-                  <property role="TrG5h" value="concept" />
-                  <property role="3TUv4t" value="true" />
-                  <node concept="3bZ5Sz" id="11K_5nNfofs" role="1tU5fm" />
-                  <node concept="2OqwBi" id="11K_5nNfoft" role="33vP2m">
-                    <node concept="37vLTw" id="11K_5nNfofu" role="2Oq$k0">
+              <node concept="3cpWs8" id="1XKxHZsX96M" role="3cqZAp">
+                <node concept="3cpWsn" id="1XKxHZsX96N" role="3cpWs9">
+                  <property role="TrG5h" value="selectedConcept" />
+                  <node concept="3bZ5Sz" id="1XKxHZsX8GR" role="1tU5fm" />
+                  <node concept="2OqwBi" id="1XKxHZsX96O" role="33vP2m">
+                    <node concept="37vLTw" id="1XKxHZsX96P" role="2Oq$k0">
                       <ref role="3cqZAo" node="11K_5nNeQYb" resolve="selectedNode" />
                     </node>
-                    <node concept="2yIwOk" id="11K_5nNfofv" role="2OqNvi" />
+                    <node concept="2yIwOk" id="1XKxHZsX96Q" role="2OqNvi" />
                   </node>
                 </node>
               </node>
@@ -3248,24 +3243,24 @@
                   <property role="3TUv4t" value="true" />
                   <property role="TrG5h" value="conceptDoc" />
                   <node concept="3Tqbb2" id="11K_5nNfog1" role="1tU5fm" />
-                  <node concept="2YIFZM" id="11K_5nNfog2" role="33vP2m">
-                    <ref role="37wK5l" to="ttl0:qh7UMGipbd" resolve="getDocumentation" />
+                  <node concept="2YIFZM" id="1XKxHZsWWjn" role="33vP2m">
+                    <ref role="37wK5l" to="ttl0:1XKxHZsSs$9" resolve="getDocumentation" />
                     <ref role="1Pybhc" to="ttl0:qh7UMGioaa" resolve="DocumentationAspectHelper" />
-                    <node concept="2OqwBi" id="11K_5nNfog3" role="37wK5m">
-                      <node concept="2OqwBi" id="11K_5nNfog4" role="2Oq$k0">
-                        <node concept="2WthIp" id="11K_5nNfog5" role="2Oq$k0" />
-                        <node concept="2BZ7hE" id="11K_5nNfog6" role="2OqNvi">
+                    <node concept="2OqwBi" id="1XKxHZsWWjo" role="37wK5m">
+                      <node concept="2OqwBi" id="1XKxHZsWWjp" role="2Oq$k0">
+                        <node concept="2WthIp" id="1XKxHZsWWjq" role="2Oq$k0" />
+                        <node concept="2BZ7hE" id="1XKxHZsWWjr" role="2OqNvi">
                           <ref role="2WH_rO" node="1IUlN8Q4hs1" resolve="currentProject" />
                         </node>
                       </node>
-                      <node concept="liA8E" id="11K_5nNfog7" role="2OqNvi">
+                      <node concept="liA8E" id="1XKxHZsWWjs" role="2OqNvi">
                         <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
-                    <node concept="37vLTw" id="11K_5nNfog8" role="37wK5m">
-                      <ref role="3cqZAo" node="11K_5nNfofr" resolve="concept" />
+                    <node concept="37vLTw" id="1XKxHZsWWjt" role="37wK5m">
+                      <ref role="3cqZAo" node="11K_5nNeQYb" resolve="selectedNode" />
                     </node>
-                    <node concept="37vLTw" id="11K_5nNfog9" role="37wK5m">
+                    <node concept="37vLTw" id="1XKxHZsWWju" role="37wK5m">
                       <ref role="3cqZAo" node="11K_5nNeQYd" resolve="property" />
                     </node>
                   </node>
@@ -3354,7 +3349,7 @@
                             <ref role="37wK5l" to="xnls:~BaseIconManager.getIconFor(org.jetbrains.mps.openapi.model.SNode)" resolve="getIconFor" />
                             <node concept="2OqwBi" id="11K_5nNfofV" role="37wK5m">
                               <node concept="37vLTw" id="11K_5nNfofW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="11K_5nNfofr" resolve="concept" />
+                                <ref role="3cqZAo" node="1XKxHZsX96N" resolve="selectedConcept" />
                               </node>
                               <node concept="FGMqu" id="11K_5nNfofX" role="2OqNvi" />
                             </node>
@@ -3511,7 +3506,7 @@
                     <property role="3oM_SC" value="StackOverflow" />
                   </node>
                   <node concept="3oM_SD" id="4PCyu9RTWz_" role="1PaTwD">
-                    <property role="3oM_SC" value="happend." />
+                    <property role="3oM_SC" value="happened." />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml
index 3558bb6a49..b2932a27b4 100644
--- a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml
+++ b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml
@@ -6,6 +6,7 @@
       <modulePath path="$PROJECT_DIR$/devkits/com.mbeddr.commenting.devkit" folder="staging.margincell_review" />
       <modulePath path="$PROJECT_DIR$/devkits/com.mbeddr.mpsutil.guides/com.mbeddr.mpsutil.guides.devkit" folder="staging.editingGuide" />
       <modulePath path="$PROJECT_DIR$/languages/EcoreImporter_TestLanguage1/EcoreImporter_TestLanguage1.mpl" folder="testlanguages" />
+      <modulePath path="$PROJECT_DIR$/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl" folder="staging.comparator.demo" />
       <modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.actionsfilter/com.mbeddr.mpsutil.actionsfilter.mpl" folder="staging.actionsfilter" />
       <modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.asynccell.sandbox/com.mbeddr.mpsutil.asynccell.sandbox.mpl" folder="asynccell" />
       <modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl" folder="rest" />
@@ -109,6 +110,8 @@
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ccmenu.runtime/com.mbeddr.mpsutil.ccmenu.runtime.msd" folder="rest.ccmenu" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/com.mbeddr.mpsutil.ccmenu.sandbox.msd" folder="rest.ccmenu" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.common/com.mbeddr.mpsutil.common.msd" folder="staging" />
+      <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd" folder="staging.comparator.demo" />
+      <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd" folder="staging.comparator.demo" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.comparator/comparator.msd" folder="staging.comparator" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/com.mbeddr.mpsutil.compare.pattern.generator.runtime.msd" folder="staging.comparator" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/com.mbeddr.mpsutil.compare.pattern.runtime.msd" folder="staging.comparator" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl
new file mode 100644
index 0000000000..912737708d
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language namespace="com.mbeddr.demo.comparator.diff" uuid="e0989c7a-8149-4be7-97b6-0b78561af099" languageVersion="0" moduleVersion="0">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <accessoryModels />
+  <generators>
+    <generator alias="main" namespace="com.mbeddr.demo.comparator.diff.generator" uuid="03d01fc4-0150-47ac-8aad-110e89f7ad8a">
+      <models>
+        <modelRoot contentPath="${module}/generator" type="default">
+          <sourceRoot location="templates" />
+        </modelRoot>
+      </models>
+      <facets>
+        <facet type="java">
+          <classes generated="true" path="${module}/generator/classes_gen" />
+        </facet>
+      </facets>
+      <external-templates />
+      <languageVersions>
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l: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:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
+        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
+        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+      </languageVersions>
+      <dependencyVersions>
+        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="e0989c7a-8149-4be7-97b6-0b78561af099(com.mbeddr.demo.comparator.diff)" version="0" />
+        <module reference="03d01fc4-0150-47ac-8aad-110e89f7ad8a(com.mbeddr.demo.comparator.diff.generator)" version="0" />
+        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+      </dependencyVersions>
+      <mapping-priorities />
+    </generator>
+  </generators>
+  <sourcePath />
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l: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:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
+    <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
+    <language slang="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <language slang="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
+    <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="e0989c7a-8149-4be7-97b6-0b78561af099(com.mbeddr.demo.comparator.diff)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+  </dependencyVersions>
+  <extendedLanguages />
+</language>
+
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps
new file mode 100644
index 0000000000..97ecb348e5
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:3dffa0d4-fef9-4798-a50c-5d820015fd1b(com.mbeddr.demo.comparator.diff.generator.templates@generator)">
+  <persistence version="9" />
+  <languages>
+    <use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="0" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
+    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
+  </languages>
+  <imports>
+    <import index="mwpl" ref="r:8545687c-2198-4cf2-8952-38bfc2847928(com.mbeddr.demo.comparator.diff.structure)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+  </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="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>
+    </language>
+    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml">
+      <concept id="6666499814681515200" name="jetbrains.mps.core.xml.structure.XmlFile" flags="ng" index="2pMbU2">
+        <child id="6666499814681515201" name="document" index="2pMbU3" />
+      </concept>
+      <concept id="6666499814681415858" name="jetbrains.mps.core.xml.structure.XmlElement" flags="ng" index="2pNNFK">
+        <property id="6666499814681415862" name="tagName" index="2pNNFO" />
+        <child id="1622293396948928802" name="content" index="3o6s8t" />
+      </concept>
+      <concept id="1622293396948952339" name="jetbrains.mps.core.xml.structure.XmlText" flags="nn" index="3o6iSG">
+        <property id="1622293396948953704" name="value" index="3o6i5n" />
+      </concept>
+      <concept id="6786756355279841993" name="jetbrains.mps.core.xml.structure.XmlDocument" flags="ng" index="3rIKKV">
+        <child id="6666499814681299055" name="rootElement" index="2pNm8H" />
+      </concept>
+    </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="1167328349397" name="reductionMappingRule" index="3acgRq" />
+        <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
+      </concept>
+      <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
+        <child id="1177093586806" name="templateNode" index="gfFT$" />
+      </concept>
+      <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4">
+        <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
+      </concept>
+      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
+      <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
+        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
+      </concept>
+      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
+        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
+      </concept>
+      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
+        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
+      </concept>
+      <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
+        <reference id="1167514355421" name="template" index="3lhOvi" />
+      </concept>
+      <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
+      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </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">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
+        <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
+        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="bUwia" id="33$34j7IzkS">
+    <property role="TrG5h" value="main" />
+    <node concept="3aamgX" id="33$34j7IGIL" role="3acgRq">
+      <ref role="30HIoZ" to="mwpl:33$34j7IEa1" resolve="Entry" />
+      <node concept="gft3U" id="33$34j7IGIP" role="1lVwrX">
+        <node concept="2pNNFK" id="33$34j7IGIV" role="gfFT$">
+          <property role="2pNNFO" value="entry" />
+          <node concept="3o6iSG" id="33$34j7IGIX" role="3o6s8t">
+            <property role="3o6i5n" value="myName" />
+            <node concept="17Uvod" id="33$34j7IGIZ" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="479c7a8c-02f9-43b5-9139-d910cb22f298/1622293396948952339/1622293396948953704" />
+              <node concept="3zFVjK" id="33$34j7IGJ0" role="3zH0cK">
+                <node concept="3clFbS" id="33$34j7IGJ1" role="2VODD2">
+                  <node concept="3clFbF" id="33$34j7IGNA" role="3cqZAp">
+                    <node concept="2OqwBi" id="33$34j7IH0C" role="3clFbG">
+                      <node concept="30H73N" id="33$34j7IGN_" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="33$34j7IHbk" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3lhOvk" id="33$34j7IDNU" role="3lj3bC">
+      <ref role="30HIoZ" to="mwpl:33$34j7Izm8" resolve="Root" />
+      <ref role="3lhOvi" node="bGV79BuaiP" resolve="root2Xml" />
+    </node>
+  </node>
+  <node concept="2pMbU2" id="bGV79BuaiP">
+    <property role="TrG5h" value="root2Xml" />
+    <node concept="3rIKKV" id="bGV79BuaiQ" role="2pMbU3">
+      <node concept="2pNNFK" id="33$34j7IFU6" role="2pNm8H">
+        <property role="2pNNFO" value="entries" />
+        <node concept="2pNNFK" id="33$34j7IFUn" role="3o6s8t">
+          <property role="2pNNFO" value="entry" />
+          <node concept="2b32R4" id="33$34j7IFUt" role="lGtFl">
+            <node concept="3JmXsc" id="33$34j7IFUu" role="2P8S$">
+              <node concept="3clFbS" id="33$34j7IFUv" role="2VODD2">
+                <node concept="3clFbF" id="33$34j7IFXz" role="3cqZAp">
+                  <node concept="2OqwBi" id="33$34j7IG9E" role="3clFbG">
+                    <node concept="30H73N" id="33$34j7IFXy" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="33$34j7IGs2" role="2OqNvi">
+                      <ref role="3TtcxE" to="mwpl:33$34j7Izm9" resolve="entries" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="n94m4" id="bGV79BuaiS" role="lGtFl">
+      <ref role="n9lRv" to="mwpl:33$34j7Izm8" resolve="Root" />
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps
new file mode 100644
index 0000000000..c788c7224e
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:b8b41aa0-7274-4d9d-aa01-79655a007415(com.mbeddr.demo.comparator.diff.behavior)">
+  <persistence version="9" />
+  <languages>
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.constraints.mps
new file mode 100644
index 0000000000..01f550af1d
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.constraints.mps
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:7e7acc4c-bba1-404c-acb0-656f7faa439e(com.mbeddr.demo.comparator.diff.constraints)">
+  <persistence version="9" />
+  <languages>
+    <use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
+    <use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
+    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
+    <use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
+    <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
+    <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps
new file mode 100644
index 0000000000..ee7792a15e
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:a8d0f59a-f53c-4b42-abe9-22a5a80c0dbf(com.mbeddr.demo.comparator.diff.editor)">
+  <persistence version="9" />
+  <languages>
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="mwpl" ref="r:8545687c-2198-4cf2-8952-38bfc2847928(com.mbeddr.demo.comparator.diff.structure)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
+      <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
+        <child id="1140524464360" name="cellLayout" index="2czzBx" />
+      </concept>
+      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
+      <concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
+      <concept id="1237308012275" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineStyleClassItem" flags="ln" index="ljvvj" />
+      <concept id="1237375020029" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineChildrenStyleClassItem" flags="ln" index="pj6Ft" />
+      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
+        <child id="1080736633877" name="cellModel" index="2wV5jI" />
+      </concept>
+      <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
+        <property id="1186414551515" name="flag" index="VOm3f" />
+      </concept>
+      <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
+      <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
+        <property id="1238091709220" name="labelName" index="1413C4" />
+      </concept>
+      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
+      </concept>
+      <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
+        <child id="1106270802874" name="cellLayout" index="2iSdaV" />
+        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
+      </concept>
+      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
+        <property id="1073389577007" name="text" index="3F0ifm" />
+      </concept>
+      <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+        <child id="1219418656006" name="styleItem" index="3F10Kt" />
+      </concept>
+      <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
+      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
+        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="24kQdi" id="33$34j7Izmi">
+    <ref role="1XX52x" to="mwpl:33$34j7Izm8" resolve="Root" />
+    <node concept="3EZMnI" id="33$34j7IzqK" role="2wV5jI">
+      <node concept="l2Vlx" id="33$34j7IzqL" role="2iSdaV" />
+      <node concept="3F0ifn" id="33$34j7IzqM" role="3EZMnx">
+        <property role="3F0ifm" value="root" />
+      </node>
+      <node concept="3F0ifn" id="33$34j7IzqN" role="3EZMnx">
+        <property role="3F0ifm" value="{" />
+        <node concept="3mYdg7" id="33$34j7IzqO" role="3F10Kt">
+          <property role="1413C4" value="body-brace" />
+        </node>
+        <node concept="ljvvj" id="33$34j7IzqP" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="33$34j7IzqQ" role="3EZMnx">
+        <node concept="l2Vlx" id="33$34j7IzqR" role="2iSdaV" />
+        <node concept="lj46D" id="33$34j7IzqS" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F0ifn" id="33$34j7IzqT" role="3EZMnx">
+          <property role="3F0ifm" value="entries" />
+        </node>
+        <node concept="3F0ifn" id="33$34j7IzqU" role="3EZMnx">
+          <property role="3F0ifm" value=":" />
+          <node concept="11L4FC" id="33$34j7IzqV" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="ljvvj" id="33$34j7IzqW" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F2HdR" id="33$34j7IzqX" role="3EZMnx">
+          <ref role="1NtTu8" to="mwpl:33$34j7Izm9" resolve="entries" />
+          <node concept="l2Vlx" id="33$34j7IzqY" role="2czzBx" />
+          <node concept="pj6Ft" id="33$34j7IzqZ" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="lj46D" id="33$34j7Izr0" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="ljvvj" id="33$34j7Izr1" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="33$34j7Izr2" role="3EZMnx">
+        <property role="3F0ifm" value="}" />
+        <node concept="3mYdg7" id="33$34j7Izr3" role="3F10Kt">
+          <property role="1413C4" value="body-brace" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="33$34j7IEab">
+    <ref role="1XX52x" to="mwpl:33$34j7IEa1" resolve="Entry" />
+    <node concept="3F0A7n" id="33$34j7IEad" role="2wV5jI">
+      <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps
new file mode 100644
index 0000000000..a045ff271f
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:8545687c-2198-4cf2-8952-38bfc2847928(com.mbeddr.demo.comparator.diff.structure)">
+  <persistence version="9" />
+  <languages>
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
+  </languages>
+  <imports>
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
+      <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
+        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
+        <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
+      </concept>
+      <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
+        <reference id="1169127628841" name="intfc" index="PrY4T" />
+      </concept>
+      <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
+        <property id="1096454100552" name="rootable" index="19KtqR" />
+        <reference id="1071489389519" name="extends" index="1TJDcQ" />
+        <child id="1169129564478" name="implements" index="PzmwI" />
+      </concept>
+      <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
+        <property id="1071599776563" name="role" index="20kJfa" />
+        <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
+        <property id="1071599937831" name="metaClass" index="20lmBu" />
+        <property id="241647608299431140" name="linkId" index="IQ2ns" />
+        <reference id="1071599976176" name="target" index="20lvS9" />
+      </concept>
+    </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>
+  </registry>
+  <node concept="1TIwiD" id="33$34j7Izm8">
+    <property role="EcuMT" value="3522954298058749320" />
+    <property role="TrG5h" value="Root" />
+    <property role="19KtqR" value="true" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="33$34j7Izm9" role="1TKVEi">
+      <property role="IQ2ns" value="3522954298058749321" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="entries" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="33$34j7IEa1" resolve="Entry" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="33$34j7IEa1">
+    <property role="EcuMT" value="3522954298058777217" />
+    <property role="TrG5h" value="Entry" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="33$34j7IEa2" role="PzmwI">
+      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.typesystem.mps
new file mode 100644
index 0000000000..42dbc59d2c
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.typesystem.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:ea178c44-e9d6-4a83-9bc4-7531273b824d(com.mbeddr.demo.comparator.diff.typesystem)">
+  <persistence version="9" />
+  <languages>
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl
index 0f43baad5e..1d30779d3d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl
@@ -29,9 +29,17 @@
         <dependency reexport="false">c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)</dependency>
         <dependency reexport="false">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
         <dependency reexport="false">985c8c6a-64b4-486d-a91e-7d4112742556(jetbrains.mps.baseLanguage#1129914002933)</dependency>
+        <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
+        <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+        <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+        <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+        <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
+        <dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
+        <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+        <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -40,30 +48,46 @@
         <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+        <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="847a3235-09f9-403c-b6a9-1c294a212e92(Ant)" version="0" />
         <module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" version="0" />
         <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+        <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+        <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+        <module reference="920eaa0e-ecca-46bc-bee7-4e5c59213dd6(Testbench)" version="0" />
+        <module reference="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" version="0" />
+        <module reference="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" version="0" />
         <module reference="c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)" version="0" />
         <module reference="f47b95d4-5e73-4c04-9204-18076950153b(com.mbeddr.mpsutil.compare)" version="0" />
         <module reference="3b21f776-9e24-4e37-9639-70bded433068(com.mbeddr.mpsutil.compare#756135271275941091)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="985c8c6a-64b4-486d-a91e-7d4112742556(jetbrains.mps.baseLanguage#1129914002933)" version="0" />
+        <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
         <module reference="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" version="0" />
+        <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+        <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
+        <module reference="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" version="0" />
+        <module reference="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
@@ -87,9 +111,10 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)</dependency>
-    <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
     <dependency reexport="false" scope="generate-into">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
+    <dependency reexport="false" scope="generate-into">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
+    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -132,10 +157,12 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)" version="0" />
     <module reference="f47b95d4-5e73-4c04-9204-18076950153b(com.mbeddr.mpsutil.compare)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
@@ -145,10 +172,9 @@
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
-    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <runtime>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
index 2e270519de..4a9aca6005 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
@@ -4,6 +4,8 @@
   <languages>
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -12,8 +14,18 @@
     <import index="tpe3" ref="r:00000000-0000-4000-0000-011c895902d7(jetbrains.mps.baseLanguage.unitTest.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
   </imports>
   <registry>
+    <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
+      <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -33,11 +45,18 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </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="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -92,6 +111,9 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
@@ -100,20 +122,61 @@
       </concept>
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <property id="1184950341882" name="topPriorityGroup" index="3$yP7D" />
+        <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
         <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
       </concept>
+      <concept id="1112730859144" name="jetbrains.mps.lang.generator.structure.TemplateSwitch" flags="ig" index="jVnub">
+        <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
+      </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
+      <concept id="1200911316486" name="jetbrains.mps.lang.generator.structure.MappingLabelDeclaration" flags="lg" index="2rT7sh">
+        <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
+        <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
+      </concept>
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+        <reference id="1722980698497626483" name="template" index="v9R2y" />
+      </concept>
+      <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
+      <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
+        <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
+        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
+      </concept>
+      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
+        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
+      </concept>
+      <concept id="1087833466690" name="jetbrains.mps.lang.generator.structure.NodeMacro" flags="lg" index="17VmuZ">
+        <reference id="1200912223215" name="mappingLabel" index="2rW$FS" />
       </concept>
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
+      <concept id="982871510068000147" name="jetbrains.mps.lang.generator.structure.TemplateSwitchMacro" flags="lg" index="1sPUBX" />
+      <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
+      <concept id="1167756221419" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_templatePropertyValue" flags="nn" index="3zGtF$" />
+      <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
       <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
         <child id="8900764248744213871" name="contentNode" index="1Koe22" />
       </concept>
       <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
+      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
+        <child id="1167770376702" name="referentFunction" index="3$ytzL" />
+      </concept>
+    </language>
+    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
+      <concept id="1218047638031" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_CreateUniqueName" flags="nn" index="2piZGk">
+        <child id="1218047638032" name="baseName" index="2piZGb" />
+      </concept>
+      <concept id="1229477454423" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalCopiedInputByOutput" flags="nn" index="12$id9">
+        <child id="1229477520175" name="outputNode" index="12$y8L" />
+      </concept>
+      <concept id="1216860049627" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabelAndInput" flags="nn" index="1iwH70">
+        <reference id="1216860049628" name="label" index="1iwH77" />
+        <child id="1216860049632" name="inputNode" index="1iwH7V" />
+      </concept>
+      <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
@@ -157,16 +220,29 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
+      <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
         <child id="1145567471833" name="createdType" index="2T96Bj" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -178,10 +254,26 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
+      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
+        <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
+        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
+      </concept>
+      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
+        <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
+        <property id="1341860900488019036" name="linkId" index="P3scX" />
+      </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="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
@@ -192,137 +284,141 @@
   <node concept="bUwia" id="DYlgnAyWN$">
     <property role="TrG5h" value="main" />
     <property role="3$yP7D" value="true" />
+    <node concept="2rT7sh" id="2RIzFJ7I7bZ" role="2rTMjI">
+      <property role="TrG5h" value="compareResult" />
+      <ref role="2rTdP9" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+      <ref role="2rZz_L" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
+    </node>
     <node concept="3aamgX" id="3C6_kMLS8OV" role="3acgRq">
       <ref role="30HIoZ" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
       <node concept="1Koe21" id="3C6_kMLS8OW" role="1lVwrX">
-        <node concept="3clFb_" id="3C6_kMLS8OX" role="1Koe22">
+        <node concept="1LZb2c" id="6Qumy0DZm_T" role="1Koe22">
           <property role="TrG5h" value="dummy" />
-          <node concept="3cqZAl" id="3C6_kMLS8OY" role="3clF45" />
-          <node concept="3Tm1VV" id="3C6_kMLS8OZ" role="1B3o_S" />
-          <node concept="3clFbS" id="3C6_kMLS8P0" role="3clF47">
-            <node concept="3cpWs8" id="3C6_kMLS8P1" role="3cqZAp">
-              <node concept="3cpWsn" id="3C6_kMLS8P2" role="3cpWs9">
+          <node concept="3cqZAl" id="6Qumy0DZm_U" role="3clF45" />
+          <node concept="3clFbS" id="6Qumy0DZm_V" role="3clF47">
+            <node concept="3cpWs8" id="6Qumy0DZm_W" role="3cqZAp">
+              <node concept="3cpWsn" id="6Qumy0DZm_X" role="3cpWs9">
                 <property role="TrG5h" value="expectedNode" />
-                <node concept="3Tqbb2" id="3C6_kMLS8P3" role="1tU5fm" />
-                <node concept="10Nm6u" id="3C6_kMLS8P4" role="33vP2m" />
+                <node concept="3Tqbb2" id="6Qumy0DZm_Y" role="1tU5fm" />
+                <node concept="10Nm6u" id="6Qumy0DZm_Z" role="33vP2m" />
               </node>
             </node>
-            <node concept="3cpWs8" id="3C6_kMLS8P5" role="3cqZAp">
-              <node concept="3cpWsn" id="3C6_kMLS8P6" role="3cpWs9">
+            <node concept="3cpWs8" id="6Qumy0DZmA0" role="3cqZAp">
+              <node concept="3cpWsn" id="6Qumy0DZmA1" role="3cpWs9">
                 <property role="TrG5h" value="actualNode" />
-                <node concept="3Tqbb2" id="3C6_kMLS8P7" role="1tU5fm" />
-                <node concept="10Nm6u" id="3C6_kMLS8P8" role="33vP2m" />
+                <node concept="3Tqbb2" id="6Qumy0DZmA2" role="1tU5fm" />
+                <node concept="10Nm6u" id="6Qumy0DZmA3" role="33vP2m" />
               </node>
             </node>
-            <node concept="3cpWs8" id="3C6_kMLS8P9" role="3cqZAp">
-              <node concept="3cpWsn" id="3C6_kMLS8Pa" role="3cpWs9">
+            <node concept="3cpWs8" id="6Qumy0DZmA4" role="3cqZAp">
+              <node concept="3cpWsn" id="6Qumy0DZmA5" role="3cpWs9">
                 <property role="TrG5h" value="properties" />
-                <node concept="_YKpA" id="3C6_kMLS8Pb" role="1tU5fm">
-                  <node concept="3uibUv" id="3C6_kMLS8Pc" role="_ZDj9">
+                <node concept="_YKpA" id="6Qumy0DZmA6" role="1tU5fm">
+                  <node concept="3uibUv" id="6Qumy0DZmA7" role="_ZDj9">
                     <ref role="3uigEE" to="mqum:DYlgnBstFb" resolve="IgnoredProperty" />
                   </node>
                 </node>
-                <node concept="10Nm6u" id="3C6_kMLS8Pd" role="33vP2m" />
+                <node concept="10Nm6u" id="6Qumy0DZmA8" role="33vP2m" />
               </node>
             </node>
-            <node concept="3cpWs8" id="3qPjHtYuXpt" role="3cqZAp">
-              <node concept="3cpWsn" id="3qPjHtYuXpu" role="3cpWs9">
+            <node concept="3cpWs8" id="6Qumy0DZmA9" role="3cqZAp">
+              <node concept="3cpWsn" id="6Qumy0DZmAa" role="3cpWs9">
                 <property role="TrG5h" value="references" />
-                <node concept="_YKpA" id="3qPjHtYuXpv" role="1tU5fm">
-                  <node concept="3uibUv" id="3qPjHtYuXF4" role="_ZDj9">
+                <node concept="_YKpA" id="6Qumy0DZmAb" role="1tU5fm">
+                  <node concept="3uibUv" id="6Qumy0DZmAc" role="_ZDj9">
                     <ref role="3uigEE" to="mqum:2mzdNw3ouFX" resolve="IgnoredReference" />
                   </node>
                 </node>
-                <node concept="10Nm6u" id="3qPjHtYuXpx" role="33vP2m" />
+                <node concept="10Nm6u" id="6Qumy0DZmAd" role="33vP2m" />
               </node>
             </node>
-            <node concept="9aQIb" id="3C6_kMLS8Pe" role="3cqZAp">
-              <node concept="3clFbS" id="3C6_kMLS8Pf" role="9aQI4">
-                <node concept="3cpWs8" id="6fymoI4YiTz" role="3cqZAp">
-                  <node concept="3cpWsn" id="6fymoI4YiT$" role="3cpWs9">
+            <node concept="9aQIb" id="6Qumy0DZmAf" role="3cqZAp">
+              <node concept="3clFbS" id="6Qumy0DZmAg" role="9aQI4">
+                <node concept="3cpWs8" id="6Qumy0DZmAt" role="3cqZAp">
+                  <node concept="3cpWsn" id="6Qumy0DZmAu" role="3cpWs9">
                     <property role="TrG5h" value="result" />
-                    <node concept="3uibUv" id="6fymoI4YiT_" role="1tU5fm">
+                    <node concept="3uibUv" id="6Qumy0DZmAv" role="1tU5fm">
                       <ref role="3uigEE" to="mqum:494SuRWLRaN" resolve="MPSNodeComparisonResult" />
                     </node>
-                    <node concept="2YIFZM" id="6fymoI4YiZX" role="33vP2m">
+                    <node concept="2YIFZM" id="6Qumy0DZmAw" role="33vP2m">
                       <ref role="1Pybhc" to="mqum:3n2rqT9UxKL" resolve="MPSNodeComparator" />
                       <ref role="37wK5l" to="mqum:6fymoI4RKZK" resolve="compare" />
-                      <node concept="37vLTw" id="6fymoI4YiZY" role="37wK5m">
-                        <ref role="3cqZAo" node="3C6_kMLS8P2" resolve="expectedNode" />
-                        <node concept="29HgVG" id="6fymoI4YiZZ" role="lGtFl">
-                          <node concept="3NFfHV" id="6fymoI4Yj00" role="3NFExx">
-                            <node concept="3clFbS" id="6fymoI4Yj01" role="2VODD2">
-                              <node concept="3clFbF" id="6fymoI4Yj02" role="3cqZAp">
-                                <node concept="2OqwBi" id="6fymoI4Yj03" role="3clFbG">
-                                  <node concept="3TrEf2" id="6fymoI4Ylu7" role="2OqNvi">
+                      <node concept="37vLTw" id="6Qumy0DZmAx" role="37wK5m">
+                        <ref role="3cqZAo" node="6Qumy0DZm_X" resolve="expectedNode" />
+                        <node concept="29HgVG" id="6Qumy0DZmAy" role="lGtFl">
+                          <node concept="3NFfHV" id="6Qumy0DZmAz" role="3NFExx">
+                            <node concept="3clFbS" id="6Qumy0DZmA$" role="2VODD2">
+                              <node concept="3clFbF" id="6Qumy0DZmA_" role="3cqZAp">
+                                <node concept="2OqwBi" id="6Qumy0DZmAA" role="3clFbG">
+                                  <node concept="3TrEf2" id="6Qumy0DZmAB" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpe3:7jPoEeD$ZP4" resolve="expected" />
                                   </node>
-                                  <node concept="30H73N" id="6fymoI4Yj05" role="2Oq$k0" />
+                                  <node concept="30H73N" id="6Qumy0DZmAC" role="2Oq$k0" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="37vLTw" id="6fymoI4Yj06" role="37wK5m">
-                        <ref role="3cqZAo" node="3C6_kMLS8P6" resolve="actualNode" />
-                        <node concept="29HgVG" id="6fymoI4Yj07" role="lGtFl">
-                          <node concept="3NFfHV" id="6fymoI4Yj08" role="3NFExx">
-                            <node concept="3clFbS" id="6fymoI4Yj09" role="2VODD2">
-                              <node concept="3clFbF" id="6fymoI4Yj0a" role="3cqZAp">
-                                <node concept="2OqwBi" id="6fymoI4Yj0b" role="3clFbG">
-                                  <node concept="3TrEf2" id="6fymoI4YlaU" role="2OqNvi">
+                      <node concept="37vLTw" id="6Qumy0DZmAD" role="37wK5m">
+                        <ref role="3cqZAo" node="6Qumy0DZmA1" resolve="actualNode" />
+                        <node concept="29HgVG" id="6Qumy0DZmAE" role="lGtFl">
+                          <node concept="3NFfHV" id="6Qumy0DZmAF" role="3NFExx">
+                            <node concept="3clFbS" id="6Qumy0DZmAG" role="2VODD2">
+                              <node concept="3clFbF" id="6Qumy0DZmAH" role="3cqZAp">
+                                <node concept="2OqwBi" id="6Qumy0DZmAI" role="3clFbG">
+                                  <node concept="3TrEf2" id="6Qumy0DZmAJ" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpe3:7jPoEeD$ZP5" resolve="actual" />
                                   </node>
-                                  <node concept="30H73N" id="6fymoI4Yj0d" role="2Oq$k0" />
+                                  <node concept="30H73N" id="6Qumy0DZmAK" role="2Oq$k0" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="37vLTw" id="6fymoI4Yj0e" role="37wK5m">
-                        <ref role="3cqZAo" node="3C6_kMLS8Pa" resolve="properties" />
-                        <node concept="29HgVG" id="6fymoI4Yj0f" role="lGtFl">
-                          <node concept="3NFfHV" id="6fymoI4Yj0g" role="3NFExx">
-                            <node concept="3clFbS" id="6fymoI4Yj0h" role="2VODD2">
-                              <node concept="3clFbJ" id="2Y6yZU2fpzi" role="3cqZAp">
-                                <node concept="3clFbS" id="2Y6yZU2fpzj" role="3clFbx">
-                                  <node concept="3cpWs6" id="2Y6yZU2fqdg" role="3cqZAp">
-                                    <node concept="2OqwBi" id="2Y6yZU2fqk7" role="3cqZAk">
-                                      <node concept="30H73N" id="2Y6yZU2fqfW" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="2Y6yZU2fqAR" role="2OqNvi">
+                      <node concept="37vLTw" id="6Qumy0DZmAL" role="37wK5m">
+                        <ref role="3cqZAo" node="6Qumy0DZmA5" resolve="properties" />
+                        <node concept="29HgVG" id="6Qumy0DZmAM" role="lGtFl">
+                          <node concept="3NFfHV" id="6Qumy0DZmAN" role="3NFExx">
+                            <node concept="3clFbS" id="6Qumy0DZmAO" role="2VODD2">
+                              <node concept="3clFbJ" id="6Qumy0DZmAP" role="3cqZAp">
+                                <node concept="3clFbS" id="6Qumy0DZmAQ" role="3clFbx">
+                                  <node concept="3cpWs6" id="6Qumy0DZmAR" role="3cqZAp">
+                                    <node concept="2OqwBi" id="6Qumy0DZmAS" role="3cqZAk">
+                                      <node concept="30H73N" id="6Qumy0DZmAT" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="6Qumy0DZmAU" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8do3:2lpUxXMduaL" resolve="ignoredProperties" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="2OqwBi" id="2Y6yZU2fq5e" role="3clFbw">
-                                  <node concept="2OqwBi" id="2Y6yZU2fpC$" role="2Oq$k0">
-                                    <node concept="30H73N" id="2Y6yZU2fp$3" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="2Y6yZU2fpTU" role="2OqNvi">
+                                <node concept="2OqwBi" id="6Qumy0DZmAV" role="3clFbw">
+                                  <node concept="2OqwBi" id="6Qumy0DZmAW" role="2Oq$k0">
+                                    <node concept="30H73N" id="6Qumy0DZmAX" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="6Qumy0DZmAY" role="2OqNvi">
                                       <ref role="3Tt5mk" to="8do3:2lpUxXMduaL" resolve="ignoredProperties" />
                                     </node>
                                   </node>
-                                  <node concept="3x8VRR" id="2Y6yZU2fqb9" role="2OqNvi" />
+                                  <node concept="3x8VRR" id="6Qumy0DZmAZ" role="2OqNvi" />
                                 </node>
-                                <node concept="9aQIb" id="2Y6yZU2fqDs" role="9aQIa">
-                                  <node concept="3clFbS" id="2Y6yZU2fqDt" role="9aQI4">
-                                    <node concept="3cpWs6" id="2Y6yZU2frbs" role="3cqZAp">
-                                      <node concept="2pJPEk" id="2Y6yZU2frlX" role="3cqZAk">
-                                        <node concept="2pJPED" id="2Y6yZU2frTK" role="2pJPEn">
+                                <node concept="9aQIb" id="6Qumy0DZmB0" role="9aQIa">
+                                  <node concept="3clFbS" id="6Qumy0DZmB1" role="9aQI4">
+                                    <node concept="3cpWs6" id="6Qumy0DZmB2" role="3cqZAp">
+                                      <node concept="2pJPEk" id="6Qumy0DZmB3" role="3cqZAk">
+                                        <node concept="2pJPED" id="6Qumy0DZmB4" role="2pJPEn">
                                           <ref role="2pJxaS" to="tpee:gEShNN5" resolve="GenericNewExpression" />
-                                          <node concept="2pIpSj" id="2Y6yZU2frZx" role="2pJxcM">
+                                          <node concept="2pIpSj" id="6Qumy0DZmB5" role="2pJxcM">
                                             <ref role="2pIpSl" to="tpee:gEShVi6" resolve="creator" />
-                                            <node concept="2pJPED" id="2Y6yZU2ftl$" role="28nt2d">
+                                            <node concept="2pJPED" id="6Qumy0DZmB6" role="28nt2d">
                                               <ref role="2pJxaS" to="tp2q:gSTc6KI" resolve="ListCreatorWithInit" />
-                                              <node concept="2pIpSj" id="2Y6yZU2ftrP" role="2pJxcM">
+                                              <node concept="2pIpSj" id="6Qumy0DZmB7" role="2pJxcM">
                                                 <ref role="2pIpSl" to="tp2q:i0HW$Uv" resolve="elementType" />
-                                                <node concept="2pJPED" id="2Y6yZU2fts4" role="28nt2d">
+                                                <node concept="2pJPED" id="6Qumy0DZmB8" role="28nt2d">
                                                   <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
-                                                  <node concept="2pIpSj" id="2Y6yZU2ftsf" role="2pJxcM">
+                                                  <node concept="2pIpSj" id="6Qumy0DZmB9" role="2pJxcM">
                                                     <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
-                                                    <node concept="36bGnv" id="2Y6yZU2ftta" role="28nt2d">
+                                                    <node concept="36bGnv" id="6Qumy0DZmBa" role="28nt2d">
                                                       <ref role="36bGnp" to="mqum:DYlgnBstFb" resolve="IgnoredProperty" />
                                                     </node>
                                                   </node>
@@ -340,48 +436,48 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="37vLTw" id="3qPjHtYuXVW" role="37wK5m">
-                        <ref role="3cqZAo" node="3qPjHtYuXpu" resolve="references" />
-                        <node concept="29HgVG" id="3qPjHtYuXVX" role="lGtFl">
-                          <node concept="3NFfHV" id="3qPjHtYuXVY" role="3NFExx">
-                            <node concept="3clFbS" id="3qPjHtYuXVZ" role="2VODD2">
-                              <node concept="3clFbJ" id="3qPjHtYuXW0" role="3cqZAp">
-                                <node concept="3clFbS" id="3qPjHtYuXW1" role="3clFbx">
-                                  <node concept="3cpWs6" id="3qPjHtYuXW2" role="3cqZAp">
-                                    <node concept="2OqwBi" id="3qPjHtYuXW3" role="3cqZAk">
-                                      <node concept="30H73N" id="3qPjHtYuXW4" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="3qPjHtYuZqp" role="2OqNvi">
+                      <node concept="37vLTw" id="6Qumy0DZmBb" role="37wK5m">
+                        <ref role="3cqZAo" node="6Qumy0DZmAa" resolve="references" />
+                        <node concept="29HgVG" id="6Qumy0DZmBc" role="lGtFl">
+                          <node concept="3NFfHV" id="6Qumy0DZmBd" role="3NFExx">
+                            <node concept="3clFbS" id="6Qumy0DZmBe" role="2VODD2">
+                              <node concept="3clFbJ" id="6Qumy0DZmBf" role="3cqZAp">
+                                <node concept="3clFbS" id="6Qumy0DZmBg" role="3clFbx">
+                                  <node concept="3cpWs6" id="6Qumy0DZmBh" role="3cqZAp">
+                                    <node concept="2OqwBi" id="6Qumy0DZmBi" role="3cqZAk">
+                                      <node concept="30H73N" id="6Qumy0DZmBj" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="6Qumy0DZmBk" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8do3:3qPjHtYqU7z" resolve="ignoredReferences" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="2OqwBi" id="3qPjHtYuXW6" role="3clFbw">
-                                  <node concept="2OqwBi" id="3qPjHtYuXW7" role="2Oq$k0">
-                                    <node concept="30H73N" id="3qPjHtYuXW8" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="3qPjHtYuZ1B" role="2OqNvi">
+                                <node concept="2OqwBi" id="6Qumy0DZmBl" role="3clFbw">
+                                  <node concept="2OqwBi" id="6Qumy0DZmBm" role="2Oq$k0">
+                                    <node concept="30H73N" id="6Qumy0DZmBn" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="6Qumy0DZmBo" role="2OqNvi">
                                       <ref role="3Tt5mk" to="8do3:3qPjHtYqU7z" resolve="ignoredReferences" />
                                     </node>
                                   </node>
-                                  <node concept="3x8VRR" id="3qPjHtYuXWa" role="2OqNvi" />
+                                  <node concept="3x8VRR" id="6Qumy0DZmBp" role="2OqNvi" />
                                 </node>
-                                <node concept="9aQIb" id="3qPjHtYuXWb" role="9aQIa">
-                                  <node concept="3clFbS" id="3qPjHtYuXWc" role="9aQI4">
-                                    <node concept="3cpWs6" id="3qPjHtYuXWd" role="3cqZAp">
-                                      <node concept="2pJPEk" id="3qPjHtYuXWe" role="3cqZAk">
-                                        <node concept="2pJPED" id="3qPjHtYuXWf" role="2pJPEn">
+                                <node concept="9aQIb" id="6Qumy0DZmBq" role="9aQIa">
+                                  <node concept="3clFbS" id="6Qumy0DZmBr" role="9aQI4">
+                                    <node concept="3cpWs6" id="6Qumy0DZmBs" role="3cqZAp">
+                                      <node concept="2pJPEk" id="6Qumy0DZmBt" role="3cqZAk">
+                                        <node concept="2pJPED" id="6Qumy0DZmBu" role="2pJPEn">
                                           <ref role="2pJxaS" to="tpee:gEShNN5" resolve="GenericNewExpression" />
-                                          <node concept="2pIpSj" id="3qPjHtYuXWg" role="2pJxcM">
+                                          <node concept="2pIpSj" id="6Qumy0DZmBv" role="2pJxcM">
                                             <ref role="2pIpSl" to="tpee:gEShVi6" resolve="creator" />
-                                            <node concept="2pJPED" id="3qPjHtYuXWh" role="28nt2d">
+                                            <node concept="2pJPED" id="6Qumy0DZmBw" role="28nt2d">
                                               <ref role="2pJxaS" to="tp2q:gSTc6KI" resolve="ListCreatorWithInit" />
-                                              <node concept="2pIpSj" id="3qPjHtYuXWi" role="2pJxcM">
+                                              <node concept="2pIpSj" id="6Qumy0DZmBx" role="2pJxcM">
                                                 <ref role="2pIpSl" to="tp2q:i0HW$Uv" resolve="elementType" />
-                                                <node concept="2pJPED" id="3qPjHtYuXWj" role="28nt2d">
+                                                <node concept="2pJPED" id="6Qumy0DZmBy" role="28nt2d">
                                                   <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
-                                                  <node concept="2pIpSj" id="3qPjHtYuXWk" role="2pJxcM">
+                                                  <node concept="2pIpSj" id="6Qumy0DZmBz" role="2pJxcM">
                                                     <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
-                                                    <node concept="36bGnv" id="3qPjHtYuZA8" role="28nt2d">
+                                                    <node concept="36bGnv" id="6Qumy0DZmB$" role="28nt2d">
                                                       <ref role="36bGnp" to="mqum:2mzdNw3ouFX" resolve="IgnoredReference" />
                                                     </node>
                                                   </node>
@@ -399,44 +495,83 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbT" id="6fymoI4Yj0Y" role="37wK5m">
+                      <node concept="3clFbT" id="6Qumy0DZmB_" role="37wK5m">
                         <property role="3clFbU" value="true" />
                       </node>
-                      <node concept="3clFbT" id="6fymoI4Yj0Z" role="37wK5m">
+                      <node concept="3clFbT" id="6Qumy0DZmBA" role="37wK5m">
                         <property role="3clFbU" value="false" />
                       </node>
                     </node>
+                    <node concept="2ZBi8u" id="2RIzFJ7I7N6" role="lGtFl">
+                      <ref role="2rW$FS" node="2RIzFJ7I7bZ" resolve="compareResult" />
+                    </node>
+                    <node concept="17Uvod" id="2RIzFJ7Ig6r" role="lGtFl">
+                      <property role="2qtEX9" value="name" />
+                      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                      <node concept="3zFVjK" id="2RIzFJ7Ig6s" role="3zH0cK">
+                        <node concept="3clFbS" id="2RIzFJ7Ig6t" role="2VODD2">
+                          <node concept="3clFbF" id="2RIzFJ7IgI$" role="3cqZAp">
+                            <node concept="2OqwBi" id="2RIzFJ7IgIA" role="3clFbG">
+                              <node concept="1iwH7S" id="2RIzFJ7IgIB" role="2Oq$k0" />
+                              <node concept="2piZGk" id="2RIzFJ7IgIC" role="2OqNvi">
+                                <node concept="3zGtF$" id="2RIzFJ7IgID" role="2piZGb" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="3C6_kMLS8PL" role="3cqZAp">
-                  <node concept="3clFbS" id="3C6_kMLS8PM" role="3clFbx">
-                    <node concept="3vwNmj" id="3C6_kMLS8PU" role="3cqZAp">
-                      <node concept="3clFbT" id="3C6_kMLS8PV" role="3vwVQn" />
-                      <node concept="3_1$Yv" id="2Y6yZU2fu8A" role="3_9lra">
-                        <node concept="2OqwBi" id="2Y6yZU2fu9c" role="3_1BAH">
-                          <node concept="37vLTw" id="2Y6yZU2fu8E" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6fymoI4YiT$" resolve="result" />
-                          </node>
-                          <node concept="liA8E" id="2Y6yZU2fua_" role="2OqNvi">
+                <node concept="3clFbJ" id="6Qumy0DZmBB" role="3cqZAp">
+                  <node concept="3clFbS" id="6Qumy0DZmBC" role="3clFbx">
+                    <node concept="3clFbJ" id="6Qumy0DZmBD" role="3cqZAp">
+                      <node concept="3clFbS" id="6Qumy0DZmBE" role="3clFbx">
+                        <node concept="3clFbH" id="2RIzFJ7GzXl" role="3cqZAp">
+                          <node concept="1sPUBX" id="2RIzFJ7HaPc" role="lGtFl">
+                            <ref role="v9R2y" node="2RIzFJ7Guov" resolve="switchDiffViewnContent" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3fqX7Q" id="6Qumy0DZmCd" role="3clFbw">
+                        <node concept="2OqwBi" id="6Qumy0DZmCe" role="3fr31v">
+                          <node concept="2YIFZM" id="6Qumy0DZmCf" role="2Oq$k0">
+                            <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+                            <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
+                          </node>
+                          <node concept="liA8E" id="6Qumy0DZmCg" role="2OqNvi">
+                            <ref role="37wK5l" to="bd8o:~Application.isHeadlessEnvironment()" resolve="isHeadlessEnvironment" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3vwNmj" id="6Qumy0DZmCh" role="3cqZAp">
+                      <node concept="3clFbT" id="6Qumy0DZmCi" role="3vwVQn" />
+                      <node concept="3_1$Yv" id="6Qumy0DZmCj" role="3_9lra">
+                        <node concept="2OqwBi" id="6Qumy0DZmCk" role="3_1BAH">
+                          <node concept="37vLTw" id="6Qumy0DZmCl" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6Qumy0DZmAu" resolve="result" />
+                          </node>
+                          <node concept="liA8E" id="6Qumy0DZmCm" role="2OqNvi">
                             <ref role="37wK5l" to="mqum:DYlgnAAwiN" resolve="getDescription" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3fqX7Q" id="3C6_kMLS8PW" role="3clFbw">
-                    <node concept="2OqwBi" id="3C6_kMLS8PX" role="3fr31v">
-                      <node concept="37vLTw" id="3C6_kMLS8PY" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6fymoI4YiT$" resolve="result" />
+                  <node concept="3fqX7Q" id="6Qumy0DZmCn" role="3clFbw">
+                    <node concept="2OqwBi" id="6Qumy0DZmCo" role="3fr31v">
+                      <node concept="37vLTw" id="6Qumy0DZmCp" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6Qumy0DZmAu" resolve="result" />
                       </node>
-                      <node concept="liA8E" id="3C6_kMLS8PZ" role="2OqNvi">
+                      <node concept="liA8E" id="6Qumy0DZmCq" role="2OqNvi">
                         <ref role="37wK5l" to="mqum:DYlgnAAwiA" resolve="areEquals" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="3C6_kMLS8Q0" role="lGtFl" />
+              <node concept="raruj" id="6Qumy0DZmCr" role="lGtFl" />
             </node>
           </node>
         </node>
@@ -769,5 +904,485 @@
       </node>
     </node>
   </node>
+  <node concept="jVnub" id="2RIzFJ7Guov">
+    <property role="TrG5h" value="switchDiffViewnContent" />
+    <node concept="3aamgX" id="2RIzFJ7GM5y" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+      <node concept="1Koe21" id="2RIzFJ7GOeX" role="1lVwrX">
+        <node concept="1LZb2c" id="2RIzFJ7GOnz" role="1Koe22">
+          <property role="TrG5h" value="foo" />
+          <node concept="3cqZAl" id="2RIzFJ7GOn$" role="3clF45" />
+          <node concept="3clFbS" id="2RIzFJ7GOn_" role="3clF47">
+            <node concept="3cpWs8" id="2RIzFJ7HwXg" role="3cqZAp">
+              <node concept="3cpWsn" id="2RIzFJ7HwXj" role="3cpWs9">
+                <property role="TrG5h" value="result" />
+                <node concept="3uibUv" id="2RIzFJ7HwXk" role="1tU5fm">
+                  <ref role="3uigEE" to="mqum:494SuRWLRaN" resolve="MPSNodeComparisonResult" />
+                </node>
+                <node concept="10Nm6u" id="2RIzFJ7HznK" role="33vP2m" />
+              </node>
+            </node>
+            <node concept="9aQIb" id="2RIzFJ7GTOF" role="3cqZAp">
+              <node concept="3clFbS" id="2RIzFJ7GTOG" role="9aQI4">
+                <node concept="3cpWs8" id="2RIzFJ7GTQa" role="3cqZAp">
+                  <node concept="3cpWsn" id="2RIzFJ7GTQb" role="3cpWs9">
+                    <property role="TrG5h" value="origExpected" />
+                    <node concept="3Tqbb2" id="2RIzFJ7GTQc" role="1tU5fm" />
+                    <node concept="2OqwBi" id="2RIzFJ7GTQd" role="33vP2m">
+                      <node concept="2YIFZM" id="2RIzFJ7GTQe" role="2Oq$k0">
+                        <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                        <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                        <node concept="Xl_RD" id="2RIzFJ7GTQf" role="37wK5m">
+                          <property role="Xl_RC" value="origExpectedNodeId" />
+                          <node concept="17Uvod" id="2RIzFJ7GTQg" role="lGtFl">
+                            <property role="2qtEX9" value="value" />
+                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                            <node concept="3zFVjK" id="2RIzFJ7GTQh" role="3zH0cK">
+                              <node concept="3clFbS" id="2RIzFJ7GTQi" role="2VODD2">
+                                <node concept="3cpWs8" id="2RIzFJ7GTQj" role="3cqZAp">
+                                  <node concept="3cpWsn" id="2RIzFJ7GTQk" role="3cpWs9">
+                                    <property role="TrG5h" value="expectedTestNode" />
+                                    <node concept="3Tqbb2" id="2RIzFJ7GTQl" role="1tU5fm" />
+                                    <node concept="2OqwBi" id="2RIzFJ7GTQm" role="33vP2m">
+                                      <node concept="2OqwBi" id="2RIzFJ7GTQn" role="2Oq$k0">
+                                        <node concept="1PxgMI" id="2RIzFJ7GTQo" role="2Oq$k0">
+                                          <node concept="chp4Y" id="2RIzFJ7GTQp" role="3oSUPX">
+                                            <ref role="cht4Q" to="tp5g:hBxON8j" resolve="TestNodeReference" />
+                                          </node>
+                                          <node concept="2OqwBi" id="2RIzFJ7GTQq" role="1m5AlR">
+                                            <node concept="30H73N" id="2RIzFJ7GTQr" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="2RIzFJ7GTQs" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="tpe3:7jPoEeD$ZP4" resolve="expected" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="3TrEf2" id="2RIzFJ7GTQt" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="tp5g:hBxOPr6" resolve="declaration" />
+                                        </node>
+                                      </node>
+                                      <node concept="1mfA1w" id="2RIzFJ7GTQu" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="2RIzFJ7GTQv" role="3cqZAp">
+                                  <node concept="2OqwBi" id="2RIzFJ7GTQw" role="3clFbG">
+                                    <node concept="2JrnkZ" id="2RIzFJ7GTQx" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="2RIzFJ7GTQy" role="2JrQYb">
+                                        <node concept="2OqwBi" id="2RIzFJ7GTQz" role="2Oq$k0">
+                                          <node concept="1iwH7S" id="2RIzFJ7GTQ$" role="2Oq$k0" />
+                                          <node concept="12$id9" id="2RIzFJ7GTQ_" role="2OqNvi">
+                                            <node concept="37vLTw" id="2RIzFJ7GTQA" role="12$y8L">
+                                              <ref role="3cqZAo" node="2RIzFJ7GTQk" resolve="expectedTestNode" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="iZEcu" id="2RIzFJ7GTQB" role="2OqNvi" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="2RIzFJ7GTQC" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="2RIzFJ7GTQD" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                        <node concept="2OqwBi" id="2RIzFJ7GTQE" role="37wK5m">
+                          <node concept="1jxXqW" id="2RIzFJ7H1$E" role="2Oq$k0" />
+                          <node concept="liA8E" id="2RIzFJ7GTQG" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="17Uvod" id="2RIzFJ7GTQH" role="lGtFl">
+                      <property role="2qtEX9" value="name" />
+                      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                      <node concept="3zFVjK" id="2RIzFJ7GTQI" role="3zH0cK">
+                        <node concept="3clFbS" id="2RIzFJ7GTQJ" role="2VODD2">
+                          <node concept="3clFbF" id="2RIzFJ7GTQK" role="3cqZAp">
+                            <node concept="2OqwBi" id="2RIzFJ7GTQL" role="3clFbG">
+                              <node concept="1iwH7S" id="2RIzFJ7GTQM" role="2Oq$k0" />
+                              <node concept="2piZGk" id="2RIzFJ7GTQN" role="2OqNvi">
+                                <node concept="3zGtF$" id="2RIzFJ7GTQO" role="2piZGb" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="6Od11GYaj1f" role="3cqZAp">
+                  <node concept="3cpWsn" id="6Od11GYaj1i" role="3cpWs9">
+                    <property role="TrG5h" value="input" />
+                    <node concept="3Tqbb2" id="6Od11GYaj1d" role="1tU5fm">
+                      <ref role="ehGHo" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+                    </node>
+                    <node concept="10QFUN" id="6Od11GYaswM" role="33vP2m">
+                      <node concept="2OqwBi" id="6Od11GYabp3" role="10QFUP">
+                        <node concept="2YIFZM" id="6Od11GYaazj" role="2Oq$k0">
+                          <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                          <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                          <node concept="Xl_RD" id="6Od11GYaaV8" role="37wK5m">
+                            <property role="Xl_RC" value="assertId" />
+                            <node concept="17Uvod" id="6Od11GYaf15" role="lGtFl">
+                              <property role="2qtEX9" value="value" />
+                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                              <node concept="3zFVjK" id="6Od11GYaf16" role="3zH0cK">
+                                <node concept="3clFbS" id="6Od11GYaf17" role="2VODD2">
+                                  <node concept="3clFbF" id="6Od11GYafrF" role="3cqZAp">
+                                    <node concept="2OqwBi" id="6Od11GYafrG" role="3clFbG">
+                                      <node concept="2JrnkZ" id="6Od11GYafrH" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="6Od11GYafrI" role="2JrQYb">
+                                          <node concept="2OqwBi" id="6Od11GYafrJ" role="2Oq$k0">
+                                            <node concept="1iwH7S" id="6Od11GYafrK" role="2Oq$k0" />
+                                            <node concept="12$id9" id="6Od11GYafrL" role="2OqNvi">
+                                              <node concept="30H73N" id="6Od11GYah5_" role="12$y8L" />
+                                            </node>
+                                          </node>
+                                          <node concept="iZEcu" id="6Od11GYafrN" role="2OqNvi" />
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="6Od11GYafrO" role="2OqNvi">
+                                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="6Od11GYabM6" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                          <node concept="2OqwBi" id="6Od11GYacGV" role="37wK5m">
+                            <node concept="1jxXqW" id="6Od11GYacax" role="2Oq$k0" />
+                            <node concept="liA8E" id="6Od11GYadnL" role="2OqNvi">
+                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3Tqbb2" id="6Od11GYaswN" role="10QFUM">
+                        <ref role="ehGHo" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+                      </node>
+                    </node>
+                    <node concept="17Uvod" id="6Od11GYak$f" role="lGtFl">
+                      <property role="2qtEX9" value="name" />
+                      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                      <node concept="3zFVjK" id="6Od11GYak$g" role="3zH0cK">
+                        <node concept="3clFbS" id="6Od11GYak$h" role="2VODD2">
+                          <node concept="3clFbF" id="6Od11GYal2b" role="3cqZAp">
+                            <node concept="2OqwBi" id="6Od11GYal2c" role="3clFbG">
+                              <node concept="1iwH7S" id="6Od11GYal2d" role="2Oq$k0" />
+                              <node concept="2piZGk" id="6Od11GYal2e" role="2OqNvi">
+                                <node concept="3zGtF$" id="6Od11GYal2f" role="2piZGb" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2RIzFJ7GTQP" role="3cqZAp">
+                  <node concept="2YIFZM" id="2RIzFJ7GTQQ" role="3clFbG">
+                    <ref role="37wK5l" to="mqum:3zBhpJM4BmM" resolve="showDiffDialog" />
+                    <ref role="1Pybhc" to="mqum:3zBhpJM4ANC" resolve="DiffView" />
+                    <node concept="37vLTw" id="2RIzFJ7GTQR" role="37wK5m">
+                      <ref role="3cqZAo" node="2RIzFJ7GTQb" resolve="origExpected" />
+                    </node>
+                    <node concept="37vLTw" id="2RIzFJ7GTQS" role="37wK5m">
+                      <ref role="3cqZAo" node="6Qumy0DZmA1" resolve="actualNode" />
+                      <node concept="29HgVG" id="2RIzFJ7GTQT" role="lGtFl">
+                        <node concept="3NFfHV" id="2RIzFJ7GTQU" role="3NFExx">
+                          <node concept="3clFbS" id="2RIzFJ7GTQV" role="2VODD2">
+                            <node concept="3clFbF" id="2RIzFJ7GTQW" role="3cqZAp">
+                              <node concept="2OqwBi" id="2RIzFJ7GTQX" role="3clFbG">
+                                <node concept="3TrEf2" id="2RIzFJ7GTQY" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpe3:7jPoEeD$ZP5" resolve="actual" />
+                                </node>
+                                <node concept="30H73N" id="2RIzFJ7GTQZ" role="2Oq$k0" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="2RIzFJ7HyUL" role="37wK5m">
+                      <ref role="3cqZAo" node="2RIzFJ7HwXj" resolve="result" />
+                      <node concept="1ZhdrF" id="2RIzFJ7I8NH" role="lGtFl">
+                        <property role="2qtEX8" value="variableDeclaration" />
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                        <node concept="3$xsQk" id="2RIzFJ7I8NI" role="3$ytzL">
+                          <node concept="3clFbS" id="2RIzFJ7I8NJ" role="2VODD2">
+                            <node concept="3clFbF" id="2RIzFJ7I9cP" role="3cqZAp">
+                              <node concept="2OqwBi" id="2RIzFJ7I9B6" role="3clFbG">
+                                <node concept="1iwH7S" id="2RIzFJ7I9cO" role="2Oq$k0" />
+                                <node concept="1iwH70" id="2RIzFJ7Ib9V" role="2OqNvi">
+                                  <ref role="1iwH77" node="2RIzFJ7I7bZ" resolve="compareResult" />
+                                  <node concept="30H73N" id="2RIzFJ7Ibyp" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="6Od11GYap_v" role="37wK5m">
+                      <ref role="3cqZAo" node="6Od11GYaj1i" resolve="input" />
+                    </node>
+                    <node concept="2OqwBi" id="2RIzFJ7H23D" role="37wK5m">
+                      <node concept="1jxXqW" id="6Od11GY9g4Z" role="2Oq$k0" />
+                      <node concept="liA8E" id="2RIzFJ7H23F" role="2OqNvi">
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="2RIzFJ7GTRV" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="2RIzFJ7GMd2" role="30HLyM">
+        <node concept="3clFbS" id="2RIzFJ7GMd3" role="2VODD2">
+          <node concept="3SKdUt" id="2RIzFJ7Ha26" role="3cqZAp">
+            <node concept="1PaTwC" id="2RIzFJ7Ha27" role="1aUNEU">
+              <node concept="3oM_SD" id="2RIzFJ7Hafw" role="1PaTwD">
+                <property role="3oM_SC" value="can" />
+              </node>
+              <node concept="3oM_SD" id="2RIzFJ7HafF" role="1PaTwD">
+                <property role="3oM_SC" value="be" />
+              </node>
+              <node concept="3oM_SD" id="2RIzFJ7Hagl" role="1PaTwD">
+                <property role="3oM_SC" value="edited" />
+              </node>
+              <node concept="3oM_SD" id="2RIzFJ7Haep" role="1PaTwD">
+                <property role="3oM_SC" value="in" />
+              </node>
+              <node concept="3oM_SD" id="2RIzFJ7Haew" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2RIzFJ7HaeE" role="1PaTwD">
+                <property role="3oM_SC" value="case" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2RIzFJ7GMgX" role="3cqZAp">
+            <node concept="2OqwBi" id="2RIzFJ7GNa7" role="3clFbG">
+              <node concept="2OqwBi" id="2RIzFJ7GM$a" role="2Oq$k0">
+                <node concept="30H73N" id="2RIzFJ7GMgW" role="2Oq$k0" />
+                <node concept="3TrEf2" id="2RIzFJ7GMWK" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpe3:7jPoEeD$ZP4" resolve="expected" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="2RIzFJ7GNxq" role="2OqNvi">
+                <node concept="chp4Y" id="2RIzFJ7GNBG" role="cj9EA">
+                  <ref role="cht4Q" to="tp5g:hBxON8j" resolve="TestNodeReference" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="2RIzFJ7GMcW" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+      <node concept="30G5F_" id="2RIzFJ7GNR7" role="30HLyM">
+        <node concept="3clFbS" id="2RIzFJ7GNR8" role="2VODD2">
+          <node concept="3clFbF" id="2RIzFJ7GNRc" role="3cqZAp">
+            <node concept="3fqX7Q" id="2RIzFJ7GO2M" role="3clFbG">
+              <node concept="2OqwBi" id="2RIzFJ7GO2O" role="3fr31v">
+                <node concept="2OqwBi" id="2RIzFJ7GO2P" role="2Oq$k0">
+                  <node concept="30H73N" id="2RIzFJ7GO2Q" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="2RIzFJ7GO2R" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tpe3:7jPoEeD$ZP4" resolve="expected" />
+                  </node>
+                </node>
+                <node concept="1mIQ4w" id="2RIzFJ7GO2S" role="2OqNvi">
+                  <node concept="chp4Y" id="2RIzFJ7GO2T" role="cj9EA">
+                    <ref role="cht4Q" to="tp5g:hBxON8j" resolve="TestNodeReference" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Koe21" id="2RIzFJ7H6C3" role="1lVwrX">
+        <node concept="1LZb2c" id="2RIzFJ7H6C4" role="1Koe22">
+          <property role="TrG5h" value="foo" />
+          <node concept="3cqZAl" id="2RIzFJ7H6C5" role="3clF45" />
+          <node concept="3clFbS" id="2RIzFJ7H6C6" role="3clF47">
+            <node concept="3cpWs8" id="2RIzFJ7HzJK" role="3cqZAp">
+              <node concept="3cpWsn" id="2RIzFJ7HzJN" role="3cpWs9">
+                <property role="TrG5h" value="result" />
+                <node concept="3uibUv" id="2RIzFJ7HzJO" role="1tU5fm">
+                  <ref role="3uigEE" to="mqum:494SuRWLRaN" resolve="MPSNodeComparisonResult" />
+                </node>
+                <node concept="10Nm6u" id="2RIzFJ7HzJP" role="33vP2m" />
+              </node>
+            </node>
+            <node concept="9aQIb" id="2RIzFJ7H6C7" role="3cqZAp">
+              <node concept="3clFbS" id="2RIzFJ7H6C8" role="9aQI4">
+                <node concept="3cpWs8" id="6Od11GYalx3" role="3cqZAp">
+                  <node concept="3cpWsn" id="6Od11GYalx4" role="3cpWs9">
+                    <property role="TrG5h" value="input" />
+                    <node concept="3Tqbb2" id="6Od11GYalx5" role="1tU5fm">
+                      <ref role="ehGHo" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+                    </node>
+                    <node concept="10QFUN" id="6Od11GYasVL" role="33vP2m">
+                      <node concept="2OqwBi" id="6Od11GYalx6" role="10QFUP">
+                        <node concept="2YIFZM" id="6Od11GYalx7" role="2Oq$k0">
+                          <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                          <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                          <node concept="Xl_RD" id="6Od11GYalx8" role="37wK5m">
+                            <property role="Xl_RC" value="assertId" />
+                            <node concept="17Uvod" id="6Od11GYalx9" role="lGtFl">
+                              <property role="2qtEX9" value="value" />
+                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                              <node concept="3zFVjK" id="6Od11GYalxa" role="3zH0cK">
+                                <node concept="3clFbS" id="6Od11GYalxb" role="2VODD2">
+                                  <node concept="3clFbF" id="6Od11GYalxc" role="3cqZAp">
+                                    <node concept="2OqwBi" id="6Od11GYalxd" role="3clFbG">
+                                      <node concept="2JrnkZ" id="6Od11GYalxe" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="6Od11GYalxf" role="2JrQYb">
+                                          <node concept="2OqwBi" id="6Od11GYalxg" role="2Oq$k0">
+                                            <node concept="1iwH7S" id="6Od11GYalxh" role="2Oq$k0" />
+                                            <node concept="12$id9" id="6Od11GYalxi" role="2OqNvi">
+                                              <node concept="30H73N" id="6Od11GYalxj" role="12$y8L" />
+                                            </node>
+                                          </node>
+                                          <node concept="iZEcu" id="6Od11GYalxk" role="2OqNvi" />
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="6Od11GYalxl" role="2OqNvi">
+                                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="6Od11GYalxm" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                          <node concept="2OqwBi" id="6Od11GYalxn" role="37wK5m">
+                            <node concept="1jxXqW" id="6Od11GYalxo" role="2Oq$k0" />
+                            <node concept="liA8E" id="6Od11GYalxp" role="2OqNvi">
+                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3Tqbb2" id="6Od11GYasVM" role="10QFUM">
+                        <ref role="ehGHo" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+                      </node>
+                    </node>
+                    <node concept="17Uvod" id="6Od11GYalxq" role="lGtFl">
+                      <property role="2qtEX9" value="name" />
+                      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                      <node concept="3zFVjK" id="6Od11GYalxr" role="3zH0cK">
+                        <node concept="3clFbS" id="6Od11GYalxs" role="2VODD2">
+                          <node concept="3clFbF" id="6Od11GYalxt" role="3cqZAp">
+                            <node concept="2OqwBi" id="6Od11GYalxu" role="3clFbG">
+                              <node concept="1iwH7S" id="6Od11GYalxv" role="2Oq$k0" />
+                              <node concept="2piZGk" id="6Od11GYalxw" role="2OqNvi">
+                                <node concept="3zGtF$" id="6Od11GYalxx" role="2piZGb" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2RIzFJ7H7TB" role="3cqZAp">
+                  <node concept="2YIFZM" id="5oR1gCFTGb0" role="3clFbG">
+                    <ref role="37wK5l" to="mqum:5oR1gCFT7ZE" resolve="showNonEditibleDiff" />
+                    <ref role="1Pybhc" to="mqum:3zBhpJM4ANC" resolve="DiffView" />
+                    <node concept="37vLTw" id="5oR1gCFTGb1" role="37wK5m">
+                      <ref role="3cqZAo" node="6Qumy0DZm_X" resolve="expectedNode" />
+                      <node concept="29HgVG" id="5oR1gCFTGb2" role="lGtFl">
+                        <node concept="3NFfHV" id="5oR1gCFTGb3" role="3NFExx">
+                          <node concept="3clFbS" id="5oR1gCFTGb4" role="2VODD2">
+                            <node concept="3clFbF" id="5oR1gCFTGb5" role="3cqZAp">
+                              <node concept="2OqwBi" id="5oR1gCFTGb6" role="3clFbG">
+                                <node concept="3TrEf2" id="5oR1gCFTGb7" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpe3:7jPoEeD$ZP4" resolve="expected" />
+                                </node>
+                                <node concept="30H73N" id="5oR1gCFTGb8" role="2Oq$k0" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="5oR1gCFTGb9" role="37wK5m">
+                      <ref role="3cqZAo" node="6Qumy0DZmA1" resolve="actualNode" />
+                      <node concept="29HgVG" id="5oR1gCFTGba" role="lGtFl">
+                        <node concept="3NFfHV" id="5oR1gCFTGbb" role="3NFExx">
+                          <node concept="3clFbS" id="5oR1gCFTGbc" role="2VODD2">
+                            <node concept="3clFbF" id="5oR1gCFTGbd" role="3cqZAp">
+                              <node concept="2OqwBi" id="5oR1gCFTGbe" role="3clFbG">
+                                <node concept="3TrEf2" id="5oR1gCFTGbf" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpe3:7jPoEeD$ZP5" resolve="actual" />
+                                </node>
+                                <node concept="30H73N" id="5oR1gCFTGbg" role="2Oq$k0" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="5oR1gCFTGbh" role="37wK5m">
+                      <ref role="3cqZAo" node="2RIzFJ7HzJN" resolve="result" />
+                      <node concept="1ZhdrF" id="5oR1gCFTGbi" role="lGtFl">
+                        <property role="2qtEX8" value="variableDeclaration" />
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                        <node concept="3$xsQk" id="5oR1gCFTGbj" role="3$ytzL">
+                          <node concept="3clFbS" id="5oR1gCFTGbk" role="2VODD2">
+                            <node concept="3clFbF" id="5oR1gCFTGbl" role="3cqZAp">
+                              <node concept="2OqwBi" id="5oR1gCFTGbm" role="3clFbG">
+                                <node concept="1iwH7S" id="5oR1gCFTGbn" role="2Oq$k0" />
+                                <node concept="1iwH70" id="5oR1gCFTGbo" role="2OqNvi">
+                                  <ref role="1iwH77" node="2RIzFJ7I7bZ" resolve="compareResult" />
+                                  <node concept="30H73N" id="5oR1gCFTGbp" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="5oR1gCFTGbq" role="37wK5m">
+                      <ref role="3cqZAo" node="6Od11GYalx4" resolve="input" />
+                    </node>
+                    <node concept="2OqwBi" id="5oR1gCFTGbr" role="37wK5m">
+                      <node concept="1jxXqW" id="5oR1gCFTGbs" role="2Oq$k0" />
+                      <node concept="liA8E" id="5oR1gCFTGbt" role="2OqNvi">
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="2RIzFJ7H6D3" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps
index 4ca84c472c..d83fda52ae 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps
@@ -5,7 +5,188 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="8do3" ref="r:cea04c4b-adba-417e-a192-34c7a8799ac1(com.mbeddr.mpsutil.compare.structure)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+  </imports>
+  <registry>
+    <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" />
+      <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1224071154655" name="jetbrains.mps.baseLanguage.structure.AsExpression" flags="nn" index="0kSF2">
+        <child id="1224071154657" name="classifierType" index="0kSFW" />
+        <child id="1224071154656" name="expression" index="0kSFX" />
+      </concept>
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <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="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </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="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
+        <child id="1163668914799" name="condition" index="3K4Cdx" />
+        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
+        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
+    </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>
+  </registry>
+  <node concept="13h7C7" id="6Od11GY7saA">
+    <ref role="13h7C2" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+    <node concept="13i0hz" id="6Od11GY7tDO" role="13h7CS">
+      <property role="TrG5h" value="setDiffFlag" />
+      <node concept="37vLTG" id="6Od11GY7vAi" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="6Od11GY7vC$" role="1tU5fm" />
+      </node>
+      <node concept="3Tm1VV" id="6Od11GY7tDP" role="1B3o_S" />
+      <node concept="3cqZAl" id="6Od11GY7tEI" role="3clF45" />
+      <node concept="3clFbS" id="6Od11GY7tDR" role="3clF47">
+        <node concept="3clFbF" id="6Od11GY8L71" role="3cqZAp">
+          <node concept="2OqwBi" id="6Od11GY8L73" role="3clFbG">
+            <node concept="2JrnkZ" id="6Od11GY8L74" role="2Oq$k0">
+              <node concept="13iPFW" id="6Od11GY8L75" role="2JrQYb" />
+            </node>
+            <node concept="liA8E" id="6Od11GY8L76" role="2OqNvi">
+              <ref role="37wK5l" to="mhbf:~SNode.putUserObject(java.lang.Object,java.lang.Object)" resolve="putUserObject" />
+              <node concept="Xl_RD" id="6Od11GY8L77" role="37wK5m">
+                <property role="Xl_RC" value="diff" />
+              </node>
+              <node concept="37vLTw" id="6Od11GY8L78" role="37wK5m">
+                <ref role="3cqZAo" node="6Od11GY7vAi" resolve="flag" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="6Od11GY7tN$" role="13h7CS">
+      <property role="TrG5h" value="isDiffEnabled" />
+      <node concept="3Tm1VV" id="6Od11GY7tN_" role="1B3o_S" />
+      <node concept="10P_77" id="6Od11GY7tOd" role="3clF45" />
+      <node concept="3clFbS" id="6Od11GY7tNB" role="3clF47">
+        <node concept="3clFbF" id="6Od11GY8LEV" role="3cqZAp">
+          <node concept="3K4zz7" id="6Od11GY8LEF" role="3clFbG">
+            <node concept="3clFbT" id="6Od11GY8LTJ" role="3K4E3e" />
+            <node concept="3clFbC" id="6Od11GY8LM1" role="3K4Cdx">
+              <node concept="10Nm6u" id="6Od11GY8LQK" role="3uHU7w" />
+              <node concept="2OqwBi" id="6Od11GY7wc4" role="3uHU7B">
+                <node concept="2JrnkZ" id="6Od11GY7vWZ" role="2Oq$k0">
+                  <node concept="13iPFW" id="6Od11GY7vH0" role="2JrQYb" />
+                </node>
+                <node concept="liA8E" id="6Od11GY7wjy" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getUserObject(java.lang.Object)" resolve="getUserObject" />
+                  <node concept="Xl_RD" id="6Od11GY7wj_" role="37wK5m">
+                    <property role="Xl_RC" value="diff" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1Wc70l" id="NgM4xWLlMc" role="3K4GZi">
+              <node concept="3fqX7Q" id="NgM4xWLoue" role="3uHU7w">
+                <node concept="2OqwBi" id="NgM4xWLoug" role="3fr31v">
+                  <node concept="2YIFZM" id="NgM4xWLouh" role="2Oq$k0">
+                    <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+                    <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
+                  </node>
+                  <node concept="liA8E" id="NgM4xWLoui" role="2OqNvi">
+                    <ref role="37wK5l" to="bd8o:~Application.isHeadlessEnvironment()" resolve="isHeadlessEnvironment" />
+                  </node>
+                </node>
+              </node>
+              <node concept="0kSF2" id="6Od11GY8M34" role="3uHU7B">
+                <node concept="3uibUv" id="6Od11GY8M36" role="0kSFW">
+                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                </node>
+                <node concept="2OqwBi" id="6Od11GY8LWJ" role="0kSFX">
+                  <node concept="2JrnkZ" id="6Od11GY8LWK" role="2Oq$k0">
+                    <node concept="13iPFW" id="6Od11GY8LWL" role="2JrQYb" />
+                  </node>
+                  <node concept="liA8E" id="6Od11GY8LWM" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNode.getUserObject(java.lang.Object)" resolve="getUserObject" />
+                    <node concept="Xl_RD" id="6Od11GY8LWN" role="37wK5m">
+                      <property role="Xl_RC" value="diff" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="6Od11GY7saB" role="13h7CW">
+      <node concept="3clFbS" id="6Od11GY7saC" role="2VODD2" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps
index 92df2d727b..befcfe03ea 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps
@@ -13,6 +13,11 @@
     <import index="tpch" ref="r:00000000-0000-4000-0000-011c8959028d(jetbrains.mps.lang.structure.editor)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="qqrq" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.components(MPS.IDEA/)" />
+    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
+    <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="qjvf" ref="r:82cadfba-0fcc-402e-8eaa-37395d383fb6(com.mbeddr.mpsutil.compare.behavior)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
@@ -34,6 +39,7 @@
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
+      <concept id="1239814640496" name="jetbrains.mps.lang.editor.structure.CellLayout_VerticalGrid" flags="nn" index="2EHx9g" />
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
@@ -49,6 +55,9 @@
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
+      <concept id="1103016434866" name="jetbrains.mps.lang.editor.structure.CellModel_JComponent" flags="sg" stub="8104358048506731196" index="3gTLQM">
+        <child id="1176475119347" name="componentProvider" index="3FoqZy" />
+      </concept>
       <concept id="1139535219966" name="jetbrains.mps.lang.editor.structure.CellActionMapDeclaration" flags="ig" index="1h_SRR">
         <reference id="1139535219968" name="applicableConcept" index="1h_SK9" />
         <child id="1139535219969" name="item" index="1h_SK8" />
@@ -85,6 +94,7 @@
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
+      <concept id="1176474535556" name="jetbrains.mps.lang.editor.structure.QueryFunction_JComponent" flags="in" index="3Fmcul" />
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
         <child id="1225898971709" name="getter" index="1Hhtcw" />
       </concept>
@@ -97,22 +107,71 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
       <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="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
       <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="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </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="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -120,11 +179,26 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </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" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </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">
@@ -277,7 +351,152 @@
           </node>
           <node concept="2iRfu4" id="3qPjHtYqVRC" role="2iSdaV" />
         </node>
-        <node concept="2iRkQZ" id="3qPjHtYqUHI" role="2iSdaV" />
+        <node concept="3EZMnI" id="2RIzFJ85D85" role="3EZMnx">
+          <node concept="VPM3Z" id="2RIzFJ85D86" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="2iRfu4" id="2RIzFJ85D8e" role="2iSdaV" />
+          <node concept="3F0ifn" id="6Od11GY6B$F" role="3EZMnx">
+            <property role="3F0ifm" value="(" />
+          </node>
+          <node concept="3F0ifn" id="6Od11GY6B_f" role="3EZMnx">
+            <property role="3F0ifm" value="show diff:" />
+          </node>
+          <node concept="3EZMnI" id="6Od11GYaZ8i" role="3EZMnx">
+            <node concept="VPM3Z" id="6Od11GYaZ8k" role="3F10Kt" />
+            <node concept="2iRfu4" id="6Od11GYaZ8n" role="2iSdaV" />
+            <node concept="3gTLQM" id="6Od11GY5TbS" role="3EZMnx">
+              <node concept="3Fmcul" id="6Od11GY5TbT" role="3FoqZy">
+                <node concept="3clFbS" id="6Od11GY5TbU" role="2VODD2">
+                  <node concept="3cpWs8" id="6Od11GY5Too" role="3cqZAp">
+                    <node concept="3cpWsn" id="6Od11GY5Top" role="3cpWs9">
+                      <property role="TrG5h" value="box" />
+                      <node concept="3uibUv" id="6Od11GY5Toq" role="1tU5fm">
+                        <ref role="3uigEE" to="qqrq:~JBCheckBox" resolve="JBCheckBox" />
+                      </node>
+                      <node concept="2ShNRf" id="6Od11GY5Tpi" role="33vP2m">
+                        <node concept="1pGfFk" id="6Od11GY5Tph" role="2ShVmc">
+                          <ref role="37wK5l" to="qqrq:~JBCheckBox.&lt;init&gt;()" resolve="JBCheckBox" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbJ" id="6Od11GYaHRq" role="3cqZAp">
+                    <node concept="3clFbS" id="6Od11GYaHRs" role="3clFbx">
+                      <node concept="3clFbF" id="6Od11GYaOna" role="3cqZAp">
+                        <node concept="2OqwBi" id="6Od11GYaOnb" role="3clFbG">
+                          <node concept="pncrf" id="6Od11GYaOnc" role="2Oq$k0" />
+                          <node concept="2qgKlT" id="6Od11GYaOnd" role="2OqNvi">
+                            <ref role="37wK5l" to="qjvf:6Od11GY7tDO" resolve="setDiffFlag" />
+                            <node concept="3clFbT" id="6Od11GYaOne" role="37wK5m" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3fqX7Q" id="6Od11GYaNAM" role="3clFbw">
+                      <node concept="2OqwBi" id="6Od11GYaNAO" role="3fr31v">
+                        <node concept="37vLTw" id="6Od11GYaNAP" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6Od11GY5Top" resolve="box" />
+                        </node>
+                        <node concept="liA8E" id="6Od11GYaNAQ" role="2OqNvi">
+                          <ref role="37wK5l" to="dxuu:~AbstractButton.isSelected()" resolve="isSelected" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="6Od11GY7dxq" role="3cqZAp">
+                    <node concept="2OqwBi" id="6Od11GY7esA" role="3clFbG">
+                      <node concept="37vLTw" id="6Od11GY7dxo" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6Od11GY5Top" resolve="box" />
+                      </node>
+                      <node concept="liA8E" id="6Od11GY7gdw" role="2OqNvi">
+                        <ref role="37wK5l" to="dxuu:~AbstractButton.addItemListener(java.awt.event.ItemListener)" resolve="addItemListener" />
+                        <node concept="2ShNRf" id="6Od11GY7gmK" role="37wK5m">
+                          <node concept="YeOm9" id="6Od11GY7hig" role="2ShVmc">
+                            <node concept="1Y3b0j" id="6Od11GY7hij" role="YeSDq">
+                              <property role="2bfB8j" value="true" />
+                              <ref role="1Y3XeK" to="hyam:~ItemListener" resolve="ItemListener" />
+                              <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                              <node concept="3Tm1VV" id="6Od11GY7hik" role="1B3o_S" />
+                              <node concept="3clFb_" id="6Od11GY7hip" role="jymVt">
+                                <property role="TrG5h" value="itemStateChanged" />
+                                <node concept="3Tm1VV" id="6Od11GY7hiq" role="1B3o_S" />
+                                <node concept="3cqZAl" id="6Od11GY7his" role="3clF45" />
+                                <node concept="37vLTG" id="6Od11GY7hit" role="3clF46">
+                                  <property role="TrG5h" value="e" />
+                                  <node concept="3uibUv" id="6Od11GY7hiu" role="1tU5fm">
+                                    <ref role="3uigEE" to="hyam:~ItemEvent" resolve="ItemEvent" />
+                                  </node>
+                                </node>
+                                <node concept="3clFbS" id="6Od11GY7hiv" role="3clF47">
+                                  <node concept="3clFbJ" id="6Od11GY7Qa5" role="3cqZAp">
+                                    <node concept="3clFbS" id="6Od11GY7Qa7" role="3clFbx">
+                                      <node concept="3clFbF" id="6Od11GY7SyY" role="3cqZAp">
+                                        <node concept="2OqwBi" id="6Od11GY7SXA" role="3clFbG">
+                                          <node concept="pncrf" id="6Od11GY7SyX" role="2Oq$k0" />
+                                          <node concept="2qgKlT" id="6Od11GY7UxQ" role="2OqNvi">
+                                            <ref role="37wK5l" to="qjvf:6Od11GY7tDO" resolve="setDiffFlag" />
+                                            <node concept="3clFbT" id="6Od11GY82en" role="37wK5m">
+                                              <property role="3clFbU" value="true" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbC" id="6Od11GY7QXU" role="3clFbw">
+                                      <node concept="10M0yZ" id="6Od11GY7QXV" role="3uHU7w">
+                                        <ref role="3cqZAo" to="hyam:~ItemEvent.SELECTED" resolve="SELECTED" />
+                                        <ref role="1PxDUh" to="hyam:~ItemEvent" resolve="ItemEvent" />
+                                      </node>
+                                      <node concept="2OqwBi" id="6Od11GY7QXW" role="3uHU7B">
+                                        <node concept="37vLTw" id="6Od11GY7QXX" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="6Od11GY7hit" resolve="e" />
+                                        </node>
+                                        <node concept="liA8E" id="6Od11GY7QXY" role="2OqNvi">
+                                          <ref role="37wK5l" to="hyam:~ItemEvent.getStateChange()" resolve="getStateChange" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="9aQIb" id="6Od11GY83IY" role="9aQIa">
+                                      <node concept="3clFbS" id="6Od11GY83IZ" role="9aQI4">
+                                        <node concept="3clFbF" id="6Od11GY85ng" role="3cqZAp">
+                                          <node concept="2OqwBi" id="6Od11GY85M7" role="3clFbG">
+                                            <node concept="pncrf" id="6Od11GY85nf" role="2Oq$k0" />
+                                            <node concept="2qgKlT" id="6Od11GY87Ur" role="2OqNvi">
+                                              <ref role="37wK5l" to="qjvf:6Od11GY7tDO" resolve="setDiffFlag" />
+                                              <node concept="3clFbT" id="6Od11GY882k" role="37wK5m" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="2AHcQZ" id="6Od11GY7hix" role="2AJF6D">
+                                  <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="6Od11GY6C6T" role="3cqZAp">
+                    <node concept="37vLTw" id="6Od11GY6C6R" role="3clFbG">
+                      <ref role="3cqZAo" node="6Od11GY5Top" resolve="box" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3F0ifn" id="6Od11GY6B_Q" role="3EZMnx">
+            <property role="3F0ifm" value=")" />
+          </node>
+        </node>
+        <node concept="3F0ifn" id="6HovwvvKpY8" role="3EZMnx" />
+        <node concept="2EHx9g" id="6HovwvvKqbc" role="2iSdaV" />
       </node>
       <node concept="l2Vlx" id="i0MG184" role="2iSdaV" />
     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps
index 6f759b6967..d6a1b212f9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps
@@ -2,7 +2,6 @@
 <model ref="r:cea04c4b-adba-417e-a192-34c7a8799ac1(com.mbeddr.mpsutil.compare.structure)">
   <persistence version="9" />
   <languages>
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd
new file mode 100644
index 0000000000..edd8c2d476
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="com.mbeddr.mpsutil.comparator.diff.demo.genplan" uuid="a83addf6-6ea9-4504-83d6-0211dab89b0f" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <sourcePath />
+  <languageVersions>
+    <language slang="l:e0989c7a-8149-4be7-97b6-0b78561af099:com.mbeddr.demo.comparator.diff" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="1" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="a83addf6-6ea9-4504-83d6-0211dab89b0f(com.mbeddr.mpsutil.comparator.diff.demo.genplan)" version="0" />
+  </dependencyVersions>
+</solution>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps
new file mode 100644
index 0000000000..a795596070
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:041813a1-7c05-4ebf-89a6-19fe04baecd0(com.mbeddr.demo.comparator.diff.genplan)">
+  <persistence version="9" />
+  <languages>
+    <use id="e0989c7a-8149-4be7-97b6-0b78561af099" name="com.mbeddr.demo.comparator.diff" version="0" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
+  </languages>
+  <imports />
+  <registry>
+    <language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
+      <concept id="1152961914448136207" name="jetbrains.mps.lang.generator.plan.structure.LanguageEntry" flags="ng" index="2Qf6Nf">
+        <child id="1152961914448136208" name="language" index="2Qf6Ng" />
+      </concept>
+      <concept id="1820634577908471803" name="jetbrains.mps.lang.generator.plan.structure.Plan" flags="ng" index="2VgMpV">
+        <child id="1820634577908471815" name="steps" index="2VgMA7" />
+      </concept>
+      <concept id="1820634577908471810" name="jetbrains.mps.lang.generator.plan.structure.Transform" flags="ng" index="2VgMA2">
+        <property id="2209292798354050154" name="individualStepPerGenerator" index="1s431M" />
+        <child id="1152961914448142326" name="entries" index="2Qf7GQ" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="3542851458883438784" name="jetbrains.mps.lang.smodel.structure.LanguageId" flags="nn" index="2V$Bhx">
+        <property id="3542851458883439831" name="namespace" index="2V$B1Q" />
+        <property id="3542851458883439832" name="languageId" index="2V$B1T" />
+      </concept>
+    </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>
+  </registry>
+  <node concept="2VgMpV" id="33$34j7NgNF">
+    <property role="TrG5h" value="demo.plan" />
+    <node concept="2VgMA2" id="33$34j7NgNH" role="2VgMA7">
+      <property role="1s431M" value="true" />
+      <node concept="2Qf6Nf" id="33$34j7NgNK" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="33$34j7NgNO" role="2Qf6Ng">
+          <property role="2V$B1T" value="e0989c7a-8149-4be7-97b6-0b78561af099" />
+          <property role="2V$B1Q" value="com.mbeddr.demo.comparator.diff" />
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd
new file mode 100644
index 0000000000..877fcccd75
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="com.mbeddr.mpsutil.comparator.diff.demo.tests" uuid="5fc729b8-2fff-48a5-9bd3-4c1aaad33d23" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">2c9058b6-7cd8-4623-82a3-e4c07c3eddff(com.mbeddr.mpsutil.generatorfacade)</dependency>
+    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">7ab1a6fa-0a11-4b95-9e48-75f363d6cb00(jetbrains.mps.lang.generator.plan)</dependency>
+    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+    <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
+    <dependency reexport="false">a83addf6-6ea9-4504-83d6-0211dab89b0f(com.mbeddr.mpsutil.comparator.diff.demo.genplan)</dependency>
+    <dependency reexport="false">479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)</dependency>
+    <dependency reexport="false">215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:e0989c7a-8149-4be7-97b6-0b78561af099:com.mbeddr.demo.comparator.diff" version="0" />
+    <language slang="l:f47b95d4-5e73-4c04-9204-18076950153b:com.mbeddr.mpsutil.compare" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="a83addf6-6ea9-4504-83d6-0211dab89b0f(com.mbeddr.mpsutil.comparator.diff.demo.genplan)" version="0" />
+    <module reference="5fc729b8-2fff-48a5-9bd3-4c1aaad33d23(com.mbeddr.mpsutil.comparator.diff.demo.tests)" version="0" />
+    <module reference="2c9058b6-7cd8-4623-82a3-e4c07c3eddff(com.mbeddr.mpsutil.generatorfacade)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00(jetbrains.mps.lang.generator.plan)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
new file mode 100644
index 0000000000..853627e317
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
@@ -0,0 +1,931 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:7e1cdbc4-24e4-458b-b337-9e688e689139(com.mbeddr.demo.compafator.diff.tests.diffs@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
+    <use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="0" />
+    <use id="f47b95d4-5e73-4c04-9204-18076950153b" name="com.mbeddr.mpsutil.compare" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+  </languages>
+  <imports>
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
+    <import index="ap4t" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.generator(MPS.Core/)" />
+    <import index="ne25" ref="r:00bd75cf-1225-4ef5-9a7e-390aed8718dd(com.mbeddr.mpsutil.generatorfacade.runtime)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="bjdw" ref="r:4a23ef0d-9c2f-48a6-8597-fbdd5b11f792(jetbrains.mps.lang.generator.plan.structure)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
+    <import index="6skw" ref="r:041813a1-7c05-4ebf-89a6-19fe04baecd0(com.mbeddr.demo.comparator.diff.genplan)" />
+    <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="iuxj" ref="r:64db3a92-5968-4a73-b456-34504a2d97a6(jetbrains.mps.core.xml.structure)" />
+    <import index="ap4u" ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd/java:jetbrains.mps.generator(MPS.Generator/)" />
+  </imports>
+  <registry>
+    <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
+        <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
+      </concept>
+      <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
+      <concept id="1225469856668" name="jetbrains.mps.lang.test.structure.ModelExpression" flags="nn" index="1jGwE1" />
+      <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
+        <child id="1216993439383" name="methods" index="1qtyYc" />
+        <child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
+        <child id="1217501895093" name="testMethods" index="1SL9yI" />
+      </concept>
+      <concept id="1216989428737" name="jetbrains.mps.lang.test.structure.TestNode" flags="ng" index="1qefOq">
+        <child id="1216989461394" name="nodeToCheck" index="1qenE9" />
+      </concept>
+      <concept id="1210673684636" name="jetbrains.mps.lang.test.structure.TestNodeAnnotation" flags="ng" index="3xLA65" />
+      <concept id="1210674524691" name="jetbrains.mps.lang.test.structure.TestNodeReference" flags="nn" index="3xONca">
+        <reference id="1210674534086" name="declaration" index="3xOPvv" />
+      </concept>
+      <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
+        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
+      </concept>
+      <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="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
+      <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="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
+      <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="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml">
+      <concept id="6666499814681415858" name="jetbrains.mps.core.xml.structure.XmlElement" flags="ng" index="2pNNFK">
+        <property id="6666499814681415862" name="tagName" index="2pNNFO" />
+        <child id="1622293396948928802" name="content" index="3o6s8t" />
+      </concept>
+      <concept id="1622293396948952339" name="jetbrains.mps.core.xml.structure.XmlText" flags="nn" index="3o6iSG">
+        <property id="1622293396948953704" name="value" index="3o6i5n" />
+      </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="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
+      <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+        <reference id="1205756909548" name="member" index="2WH_rO" />
+      </concept>
+      <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
+      <concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
+        <child id="1205770614681" name="actualArgument" index="2XxRq1" />
+      </concept>
+    </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
+        <reference id="5455284157994012188" name="link" index="2pIpSl" />
+        <child id="1595412875168045827" name="initValue" index="28nt2d" />
+      </concept>
+      <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
+        <reference id="5455284157993911078" name="property" index="2pJxcJ" />
+        <child id="1595412875168045201" name="initValue" index="28ntcv" />
+      </concept>
+      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
+        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
+      </concept>
+      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
+        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
+        <child id="5455284157993911099" name="values" index="2pJxcM" />
+      </concept>
+      <concept id="6985522012210254362" name="jetbrains.mps.lang.quotation.structure.NodeBuilderPropertyExpression" flags="nn" index="WxPPo">
+        <child id="6985522012210254363" name="expression" index="WxPPp" />
+      </concept>
+    </language>
+    <language id="f47b95d4-5e73-4c04-9204-18076950153b" name="com.mbeddr.mpsutil.compare">
+      <concept id="756135271275943220" name="com.mbeddr.mpsutil.compare.structure.AssertNodeEquals" flags="ng" index="3GXo0L" />
+    </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
+        <reference id="7256306938026143658" name="target" index="2aWVGs" />
+      </concept>
+      <concept id="361130699826193248" name="jetbrains.mps.lang.modelapi.structure.ModelPointer" flags="ng" index="1dCxOl">
+        <property id="1863527487546097494" name="modelId" index="1XweGQ" />
+        <child id="679099339649067980" name="name" index="1j$8Uc" />
+      </concept>
+      <concept id="679099339649053840" name="jetbrains.mps.lang.modelapi.structure.ModelName" flags="ng" index="1j_P7g">
+        <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>
+    </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="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
+        <child id="7400021826774799510" name="ref" index="2tJFKM" />
+      </concept>
+      <concept id="4065387505485742666" name="jetbrains.mps.lang.smodel.structure.ModelPointer_ResolveOperation" flags="ng" index="2yCiCJ" />
+      <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
+        <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
+      </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="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
+      <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
+        <child id="6750920497477046361" name="conceptArgument" index="3MHsoP" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+      <concept id="1863527487546129879" name="jetbrains.mps.lang.smodel.structure.ModelPointerExpression" flags="ng" index="1Xw6AR">
+        <child id="1863527487546132519" name="modelRef" index="1XwpL7" />
+      </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">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </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="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+    </language>
+  </registry>
+  <node concept="1lH9Xt" id="6Qumy0DUPjd">
+    <property role="TrG5h" value="ShowDiff" />
+    <node concept="2XrIbr" id="2RIzFJ7FNYX" role="1qtyYc">
+      <property role="TrG5h" value="expected" />
+      <node concept="3Tqbb2" id="2RIzFJ7FNZ9" role="3clF45" />
+      <node concept="3clFbS" id="2RIzFJ7FNYZ" role="3clF47">
+        <node concept="3clFbF" id="2RIzFJ7FNZc" role="3cqZAp">
+          <node concept="3xONca" id="2RIzFJ7FNZe" role="3clFbG">
+            <ref role="3xOPvv" node="2RIzFJ82f2z" resolve="expected" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2XrIbr" id="6qlKzghasC0" role="1qtyYc">
+      <property role="TrG5h" value="fromMemory1" />
+      <node concept="3Tqbb2" id="6qlKzghasEo" role="3clF45" />
+      <node concept="3clFbS" id="6qlKzghasC2" role="3clF47">
+        <node concept="3clFbF" id="6qlKzghasEA" role="3cqZAp">
+          <node concept="2c44tf" id="6qlKzghasE$" role="3clFbG">
+            <node concept="312cEu" id="6qlKzghasFE" role="2c44tc">
+              <property role="TrG5h" value="FromMemory" />
+              <node concept="312cEg" id="6qlKzghasPu" role="jymVt">
+                <property role="TrG5h" value="f1" />
+                <node concept="3Tm6S6" id="6qlKzghasN1" role="1B3o_S" />
+                <node concept="17QB3L" id="6qlKzghasPj" role="1tU5fm" />
+              </node>
+              <node concept="312cEg" id="6qlKzghasS9" role="jymVt">
+                <property role="TrG5h" value="f2" />
+                <node concept="3Tm6S6" id="6qlKzghasSa" role="1B3o_S" />
+                <node concept="17QB3L" id="6qlKzghasSb" role="1tU5fm" />
+              </node>
+              <node concept="312cEg" id="6qlKzghasSj" role="jymVt">
+                <property role="TrG5h" value="f3" />
+                <node concept="3Tm6S6" id="6qlKzghasSk" role="1B3o_S" />
+                <node concept="17QB3L" id="6qlKzghasSl" role="1tU5fm" />
+              </node>
+              <node concept="3Tm1VV" id="6qlKzghasFF" role="1B3o_S" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6qlKzghci$4" role="1B3o_S" />
+    </node>
+    <node concept="2XrIbr" id="33$34j7Jd4s" role="1qtyYc">
+      <property role="TrG5h" value="fromMemory2" />
+      <node concept="3Tqbb2" id="33$34j7Jd4t" role="3clF45" />
+      <node concept="3clFbS" id="33$34j7Jd4u" role="3clF47">
+        <node concept="3clFbF" id="33$34j7Jd6V" role="3cqZAp">
+          <node concept="2pJPEk" id="33$34j7Jd6R" role="3clFbG">
+            <node concept="2pJPED" id="33$34j7Jd6T" role="2pJPEn">
+              <ref role="2pJxaS" to="tpee:fz12cDA" resolve="ClassConcept" />
+              <node concept="2pJxcG" id="33$34j7Jd9c" role="2pJxcM">
+                <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
+                <node concept="WxPPo" id="33$34j7Jdk7" role="28ntcv">
+                  <node concept="Xl_RD" id="33$34j7Jdk6" role="WxPPp">
+                    <property role="Xl_RC" value="FromMemory" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2pIpSj" id="33$34j7JdoY" role="2pJxcM">
+                <ref role="2pIpSl" to="tpee:4EqhHTp4Mw3" resolve="member" />
+                <node concept="2pJPED" id="33$34j7JdpA" role="28nt2d">
+                  <ref role="2pJxaS" to="tpee:fz12cDC" resolve="FieldDeclaration" />
+                  <node concept="2pJxcG" id="33$34j7Jdqm" role="2pJxcM">
+                    <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
+                    <node concept="WxPPo" id="33$34j7JdqR" role="28ntcv">
+                      <node concept="Xl_RD" id="33$34j7JdqQ" role="WxPPp">
+                        <property role="Xl_RC" value="f1" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2pIpSj" id="33$34j7Jdsk" role="2pJxcM">
+                    <ref role="2pIpSl" to="tpee:h9B3oxE" resolve="visibility" />
+                    <node concept="2pJPED" id="33$34j7JdsJ" role="28nt2d">
+                      <ref role="2pJxaS" to="tpee:gFTm6Wc" resolve="PrivateVisibility" />
+                    </node>
+                  </node>
+                  <node concept="2pIpSj" id="33$34j7Jdu1" role="2pJxcM">
+                    <ref role="2pIpSl" to="tpee:4VkOLwjf83e" resolve="type" />
+                    <node concept="2pJPED" id="33$34j7JduF" role="28nt2d">
+                      <ref role="2pJxaS" to="tpee:hP7QB7G" resolve="StringType" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="33$34j7Jd4G" role="1B3o_S" />
+    </node>
+    <node concept="2XrIbr" id="3j0GERRSceI" role="1qtyYc">
+      <property role="TrG5h" value="areTestsEnabled" />
+      <node concept="10P_77" id="3j0GERRScoE" role="3clF45" />
+      <node concept="3clFbS" id="3j0GERRSceK" role="3clF47">
+        <node concept="3clFbF" id="3j0GERRScoN" role="3cqZAp">
+          <node concept="3clFbT" id="3j0GERRScoM" role="3clFbG" />
+        </node>
+      </node>
+    </node>
+    <node concept="2XrIbr" id="33$34j7JgT6" role="1qtyYc">
+      <property role="TrG5h" value="genWithPlan" />
+      <node concept="37vLTG" id="41VK2HXi9fc" role="3clF46">
+        <property role="TrG5h" value="inputModel" />
+        <property role="3TUv4t" value="true" />
+        <node concept="H_c77" id="41VK2HXi9fd" role="1tU5fm" />
+      </node>
+      <node concept="H_c77" id="33$34j7JCEG" role="3clF45" />
+      <node concept="3clFbS" id="33$34j7JgT8" role="3clF47">
+        <node concept="3cpWs8" id="41VK2HXi9c8" role="3cqZAp">
+          <node concept="3cpWsn" id="41VK2HXi9c9" role="3cpWs9">
+            <property role="TrG5h" value="genFacade" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="41VK2HXi9ca" role="1tU5fm">
+              <ref role="3uigEE" to="ne25:58oUBCRuqiK" resolve="GeneratorFacade" />
+            </node>
+            <node concept="2ShNRf" id="41VK2HXi9cb" role="33vP2m">
+              <node concept="HV5vD" id="41VK2HXi9cc" role="2ShVmc">
+                <ref role="HV5vE" to="ne25:58oUBCRuqiK" resolve="GeneratorFacade" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="33$34j7JLB4" role="3cqZAp">
+          <node concept="3cpWsn" id="33$34j7JLB5" role="3cpWs9">
+            <property role="TrG5h" value="repo" />
+            <node concept="3uibUv" id="33$34j7JLzU" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="33$34j7JLB6" role="33vP2m">
+              <node concept="1jxXqW" id="33$34j7JLB7" role="2Oq$k0" />
+              <node concept="liA8E" id="33$34j7JLB8" role="2OqNvi">
+                <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="41VK2HXi9cd" role="3cqZAp" />
+        <node concept="3SKdUt" id="41VK2HXi9ce" role="3cqZAp">
+          <node concept="1PaTwC" id="41VK2HXi9cf" role="1aUNEU">
+            <node concept="3oM_SD" id="41VK2HXi9cg" role="1PaTwD">
+              <property role="3oM_SC" value="In" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9ch" role="1PaTwD">
+              <property role="3oM_SC" value="memory" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9ci" role="1PaTwD">
+              <property role="3oM_SC" value="logging" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9cj" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9ck" role="1PaTwD">
+              <property role="3oM_SC" value="error" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9cl" role="1PaTwD">
+              <property role="3oM_SC" value="message" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9cm" role="1PaTwD">
+              <property role="3oM_SC" value="checking" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9cn" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9co" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9cp" role="1PaTwD">
+              <property role="3oM_SC" value="failure" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="41VK2HXi9cq" role="3cqZAp">
+          <node concept="3cpWsn" id="41VK2HXi9cr" role="3cpWs9">
+            <property role="TrG5h" value="messageOutputStream" />
+            <node concept="3uibUv" id="41VK2HXi9cs" role="1tU5fm">
+              <ref role="3uigEE" to="guwi:~ByteArrayOutputStream" resolve="ByteArrayOutputStream" />
+            </node>
+            <node concept="2ShNRf" id="41VK2HXi9ct" role="33vP2m">
+              <node concept="1pGfFk" id="41VK2HXi9cu" role="2ShVmc">
+                <ref role="37wK5l" to="guwi:~ByteArrayOutputStream.&lt;init&gt;()" resolve="ByteArrayOutputStream" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="41VK2HXi9cv" role="3cqZAp">
+          <node concept="3cpWsn" id="41VK2HXi9cw" role="3cpWs9">
+            <property role="TrG5h" value="messageHandler" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="41VK2HXi9cx" role="1tU5fm">
+              <ref role="3uigEE" to="ne25:58oUBCRwKP_" resolve="StreamMessageHandler" />
+            </node>
+            <node concept="2ShNRf" id="41VK2HXi9cy" role="33vP2m">
+              <node concept="1pGfFk" id="41VK2HXi9cz" role="2ShVmc">
+                <ref role="37wK5l" to="ne25:58oUBCRwL2w" resolve="StreamMessageHandler" />
+                <node concept="2ShNRf" id="41VK2HXi9c$" role="37wK5m">
+                  <node concept="1pGfFk" id="41VK2HXi9c_" role="2ShVmc">
+                    <ref role="37wK5l" to="guwi:~PrintStream.&lt;init&gt;(java.io.OutputStream)" resolve="PrintStream" />
+                    <node concept="37vLTw" id="41VK2HXi9cA" role="37wK5m">
+                      <ref role="3cqZAo" node="41VK2HXi9cr" resolve="messageOutputStream" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="41VK2HXi9cB" role="3cqZAp" />
+        <node concept="3SKdUt" id="41VK2HXi9cC" role="3cqZAp">
+          <node concept="1PaTwC" id="41VK2HXi9cD" role="1aUNEU">
+            <node concept="3oM_SD" id="41VK2HXi9cE" role="1PaTwD">
+              <property role="3oM_SC" value="console" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9cF" role="1PaTwD">
+              <property role="3oM_SC" value="logging" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9cG" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="41VK2HXi9cH" role="1PaTwD">
+              <property role="3oM_SC" value="debugging" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="41VK2HXi9cW" role="3cqZAp" />
+        <node concept="3cpWs8" id="41VK2HXi9cX" role="3cqZAp">
+          <node concept="3cpWsn" id="41VK2HXi9cY" role="3cpWs9">
+            <property role="TrG5h" value="resolvedGenPlan" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3Tqbb2" id="41VK2HXi9cZ" role="1tU5fm">
+              <ref role="ehGHo" to="bjdw:1_4co2y1LvV" resolve="Plan" />
+            </node>
+            <node concept="10QFUN" id="41VK2HXi9d0" role="33vP2m">
+              <node concept="3Tqbb2" id="41VK2HXi9d5" role="10QFUM">
+                <ref role="ehGHo" to="bjdw:1_4co2y1LvV" resolve="Plan" />
+              </node>
+              <node concept="2OqwBi" id="60d$i5siqsP" role="10QFUP">
+                <node concept="2JrnkZ" id="30xB0zHnCtW" role="2Oq$k0">
+                  <node concept="2tJFMh" id="30xB0zHnCtV" role="2JrQYb">
+                    <node concept="ZC_QK" id="33$34j7Kfag" role="2tJFKM">
+                      <ref role="2aWVGs" to="6skw:33$34j7NgNF" resolve="demo.plan" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="60d$i5siqsR" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                  <node concept="37vLTw" id="33$34j7Kfs$" role="37wK5m">
+                    <ref role="3cqZAo" node="33$34j7JLB5" resolve="repo" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="41VK2HXi9d6" role="3cqZAp">
+          <node concept="3cpWsn" id="41VK2HXi9d7" role="3cpWs9">
+            <property role="TrG5h" value="genStatus" />
+            <node concept="3uibUv" id="41VK2HXi9d8" role="1tU5fm">
+              <ref role="3uigEE" to="ap4u:~GenerationStatus" resolve="GenerationStatus" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="41VK2HXi9eo" role="3cqZAp">
+          <node concept="37vLTI" id="41VK2HXi9ep" role="3clFbG">
+            <node concept="2OqwBi" id="41VK2HXi9eq" role="37vLTx">
+              <node concept="2YIFZM" id="41VK2HXi9er" role="2Oq$k0">
+                <ref role="1Pybhc" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
+                <ref role="37wK5l" to="1ka:~TypecheckingFacade.getFromContext()" resolve="getFromContext" />
+              </node>
+              <node concept="liA8E" id="41VK2HXi9es" role="2OqNvi">
+                <ref role="37wK5l" to="1ka:~TypecheckingComputations.computeIsolated(jetbrains.mps.typechecking.TypecheckingSession$Flags,java.util.function.Supplier)" resolve="computeIsolated" />
+                <node concept="2OqwBi" id="41VK2HXi9et" role="37wK5m">
+                  <node concept="2YIFZM" id="41VK2HXi9eu" role="2Oq$k0">
+                    <ref role="1Pybhc" to="1ka:~TypecheckingSession$Flags" resolve="TypecheckingSession.Flags" />
+                    <ref role="37wK5l" to="1ka:~TypecheckingSession$Flags.forRoot(org.jetbrains.mps.openapi.model.SNode)" resolve="forRoot" />
+                    <node concept="2OqwBi" id="41VK2HXi9ev" role="37wK5m">
+                      <node concept="37vLTw" id="41VK2HXi9ew" role="2Oq$k0">
+                        <ref role="3cqZAo" node="41VK2HXi9cY" resolve="resolvedGenPlan" />
+                      </node>
+                      <node concept="2Rxl7S" id="41VK2HXi9ex" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="41VK2HXi9ey" role="2OqNvi">
+                    <ref role="37wK5l" to="1ka:~TypecheckingSession$Flags.incremental()" resolve="incremental" />
+                  </node>
+                </node>
+                <node concept="1bVj0M" id="41VK2HXi9ez" role="37wK5m">
+                  <node concept="3clFbS" id="41VK2HXi9e$" role="1bW5cS">
+                    <node concept="3clFbF" id="41VK2HXi9e_" role="3cqZAp">
+                      <node concept="2OqwBi" id="41VK2HXi9eA" role="3clFbG">
+                        <node concept="37vLTw" id="41VK2HXi9eB" role="2Oq$k0">
+                          <ref role="3cqZAo" node="41VK2HXi9c9" resolve="genFacade" />
+                        </node>
+                        <node concept="liA8E" id="41VK2HXi9eC" role="2OqNvi">
+                          <ref role="37wK5l" to="ne25:58oUBCRwmwL" resolve="runGenerator" />
+                          <node concept="37vLTw" id="33$34j7JLB9" role="37wK5m">
+                            <ref role="3cqZAo" node="33$34j7JLB5" resolve="repo" />
+                          </node>
+                          <node concept="37vLTw" id="41VK2HXi9eE" role="37wK5m">
+                            <ref role="3cqZAo" node="41VK2HXi9cY" resolve="resolvedGenPlan" />
+                          </node>
+                          <node concept="37vLTw" id="41VK2HXi9fi" role="37wK5m">
+                            <ref role="3cqZAo" node="41VK2HXi9fc" resolve="inputModel" />
+                          </node>
+                          <node concept="2OqwBi" id="33$34j7KutY" role="37wK5m">
+                            <node concept="1eOMI4" id="33$34j7Ki6R" role="2Oq$k0">
+                              <node concept="10QFUN" id="2HIyEUcgaZF" role="1eOMHV">
+                                <node concept="1jxXqW" id="2HIyEUcgaZG" role="10QFUP" />
+                                <node concept="3uibUv" id="2HIyEUcgaZH" role="10QFUM">
+                                  <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="33$34j7KvH5" role="2OqNvi">
+                              <ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="41VK2HXi9eJ" role="37wK5m">
+                            <ref role="3cqZAo" node="41VK2HXi9cw" resolve="messageHandler" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="41VK2HXi9eK" role="37vLTJ">
+              <ref role="3cqZAo" node="41VK2HXi9d7" resolve="genStatus" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="41VK2HXi9eL" role="3cqZAp" />
+        <node concept="3cpWs6" id="41VK2HXi9f4" role="3cqZAp">
+          <node concept="2OqwBi" id="33$34j7JBTN" role="3cqZAk">
+            <node concept="37vLTw" id="41VK2HXi9f5" role="2Oq$k0">
+              <ref role="3cqZAo" node="41VK2HXi9d7" resolve="genStatus" />
+            </node>
+            <node concept="liA8E" id="33$34j7JCpf" role="2OqNvi">
+              <ref role="37wK5l" to="ap4u:~GenerationStatus.getOutputModel()" resolve="getOutputModel" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="6Qumy0DUPjy" role="1SKRRt">
+      <node concept="312cEu" id="6Qumy0DUPjz" role="1qenE9">
+        <property role="TrG5h" value="Bar" />
+        <node concept="312cEg" id="6Qumy0DUPjB" role="jymVt">
+          <property role="TrG5h" value="f1" />
+          <node concept="3Tm6S6" id="6Qumy0DUPjC" role="1B3o_S" />
+          <node concept="17QB3L" id="6Qumy0DYJMZ" role="1tU5fm" />
+        </node>
+        <node concept="312cEg" id="2RIzFJ81$TX" role="jymVt">
+          <property role="TrG5h" value="f2" />
+          <node concept="3Tm6S6" id="2RIzFJ81$TY" role="1B3o_S" />
+          <node concept="17QB3L" id="2RIzFJ81$TZ" role="1tU5fm" />
+        </node>
+        <node concept="312cEg" id="2RIzFJ81$Vy" role="jymVt">
+          <property role="TrG5h" value="f3" />
+          <node concept="3Tm6S6" id="2RIzFJ81$Vz" role="1B3o_S" />
+          <node concept="17QB3L" id="2RIzFJ81$V$" role="1tU5fm" />
+        </node>
+        <node concept="3Tm1VV" id="6Qumy0DUPjE" role="1B3o_S" />
+        <node concept="3xLA65" id="2RIzFJ82f2z" role="lGtFl">
+          <property role="TrG5h" value="expected" />
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="6Qumy0DUPjG" role="1SKRRt">
+      <node concept="312cEu" id="6Qumy0DUPjH" role="1qenE9">
+        <property role="TrG5h" value="Bar" />
+        <node concept="312cEg" id="6Qumy0DUPjL" role="jymVt">
+          <property role="TrG5h" value="b1" />
+          <node concept="3Tm6S6" id="6Qumy0DUPjM" role="1B3o_S" />
+          <node concept="17QB3L" id="6Qumy0DYJQT" role="1tU5fm" />
+        </node>
+        <node concept="312cEg" id="2RIzFJ81$WB" role="jymVt">
+          <property role="TrG5h" value="b2" />
+          <node concept="3Tm6S6" id="2RIzFJ81$WC" role="1B3o_S" />
+          <node concept="17QB3L" id="2RIzFJ81$WD" role="1tU5fm" />
+        </node>
+        <node concept="312cEg" id="2RIzFJ81$WK" role="jymVt">
+          <property role="TrG5h" value="b3" />
+          <node concept="3Tm6S6" id="2RIzFJ81$WL" role="1B3o_S" />
+          <node concept="17QB3L" id="2RIzFJ81$WM" role="1tU5fm" />
+        </node>
+        <node concept="3Tm1VV" id="6Qumy0DUPjO" role="1B3o_S" />
+        <node concept="3xLA65" id="6Qumy0DUPjP" role="lGtFl">
+          <property role="TrG5h" value="wrong" />
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="33$34j7Kp1b" role="1SKRRt">
+      <node concept="2pNNFK" id="33$34j7Kp8Z" role="1qenE9">
+        <property role="2pNNFO" value="entries" />
+        <node concept="2pNNFK" id="33$34j7Kp90" role="3o6s8t">
+          <property role="2pNNFO" value="entry" />
+          <node concept="3o6iSG" id="33$34j7Kp91" role="3o6s8t">
+            <property role="3o6i5n" value="foo_0" />
+          </node>
+        </node>
+        <node concept="2pNNFK" id="33$34j7MuNJ" role="3o6s8t">
+          <property role="2pNNFO" value="entry" />
+          <node concept="3o6iSG" id="33$34j7MuNK" role="3o6s8t">
+            <property role="3o6i5n" value="foo_37" />
+          </node>
+        </node>
+        <node concept="2pNNFK" id="33$34j7MuNL" role="3o6s8t">
+          <property role="2pNNFO" value="entry" />
+          <node concept="3o6iSG" id="33$34j7MuNM" role="3o6s8t">
+            <property role="3o6i5n" value="foo_38" />
+          </node>
+        </node>
+        <node concept="2pNNFK" id="33$34j7MuNN" role="3o6s8t">
+          <property role="2pNNFO" value="entry" />
+          <node concept="3o6iSG" id="33$34j7MuNO" role="3o6s8t">
+            <property role="3o6i5n" value="foo_39" />
+          </node>
+        </node>
+        <node concept="2pNNFK" id="33$34j7MuNP" role="3o6s8t">
+          <property role="2pNNFO" value="entry" />
+          <node concept="3o6iSG" id="33$34j7MuNQ" role="3o6s8t">
+            <property role="3o6i5n" value="foo_40" />
+          </node>
+        </node>
+        <node concept="2pNNFK" id="33$34j7MuNR" role="3o6s8t">
+          <property role="2pNNFO" value="entry" />
+          <node concept="3o6iSG" id="33$34j7MuNS" role="3o6s8t">
+            <property role="3o6i5n" value="foo_41" />
+          </node>
+        </node>
+        <node concept="3xLA65" id="33$34j7Kp9e" role="lGtFl">
+          <property role="TrG5h" value="expectedGeneratorOutput" />
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6Qumy0DUPjs" role="1SL9yI">
+      <property role="TrG5h" value="nonEditableDiff" />
+      <node concept="3cqZAl" id="6Qumy0DUPjt" role="3clF45" />
+      <node concept="3clFbS" id="6Qumy0DUPju" role="3clF47">
+        <node concept="3clFbJ" id="3j0GERRScOx" role="3cqZAp">
+          <node concept="3clFbS" id="3j0GERRScOz" role="3clFbx">
+            <node concept="3cpWs6" id="3j0GERRScQu" role="3cqZAp" />
+          </node>
+          <node concept="3fqX7Q" id="3j0GERRScP8" role="3clFbw">
+            <node concept="2OqwBi" id="3j0GERRScPF" role="3fr31v">
+              <node concept="2WthIp" id="3j0GERRScPI" role="2Oq$k0" />
+              <node concept="2XshWL" id="3j0GERRScPK" role="2OqNvi">
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3j0GERRScR5" role="3cqZAp" />
+        <node concept="3GXo0L" id="6Qumy0DUPjv" role="3cqZAp">
+          <node concept="3xONca" id="2RIzFJ82Vj_" role="3tpDZA">
+            <ref role="3xOPvv" node="6Qumy0DUPjP" resolve="wrong" />
+          </node>
+          <node concept="2OqwBi" id="5oR1gCFT04c" role="3tpDZB">
+            <node concept="2WthIp" id="5oR1gCFT00d" role="2Oq$k0" />
+            <node concept="2XshWL" id="5oR1gCFT08G" role="2OqNvi">
+              <ref role="2WH_rO" node="2RIzFJ7FNYX" resolve="expected" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="5oR1gCFPHyE" role="1SL9yI">
+      <property role="TrG5h" value="editibleFromMemory1" />
+      <node concept="3cqZAl" id="5oR1gCFPHyF" role="3clF45" />
+      <node concept="3clFbS" id="5oR1gCFPHyJ" role="3clF47">
+        <node concept="3clFbJ" id="3j0GERRSd11" role="3cqZAp">
+          <node concept="3clFbS" id="3j0GERRSd12" role="3clFbx">
+            <node concept="3cpWs6" id="3j0GERRSd13" role="3cqZAp" />
+          </node>
+          <node concept="3fqX7Q" id="3j0GERRSd14" role="3clFbw">
+            <node concept="2OqwBi" id="3j0GERRSd15" role="3fr31v">
+              <node concept="2WthIp" id="3j0GERRSd16" role="2Oq$k0" />
+              <node concept="2XshWL" id="3j0GERRSd17" role="2OqNvi">
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3j0GERRSd0B" role="3cqZAp" />
+        <node concept="3GXo0L" id="5oR1gCFPHzm" role="3cqZAp">
+          <node concept="3xONca" id="5oR1gCFPHzn" role="3tpDZB">
+            <ref role="3xOPvv" node="2RIzFJ82f2z" resolve="expected" />
+          </node>
+          <node concept="2OqwBi" id="5oR1gCFPH$t" role="3tpDZA">
+            <node concept="2WthIp" id="5oR1gCFPH$w" role="2Oq$k0" />
+            <node concept="2XshWL" id="5oR1gCFPH$y" role="2OqNvi">
+              <ref role="2WH_rO" node="6qlKzghasC0" resolve="fromMemory1" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="2RIzFJ82R0L" role="1SL9yI">
+      <property role="TrG5h" value="editibleFromTestCase" />
+      <node concept="3cqZAl" id="2RIzFJ82R0M" role="3clF45" />
+      <node concept="3clFbS" id="2RIzFJ82R0Q" role="3clF47">
+        <node concept="3clFbJ" id="3j0GERRSde2" role="3cqZAp">
+          <node concept="3clFbS" id="3j0GERRSde3" role="3clFbx">
+            <node concept="3cpWs6" id="3j0GERRSde4" role="3cqZAp" />
+          </node>
+          <node concept="3fqX7Q" id="3j0GERRSde5" role="3clFbw">
+            <node concept="2OqwBi" id="3j0GERRSde6" role="3fr31v">
+              <node concept="2WthIp" id="3j0GERRSde7" role="2Oq$k0" />
+              <node concept="2XshWL" id="3j0GERRSde8" role="2OqNvi">
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3j0GERRSddW" role="3cqZAp" />
+        <node concept="3GXo0L" id="2RIzFJ7HS3x" role="3cqZAp">
+          <node concept="3xONca" id="2RIzFJ7HS5M" role="3tpDZB">
+            <ref role="3xOPvv" node="2RIzFJ82f2z" resolve="expected" />
+          </node>
+          <node concept="3xONca" id="2RIzFJ7HS3_" role="3tpDZA">
+            <ref role="3xOPvv" node="6Qumy0DUPjP" resolve="wrong" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="33$34j7JdD5" role="1SL9yI">
+      <property role="TrG5h" value="editibleFromMemory2" />
+      <node concept="3cqZAl" id="33$34j7JdD6" role="3clF45" />
+      <node concept="3clFbS" id="33$34j7JdD7" role="3clF47">
+        <node concept="3clFbJ" id="3j0GERRSdpx" role="3cqZAp">
+          <node concept="3clFbS" id="3j0GERRSdpy" role="3clFbx">
+            <node concept="3cpWs6" id="3j0GERRSdpz" role="3cqZAp" />
+          </node>
+          <node concept="3fqX7Q" id="3j0GERRSdp$" role="3clFbw">
+            <node concept="2OqwBi" id="3j0GERRSdp_" role="3fr31v">
+              <node concept="2WthIp" id="3j0GERRSdpA" role="2Oq$k0" />
+              <node concept="2XshWL" id="3j0GERRSdpB" role="2OqNvi">
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3j0GERRSdp6" role="3cqZAp" />
+        <node concept="3GXo0L" id="33$34j7JdD8" role="3cqZAp">
+          <node concept="3xONca" id="33$34j7JdD9" role="3tpDZB">
+            <ref role="3xOPvv" node="2RIzFJ82f2z" resolve="expected" />
+          </node>
+          <node concept="2OqwBi" id="33$34j7JdDa" role="3tpDZA">
+            <node concept="2WthIp" id="33$34j7JdDb" role="2Oq$k0" />
+            <node concept="2XshWL" id="33$34j7JdDc" role="2OqNvi">
+              <ref role="2WH_rO" node="33$34j7Jd4s" resolve="fromMemory2" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="33$34j7JDr$" role="1SL9yI">
+      <property role="TrG5h" value="editibleFromGenerator" />
+      <node concept="3cqZAl" id="33$34j7JDr_" role="3clF45" />
+      <node concept="3clFbS" id="33$34j7JDrD" role="3clF47">
+        <node concept="3clFbJ" id="3j0GERRSj4k" role="3cqZAp">
+          <node concept="3clFbS" id="3j0GERRSj4l" role="3clFbx">
+            <node concept="3cpWs6" id="3j0GERRSj4m" role="3cqZAp" />
+          </node>
+          <node concept="3fqX7Q" id="3j0GERRSj4n" role="3clFbw">
+            <node concept="2OqwBi" id="3j0GERRSj4o" role="3fr31v">
+              <node concept="2WthIp" id="3j0GERRSj4p" role="2Oq$k0" />
+              <node concept="2XshWL" id="3j0GERRSj4q" role="2OqNvi">
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3j0GERRSj16" role="3cqZAp" />
+        <node concept="3cpWs8" id="2HIyEUcgb0f" role="3cqZAp">
+          <node concept="3cpWsn" id="2HIyEUcgb0g" role="3cpWs9">
+            <property role="TrG5h" value="input" />
+            <node concept="H_c77" id="2HIyEUcgb0h" role="1tU5fm" />
+            <node concept="2OqwBi" id="2HIyEUcgb0i" role="33vP2m">
+              <node concept="1Xw6AR" id="2HIyEUcgb0j" role="2Oq$k0">
+                <node concept="1dCxOl" id="33$34j7NnJf" role="1XwpL7">
+                  <property role="1XweGQ" value="r:276bafc7-34fe-44ca-af51-e0cb4809408f" />
+                  <node concept="1j_P7g" id="33$34j7NnJg" role="1j$8Uc">
+                    <property role="1j_P7h" value="com.mbeddr.demo.compafator.diff.tests.input" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2yCiCJ" id="2HIyEUcgb0m" role="2OqNvi">
+                <node concept="2OqwBi" id="2HIyEUcgb0n" role="Vysub">
+                  <node concept="1jGwE1" id="2HIyEUcgb0o" role="2Oq$k0" />
+                  <node concept="liA8E" id="2HIyEUcgb0p" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="33$34j7KlNk" role="3cqZAp">
+          <node concept="3cpWsn" id="33$34j7KlNl" role="3cpWs9">
+            <property role="TrG5h" value="out" />
+            <node concept="H_c77" id="33$34j7KlIj" role="1tU5fm" />
+            <node concept="2OqwBi" id="33$34j7KlNm" role="33vP2m">
+              <node concept="2WthIp" id="33$34j7KlNn" role="2Oq$k0" />
+              <node concept="2XshWL" id="33$34j7KlNo" role="2OqNvi">
+                <ref role="2WH_rO" node="33$34j7JgT6" resolve="genWithPlan" />
+                <node concept="37vLTw" id="33$34j7KlNp" role="2XxRq1">
+                  <ref role="3cqZAo" node="2HIyEUcgb0g" resolve="input" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="33$34j7KoQl" role="3cqZAp">
+          <node concept="3cpWsn" id="33$34j7KoQm" role="3cpWs9">
+            <property role="TrG5h" value="actual" />
+            <node concept="3Tqbb2" id="33$34j7KoPD" role="1tU5fm">
+              <ref role="ehGHo" to="iuxj:5M4a$b5iL2M" resolve="XmlElement" />
+            </node>
+            <node concept="10QFUN" id="33$34j7KD9h" role="33vP2m">
+              <node concept="2OqwBi" id="33$34j7KBue" role="10QFUP">
+                <node concept="2OqwBi" id="33$34j7KAyU" role="2Oq$k0">
+                  <node concept="2OqwBi" id="33$34j7KoQn" role="2Oq$k0">
+                    <node concept="2OqwBi" id="33$34j7KoQo" role="2Oq$k0">
+                      <node concept="37vLTw" id="33$34j7KoQp" role="2Oq$k0">
+                        <ref role="3cqZAo" node="33$34j7KlNl" resolve="out" />
+                      </node>
+                      <node concept="2RRcyG" id="33$34j7KoQq" role="2OqNvi">
+                        <node concept="chp4Y" id="33$34j7KzOK" role="3MHsoP">
+                          <ref role="cht4Q" to="iuxj:5M4a$b5j9j0" resolve="XmlFile" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1uHKPH" id="33$34j7KoQs" role="2OqNvi" />
+                  </node>
+                  <node concept="3TrEf2" id="33$34j7KATb" role="2OqNvi">
+                    <ref role="3Tt5mk" to="iuxj:5M4a$b5j9j1" resolve="document" />
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="33$34j7KBLh" role="2OqNvi">
+                  <ref role="3Tt5mk" to="iuxj:5M4a$b5ikxJ" resolve="rootElement" />
+                </node>
+              </node>
+              <node concept="3Tqbb2" id="33$34j7KD9i" role="10QFUM">
+                <ref role="ehGHo" to="iuxj:5M4a$b5iL2M" resolve="XmlElement" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="33$34j7KoMn" role="3cqZAp" />
+        <node concept="3GXo0L" id="33$34j7KoNe" role="3cqZAp">
+          <node concept="3xONca" id="33$34j7KoNf" role="3tpDZB">
+            <ref role="3xOPvv" node="33$34j7Kp9e" resolve="expectedGeneratorOutput" />
+          </node>
+          <node concept="37vLTw" id="33$34j7KoZu" role="3tpDZA">
+            <ref role="3cqZAo" node="33$34j7KoQm" resolve="actual" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="33$34j7KoMM" role="3cqZAp" />
+      </node>
+    </node>
+  </node>
+  <node concept="2XOHcx" id="4X7wieqDZ0B">
+    <property role="2XOHcw" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.mpsutil" />
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps
new file mode 100644
index 0000000000..8ad132d689
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:276bafc7-34fe-44ca-af51-e0cb4809408f(com.mbeddr.demo.compafator.diff.tests.input)">
+  <persistence version="9" />
+  <languages>
+    <use id="e0989c7a-8149-4be7-97b6-0b78561af099" name="com.mbeddr.demo.comparator.diff" version="0" />
+  </languages>
+  <imports />
+  <registry>
+    <language id="e0989c7a-8149-4be7-97b6-0b78561af099" name="com.mbeddr.demo.comparator.diff">
+      <concept id="3522954298058749320" name="com.mbeddr.demo.comparator.diff.structure.Root" flags="ng" index="3RnzBc">
+        <child id="3522954298058749321" name="entries" index="3RnzBd" />
+      </concept>
+      <concept id="3522954298058777217" name="com.mbeddr.demo.comparator.diff.structure.Entry" flags="ng" index="3RnEV5" />
+    </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>
+  </registry>
+  <node concept="3RnzBc" id="33$34j7Kl3m">
+    <node concept="3RnEV5" id="33$34j7Mm_2" role="3RnzBd">
+      <property role="TrG5h" value="foo_0" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_3" role="3RnzBd">
+      <property role="TrG5h" value="foo_1" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_4" role="3RnzBd">
+      <property role="TrG5h" value="foo_2" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_5" role="3RnzBd">
+      <property role="TrG5h" value="foo_3" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_6" role="3RnzBd">
+      <property role="TrG5h" value="foo_4" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_7" role="3RnzBd">
+      <property role="TrG5h" value="foo_5" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_8" role="3RnzBd">
+      <property role="TrG5h" value="foo_6" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_9" role="3RnzBd">
+      <property role="TrG5h" value="foo_7" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_a" role="3RnzBd">
+      <property role="TrG5h" value="foo_8" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_b" role="3RnzBd">
+      <property role="TrG5h" value="foo_9" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_c" role="3RnzBd">
+      <property role="TrG5h" value="foo_10" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_d" role="3RnzBd">
+      <property role="TrG5h" value="foo_11" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_e" role="3RnzBd">
+      <property role="TrG5h" value="foo_12" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_f" role="3RnzBd">
+      <property role="TrG5h" value="foo_13" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_g" role="3RnzBd">
+      <property role="TrG5h" value="foo_14" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_h" role="3RnzBd">
+      <property role="TrG5h" value="foo_15" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_i" role="3RnzBd">
+      <property role="TrG5h" value="foo_16" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_j" role="3RnzBd">
+      <property role="TrG5h" value="foo_17" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_k" role="3RnzBd">
+      <property role="TrG5h" value="foo_18" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_l" role="3RnzBd">
+      <property role="TrG5h" value="foo_19" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_m" role="3RnzBd">
+      <property role="TrG5h" value="foo_20" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_n" role="3RnzBd">
+      <property role="TrG5h" value="foo_21" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_o" role="3RnzBd">
+      <property role="TrG5h" value="foo_22" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_p" role="3RnzBd">
+      <property role="TrG5h" value="foo_23" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_q" role="3RnzBd">
+      <property role="TrG5h" value="foo_24" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_r" role="3RnzBd">
+      <property role="TrG5h" value="foo_25" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_s" role="3RnzBd">
+      <property role="TrG5h" value="foo_26" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_t" role="3RnzBd">
+      <property role="TrG5h" value="foo_27" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_u" role="3RnzBd">
+      <property role="TrG5h" value="foo_28" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_v" role="3RnzBd">
+      <property role="TrG5h" value="foo_29" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_w" role="3RnzBd">
+      <property role="TrG5h" value="foo_30" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_x" role="3RnzBd">
+      <property role="TrG5h" value="foo_31" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_y" role="3RnzBd">
+      <property role="TrG5h" value="foo_32" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_z" role="3RnzBd">
+      <property role="TrG5h" value="foo_33" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_$" role="3RnzBd">
+      <property role="TrG5h" value="foo_34" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm__" role="3RnzBd">
+      <property role="TrG5h" value="foo_35" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_A" role="3RnzBd">
+      <property role="TrG5h" value="foo_36" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_B" role="3RnzBd">
+      <property role="TrG5h" value="foo_37" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_C" role="3RnzBd">
+      <property role="TrG5h" value="foo_38" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_D" role="3RnzBd">
+      <property role="TrG5h" value="foo_39" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_E" role="3RnzBd">
+      <property role="TrG5h" value="foo_40" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_F" role="3RnzBd">
+      <property role="TrG5h" value="foo_41" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_G" role="3RnzBd">
+      <property role="TrG5h" value="foo_42" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_H" role="3RnzBd">
+      <property role="TrG5h" value="foo_43" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_I" role="3RnzBd">
+      <property role="TrG5h" value="foo_44" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_J" role="3RnzBd">
+      <property role="TrG5h" value="foo_45" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_K" role="3RnzBd">
+      <property role="TrG5h" value="foo_46" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_L" role="3RnzBd">
+      <property role="TrG5h" value="foo_47" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_M" role="3RnzBd">
+      <property role="TrG5h" value="foo_48" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_N" role="3RnzBd">
+      <property role="TrG5h" value="foo_49" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_O" role="3RnzBd">
+      <property role="TrG5h" value="foo_50" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_P" role="3RnzBd">
+      <property role="TrG5h" value="foo_51" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_Q" role="3RnzBd">
+      <property role="TrG5h" value="foo_52" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_R" role="3RnzBd">
+      <property role="TrG5h" value="foo_53" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_S" role="3RnzBd">
+      <property role="TrG5h" value="foo_54" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_T" role="3RnzBd">
+      <property role="TrG5h" value="foo_55" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_U" role="3RnzBd">
+      <property role="TrG5h" value="foo_56" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_V" role="3RnzBd">
+      <property role="TrG5h" value="foo_57" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_W" role="3RnzBd">
+      <property role="TrG5h" value="foo_58" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_X" role="3RnzBd">
+      <property role="TrG5h" value="foo_59" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_Y" role="3RnzBd">
+      <property role="TrG5h" value="foo_60" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7Mm_Z" role="3RnzBd">
+      <property role="TrG5h" value="foo_61" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA0" role="3RnzBd">
+      <property role="TrG5h" value="foo_62" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA1" role="3RnzBd">
+      <property role="TrG5h" value="foo_63" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA2" role="3RnzBd">
+      <property role="TrG5h" value="foo_64" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA3" role="3RnzBd">
+      <property role="TrG5h" value="foo_65" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA4" role="3RnzBd">
+      <property role="TrG5h" value="foo_66" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA5" role="3RnzBd">
+      <property role="TrG5h" value="foo_67" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA6" role="3RnzBd">
+      <property role="TrG5h" value="foo_68" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA7" role="3RnzBd">
+      <property role="TrG5h" value="foo_69" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA8" role="3RnzBd">
+      <property role="TrG5h" value="foo_70" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA9" role="3RnzBd">
+      <property role="TrG5h" value="foo_71" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAa" role="3RnzBd">
+      <property role="TrG5h" value="foo_72" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAb" role="3RnzBd">
+      <property role="TrG5h" value="foo_73" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAc" role="3RnzBd">
+      <property role="TrG5h" value="foo_74" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAd" role="3RnzBd">
+      <property role="TrG5h" value="foo_75" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAe" role="3RnzBd">
+      <property role="TrG5h" value="foo_76" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAf" role="3RnzBd">
+      <property role="TrG5h" value="foo_77" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAg" role="3RnzBd">
+      <property role="TrG5h" value="foo_78" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAh" role="3RnzBd">
+      <property role="TrG5h" value="foo_79" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAi" role="3RnzBd">
+      <property role="TrG5h" value="foo_80" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAj" role="3RnzBd">
+      <property role="TrG5h" value="foo_81" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAk" role="3RnzBd">
+      <property role="TrG5h" value="foo_82" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAl" role="3RnzBd">
+      <property role="TrG5h" value="foo_83" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAm" role="3RnzBd">
+      <property role="TrG5h" value="foo_84" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAn" role="3RnzBd">
+      <property role="TrG5h" value="foo_85" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAo" role="3RnzBd">
+      <property role="TrG5h" value="foo_86" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAp" role="3RnzBd">
+      <property role="TrG5h" value="foo_87" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAq" role="3RnzBd">
+      <property role="TrG5h" value="foo_88" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAr" role="3RnzBd">
+      <property role="TrG5h" value="foo_89" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAs" role="3RnzBd">
+      <property role="TrG5h" value="foo_90" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAt" role="3RnzBd">
+      <property role="TrG5h" value="foo_91" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAu" role="3RnzBd">
+      <property role="TrG5h" value="foo_92" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAv" role="3RnzBd">
+      <property role="TrG5h" value="foo_93" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAw" role="3RnzBd">
+      <property role="TrG5h" value="foo_94" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAx" role="3RnzBd">
+      <property role="TrG5h" value="foo_95" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAy" role="3RnzBd">
+      <property role="TrG5h" value="foo_96" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAz" role="3RnzBd">
+      <property role="TrG5h" value="foo_97" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA$" role="3RnzBd">
+      <property role="TrG5h" value="foo_98" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmA_" role="3RnzBd">
+      <property role="TrG5h" value="foo_99" />
+    </node>
+    <node concept="3RnEV5" id="33$34j7MmAA" role="3RnzBd">
+      <property role="TrG5h" value="foo_100" />
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd
index 4ac393eec3..1847f3e6ff 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd
@@ -17,6 +17,10 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
+    <dependency reexport="false">6fd1293f-7f65-4ffd-99dc-4719eca7c171(jetbrains.mps.ide.vcs.platform)</dependency>
+    <dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
+    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -24,6 +28,8 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l: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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
@@ -33,18 +39,24 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)" version="0" />
     <module reference="f47b95d4-5e73-4c04-9204-18076950153b(com.mbeddr.mpsutil.compare)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
     <module reference="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" version="0" />
+    <module reference="6fd1293f-7f65-4ffd-99dc-4719eca7c171(jetbrains.mps.ide.vcs.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model
index a814c64377..7ea8bd48f2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model
@@ -10,6 +10,8 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
@@ -19,6 +21,17 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
+    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
+    <import index="p37l" ref="r:df1b052a-af27-4b87-80fc-1492fa2192be(jetbrains.mps.vcs.diff.ui)" />
+    <import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" />
+    <import index="tqvn" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.tempmodel(MPS.Core/)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
+    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
+    <import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" />
+    <import index="qjvf" ref="r:82cadfba-0fcc-402e-8eaa-37395d383fb6(com.mbeddr.mpsutil.compare.behavior)" implicit="true" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
   </imports>
 </model>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr
new file mode 100644
index 0000000000..a743ad32b0
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr
@@ -0,0 +1,1388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:ec874b45-e888-42e6-995a-a298cefdff55(com.mbeddr.mpsutil.comparator.code)" content="root">
+  <persistence version="9" />
+  <imports>
+    <import index="8do3" ref="r:cea04c4b-adba-417e-a192-34c7a8799ac1(com.mbeddr.mpsutil.compare.structure)" implicit="true" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" implicit="true" />
+    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" implicit="true" />
+    <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="p37l" ref="r:df1b052a-af27-4b87-80fc-1492fa2192be(jetbrains.mps.vcs.diff.ui)" implicit="true" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" implicit="true" />
+    <import index="qjvf" ref="r:82cadfba-0fcc-402e-8eaa-37395d383fb6(com.mbeddr.mpsutil.compare.behavior)" implicit="true" />
+    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" implicit="true" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" implicit="true" />
+    <import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" implicit="true" />
+    <import index="tqvn" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.tempmodel(MPS.Core/)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <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="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
+        <child id="1081256993305" name="classType" index="2ZW6by" />
+        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
+        <child id="1070534760952" name="componentType" index="10Q1$1" />
+      </concept>
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <property id="1181808852946" name="isFinal" index="DiZV1" />
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="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="1154542696413" name="jetbrains.mps.baseLanguage.structure.ArrayCreatorWithInitializer" flags="nn" index="3g6Rrh">
+        <child id="1154542793668" name="componentType" index="3g7fb8" />
+        <child id="1154542803372" name="initValue" index="3g7hyw" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1073063089578" name="jetbrains.mps.baseLanguage.structure.SuperMethodCall" flags="nn" index="3nyPlj" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
+      <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" />
+      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </concept>
+    </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="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
+    </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="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
+        <property id="5858074156537516431" name="text" index="x79VB" />
+      </concept>
+      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
+      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
+        <reference id="6832197706140518108" name="param" index="zr_51" />
+      </concept>
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+        <child id="5383422241790532083" name="tags" index="3nqlJM" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
+        <property id="8465538089690881934" name="text" index="TUZQ4" />
+        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
+      </concept>
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+    </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
+        <property id="6332851714983843871" name="severity" index="2xdLsb" />
+        <child id="5721587534047265560" name="project" index="9lYEk" />
+        <child id="5721587534047265374" name="message" index="9lYJi" />
+      </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="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
+      <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
+      <concept id="1206482823744" name="jetbrains.mps.lang.smodel.structure.Model_AddRootOperation" flags="nn" index="3BYIHo">
+        <child id="1206482823746" name="nodeArgument" index="3BYIHq" />
+      </concept>
+      <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
+        <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
+      </concept>
+      <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
+        <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
+      </concept>
+      <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
+        <child id="1140131861877" name="replacementNode" index="1P9ThW" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
+    </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" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </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="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435808" name="initValue" index="HW$Y0" />
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+    </language>
+  </registry>
+  <node concept="312cEu" id="3zBhpJM4ANC">
+    <property role="3GE5qa" value="difference" />
+    <property role="TrG5h" value="DiffView" />
+    <node concept="2tJIrI" id="5oR1gCFT7xN" role="jymVt" />
+    <node concept="2YIFZL" id="5oR1gCFT7ZE" role="jymVt">
+      <property role="TrG5h" value="showNonEditibleDiff" />
+      <node concept="37vLTG" id="5oR1gCFT86O" role="3clF46">
+        <property role="TrG5h" value="expected" />
+        <node concept="3Tqbb2" id="5oR1gCFT86P" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="5oR1gCFT86Q" role="3clF46">
+        <property role="TrG5h" value="actual" />
+        <node concept="3Tqbb2" id="5oR1gCFT86R" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="5oR1gCFT86S" role="3clF46">
+        <property role="TrG5h" value="result" />
+        <node concept="3uibUv" id="5oR1gCFT86T" role="1tU5fm">
+          <ref role="3uigEE" node="494SuRWLRaN" resolve="MPSNodeComparisonResult" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5oR1gCFT86U" role="3clF46">
+        <property role="TrG5h" value="input" />
+        <node concept="3Tqbb2" id="5oR1gCFT86V" role="1tU5fm">
+          <ref role="ehGHo" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5oR1gCFT86W" role="3clF46">
+        <property role="TrG5h" value="repo" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="5oR1gCFT86X" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5oR1gCFT7ZH" role="3clF47">
+        <node concept="3clFbJ" id="5oR1gCFT89C" role="3cqZAp">
+          <node concept="3clFbS" id="5oR1gCFT89D" role="3clFbx">
+            <node concept="3cpWs8" id="5oR1gCFT89E" role="3cqZAp">
+              <node concept="3cpWsn" id="5oR1gCFT89F" role="3cpWs9">
+                <property role="TrG5h" value="mpsProject" />
+                <node concept="3uibUv" id="5oR1gCFT89G" role="1tU5fm">
+                  <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
+                </node>
+                <node concept="10QFUN" id="5oR1gCFT89H" role="33vP2m">
+                  <node concept="3uibUv" id="5oR1gCFT89I" role="10QFUM">
+                    <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
+                  </node>
+                  <node concept="2YIFZM" id="5oR1gCFT89J" role="10QFUP">
+                    <ref role="37wK5l" to="alof:~ProjectHelper.getProject(org.jetbrains.mps.openapi.module.SRepository)" resolve="getProject" />
+                    <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+                    <node concept="37vLTw" id="5oR1gCFT89K" role="37wK5m">
+                      <ref role="3cqZAo" node="5oR1gCFT86W" resolve="repo" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="5oR1gCFT89L" role="3cqZAp">
+              <node concept="3cpWsn" id="5oR1gCFT89M" role="3cpWs9">
+                <property role="TrG5h" value="leftCaption" />
+                <node concept="17QB3L" id="5oR1gCFT89N" role="1tU5fm" />
+                <node concept="3cpWs3" id="5oR1gCFT89O" role="33vP2m">
+                  <node concept="Xl_RD" id="5oR1gCFT89P" role="3uHU7w">
+                    <property role="Xl_RC" value=")" />
+                  </node>
+                  <node concept="3cpWs3" id="5oR1gCFT89Q" role="3uHU7B">
+                    <node concept="3cpWs3" id="5oR1gCFT89R" role="3uHU7B">
+                      <node concept="3cpWs3" id="5oR1gCFT89S" role="3uHU7B">
+                        <node concept="Xl_RD" id="5oR1gCFT89T" role="3uHU7B">
+                          <property role="Xl_RC" value="expected output (in root \&quot;" />
+                        </node>
+                        <node concept="2OqwBi" id="5oR1gCFT89U" role="3uHU7w">
+                          <node concept="2JrnkZ" id="5oR1gCFT89V" role="2Oq$k0">
+                            <node concept="37vLTw" id="5oR1gCFT89W" role="2JrQYb">
+                              <ref role="3cqZAo" node="5oR1gCFT86O" resolve="expected" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="5oR1gCFT89X" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="5oR1gCFT89Y" role="3uHU7w">
+                        <property role="Xl_RC" value="\&quot; in model " />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="5oR1gCFT89Z" role="3uHU7w">
+                      <node concept="2OqwBi" id="5oR1gCFT8a0" role="2Oq$k0">
+                        <node concept="37vLTw" id="5oR1gCFT8a1" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5oR1gCFT86O" resolve="expected" />
+                        </node>
+                        <node concept="I4A8Y" id="5oR1gCFT8a2" role="2OqNvi" />
+                      </node>
+                      <node concept="LkI2h" id="5oR1gCFT8a3" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="5oR1gCFT8a4" role="3cqZAp">
+              <node concept="3cpWsn" id="5oR1gCFT8a5" role="3cpWs9">
+                <property role="TrG5h" value="rightCaption" />
+                <node concept="17QB3L" id="5oR1gCFT8a6" role="1tU5fm" />
+                <node concept="3cpWs3" id="5oR1gCFT8a7" role="33vP2m">
+                  <node concept="3cpWs3" id="5oR1gCFT8a8" role="3uHU7B">
+                    <node concept="Xl_RD" id="5oR1gCFT8a9" role="3uHU7B">
+                      <property role="Xl_RC" value="actual output (in root \&quot;" />
+                    </node>
+                    <node concept="2OqwBi" id="5oR1gCFT8aa" role="3uHU7w">
+                      <node concept="2JrnkZ" id="5oR1gCFT8ab" role="2Oq$k0">
+                        <node concept="37vLTw" id="5oR1gCFT8ac" role="2JrQYb">
+                          <ref role="3cqZAo" node="5oR1gCFT86Q" resolve="actual" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="5oR1gCFT8ad" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Xl_RD" id="5oR1gCFT8ae" role="3uHU7w">
+                    <property role="Xl_RC" value="\&quot; in generated model)" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="5oR1gCFT8af" role="3cqZAp" />
+            <node concept="3cpWs8" id="6GJZxHzy24E" role="3cqZAp">
+              <node concept="3cpWsn" id="6GJZxHzy24F" role="3cpWs9">
+                <property role="TrG5h" value="actualTmpMdl" />
+                <node concept="H_c77" id="6GJZxHzy0JA" role="1tU5fm" />
+                <node concept="1rXfSq" id="6GJZxHzy24G" role="33vP2m">
+                  <ref role="37wK5l" node="5oR1gCFG6qZ" resolve="addToTempModel" />
+                  <node concept="37vLTw" id="6GJZxHzy24H" role="37wK5m">
+                    <ref role="3cqZAo" node="5oR1gCFT86Q" resolve="actual" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="6GJZxHzy35o" role="3cqZAp">
+              <node concept="3cpWsn" id="6GJZxHzy35p" role="3cpWs9">
+                <property role="TrG5h" value="expectedTmpMdl" />
+                <node concept="H_c77" id="6GJZxHzy2Y$" role="1tU5fm" />
+                <node concept="1rXfSq" id="6GJZxHzy35q" role="33vP2m">
+                  <ref role="37wK5l" node="5oR1gCFG6qZ" resolve="addToTempModel" />
+                  <node concept="37vLTw" id="6GJZxHzy35r" role="37wK5m">
+                    <ref role="3cqZAo" node="5oR1gCFT86O" resolve="expected" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="5oR1gCFT8ao" role="3cqZAp" />
+            <node concept="3clFbF" id="5oR1gCFT8ap" role="3cqZAp">
+              <node concept="2OqwBi" id="5oR1gCFT8aq" role="3clFbG">
+                <node concept="2OqwBi" id="5oR1gCFT8ar" role="2Oq$k0">
+                  <node concept="37vLTw" id="5oR1gCFT8as" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5oR1gCFT86W" resolve="repo" />
+                  </node>
+                  <node concept="liA8E" id="5oR1gCFT8at" role="2OqNvi">
+                    <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="5oR1gCFT8au" role="2OqNvi">
+                  <ref role="37wK5l" to="lui2:~ModelAccess.runReadAction(java.lang.Runnable)" resolve="runReadAction" />
+                  <node concept="1bVj0M" id="5oR1gCFT8av" role="37wK5m">
+                    <node concept="3clFbS" id="5oR1gCFT8aw" role="1bW5cS">
+                      <node concept="3cpWs8" id="6GJZxHzy7m1" role="3cqZAp">
+                        <node concept="3cpWsn" id="6GJZxHzy7m4" role="3cpWs9">
+                          <property role="TrG5h" value="dialog" />
+                          <node concept="2ShNRf" id="6GJZxHzy7m5" role="33vP2m">
+                            <node concept="YeOm9" id="6GJZxHzy7m6" role="2ShVmc">
+                              <node concept="1Y3b0j" id="6GJZxHzy7m7" role="YeSDq">
+                                <property role="2bfB8j" value="true" />
+                                <ref role="37wK5l" to="p37l:778KdJ_suSg" resolve="StructDifferenceDialog" />
+                                <ref role="1Y3XeK" to="p37l:778KdJ_suR6" resolve="StructDifferenceDialog" />
+                                <node concept="3Tm1VV" id="6GJZxHzy7m9" role="1B3o_S" />
+                                <node concept="2OqwBi" id="6GJZxHzy7ma" role="37wK5m">
+                                  <node concept="37vLTw" id="6GJZxHzy7mb" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="5oR1gCFT89F" resolve="mpsProject" />
+                                  </node>
+                                  <node concept="liA8E" id="6GJZxHzy7mc" role="2OqNvi">
+                                    <ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
+                                  </node>
+                                </node>
+                                <node concept="37vLTw" id="6GJZxHzy7md" role="37wK5m">
+                                  <ref role="3cqZAo" node="5oR1gCFT86O" resolve="expected" />
+                                </node>
+                                <node concept="37vLTw" id="6GJZxHzy7me" role="37wK5m">
+                                  <ref role="3cqZAo" node="5oR1gCFT86Q" resolve="actual" />
+                                </node>
+                                <node concept="37vLTw" id="6GJZxHzy7mf" role="37wK5m">
+                                  <ref role="3cqZAo" node="5oR1gCFT89M" resolve="leftCaption" />
+                                </node>
+                                <node concept="37vLTw" id="6GJZxHzy7mg" role="37wK5m">
+                                  <ref role="3cqZAo" node="5oR1gCFT8a5" resolve="rightCaption" />
+                                </node>
+                                <node concept="3clFb_" id="6GJZxHzy7ni" role="jymVt">
+                                  <property role="TrG5h" value="dispose" />
+                                  <property role="DiZV1" value="false" />
+                                  <node concept="3Tmbuc" id="6GJZxHzy7nj" role="1B3o_S" />
+                                  <node concept="3cqZAl" id="6GJZxHzy7nk" role="3clF45" />
+                                  <node concept="2AHcQZ" id="6GJZxHzy7nl" role="2AJF6D">
+                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                  </node>
+                                  <node concept="3clFbS" id="6GJZxHzy7nm" role="3clF47">
+                                    <node concept="3clFbF" id="6GJZxHzy7nn" role="3cqZAp">
+                                      <node concept="3nyPlj" id="6GJZxHzy7no" role="3clFbG">
+                                        <ref role="37wK5l" to="p37l:778KdJ_suYn" resolve="dispose" />
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbF" id="6GJZxHzy7np" role="3cqZAp">
+                                      <node concept="1rXfSq" id="6GJZxHzy7nq" role="3clFbG">
+                                        <ref role="37wK5l" node="6GJZxHzvCoM" resolve="disposeTmpModel" />
+                                        <node concept="37vLTw" id="6GJZxHzy7nr" role="37wK5m">
+                                          <ref role="3cqZAo" node="6GJZxHzy35p" resolve="expectedTmpMdl" />
+                                        </node>
+                                        <node concept="37vLTw" id="6GJZxHz$SLy" role="37wK5m">
+                                          <ref role="3cqZAo" node="5oR1gCFT86W" resolve="repo" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbF" id="6GJZxHzy7ns" role="3cqZAp">
+                                      <node concept="1rXfSq" id="6GJZxHzy7nt" role="3clFbG">
+                                        <ref role="37wK5l" node="6GJZxHzvCoM" resolve="disposeTmpModel" />
+                                        <node concept="37vLTw" id="6GJZxHzy7nu" role="37wK5m">
+                                          <ref role="3cqZAo" node="6GJZxHzy24F" resolve="actualTmpMdl" />
+                                        </node>
+                                        <node concept="37vLTw" id="6GJZxHz$TcT" role="37wK5m">
+                                          <ref role="3cqZAo" node="5oR1gCFT86W" resolve="repo" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3uibUv" id="6GJZxHzy7nv" role="1tU5fm">
+                            <ref role="3uigEE" to="p37l:778KdJ_suR6" resolve="StructDifferenceDialog" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="6GJZxHzyao0" role="3cqZAp">
+                        <node concept="2OqwBi" id="6GJZxHzyao1" role="3clFbG">
+                          <node concept="37vLTw" id="6GJZxHzyao2" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6GJZxHzy7m4" resolve="dialog" />
+                          </node>
+                          <node concept="liA8E" id="6GJZxHzyao3" role="2OqNvi">
+                            <ref role="37wK5l" to="jkm4:~DialogWrapper.setModal(boolean)" resolve="setModal" />
+                            <node concept="3clFbT" id="6GJZxHzyao4" role="37wK5m">
+                              <property role="3clFbU" value="false" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="6GJZxHzyao5" role="3cqZAp">
+                        <node concept="2OqwBi" id="6GJZxHzyao6" role="3clFbG">
+                          <node concept="37vLTw" id="6GJZxHzyao7" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6GJZxHzy7m4" resolve="dialog" />
+                          </node>
+                          <node concept="liA8E" id="6GJZxHzyao8" role="2OqNvi">
+                            <ref role="37wK5l" to="jkm4:~DialogWrapper.show()" resolve="show" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Wc70l" id="5oR1gCFT8bk" role="3clFbw">
+            <node concept="2OqwBi" id="5oR1gCFT8bl" role="3uHU7w">
+              <node concept="37vLTw" id="5oR1gCFT8bm" role="2Oq$k0">
+                <ref role="3cqZAo" node="5oR1gCFT86Q" resolve="actual" />
+              </node>
+              <node concept="3x8VRR" id="5oR1gCFT8bn" role="2OqNvi" />
+            </node>
+            <node concept="1Wc70l" id="5oR1gCFT8bo" role="3uHU7B">
+              <node concept="2OqwBi" id="5oR1gCFT8bp" role="3uHU7B">
+                <node concept="37vLTw" id="5oR1gCFT8bq" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5oR1gCFT86U" resolve="input" />
+                </node>
+                <node concept="2qgKlT" id="5oR1gCFT8br" role="2OqNvi">
+                  <ref role="37wK5l" to="qjvf:6Od11GY7tN$" resolve="isDiffEnabled" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="5oR1gCFT8bs" role="3uHU7w">
+                <node concept="37vLTw" id="5oR1gCFT8bt" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5oR1gCFT86O" resolve="expected" />
+                </node>
+                <node concept="3x8VRR" id="5oR1gCFT8bu" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5oR1gCFT7Kk" role="1B3o_S" />
+      <node concept="3cqZAl" id="5oR1gCFT7ST" role="3clF45" />
+    </node>
+    <node concept="2YIFZL" id="3zBhpJM4BmM" role="jymVt">
+      <property role="TrG5h" value="showDiffDialog" />
+      <node concept="3Tm1VV" id="3zBhpJM4BmN" role="1B3o_S" />
+      <node concept="3cqZAl" id="3zBhpJM4BmO" role="3clF45" />
+      <node concept="37vLTG" id="3zBhpJM4Bmr" role="3clF46">
+        <property role="TrG5h" value="expected" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3Tqbb2" id="3zBhpJM4Bms" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3zBhpJM4Bmt" role="3clF46">
+        <property role="TrG5h" value="actual" />
+        <node concept="3Tqbb2" id="3zBhpJM4Bmu" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3zBhpJM4Bmv" role="3clF46">
+        <property role="TrG5h" value="result" />
+        <node concept="3uibUv" id="3zBhpJM4Bmw" role="1tU5fm">
+          <ref role="3uigEE" node="494SuRWLRaN" resolve="MPSNodeComparisonResult" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6Od11GY9ip0" role="3clF46">
+        <property role="TrG5h" value="input" />
+        <node concept="3Tqbb2" id="6Od11GY98Ba" role="1tU5fm">
+          <ref role="ehGHo" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3zBhpJM5Jws" role="3clF46">
+        <property role="TrG5h" value="repo" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="3zBhpJM5M_C" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3zBhpJM4Bfj" role="3clF47">
+        <node concept="3clFbH" id="6Qumy0DUXR6" role="3cqZAp" />
+        <node concept="3clFbJ" id="6Od11GYe2sx" role="3cqZAp">
+          <node concept="3clFbS" id="6Od11GYe2sz" role="3clFbx">
+            <node concept="3cpWs8" id="3zBhpJM4Blb" role="3cqZAp">
+              <node concept="3cpWsn" id="3zBhpJM4Blc" role="3cpWs9">
+                <property role="TrG5h" value="mpsProject" />
+                <node concept="3uibUv" id="3zBhpJM4Bld" role="1tU5fm">
+                  <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
+                </node>
+                <node concept="10QFUN" id="3zBhpJM4Ble" role="33vP2m">
+                  <node concept="3uibUv" id="3zBhpJM4Blf" role="10QFUM">
+                    <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
+                  </node>
+                  <node concept="2YIFZM" id="6Qumy0DW60V" role="10QFUP">
+                    <ref role="37wK5l" to="alof:~ProjectHelper.getProject(org.jetbrains.mps.openapi.module.SRepository)" resolve="getProject" />
+                    <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+                    <node concept="37vLTw" id="6Qumy0DW60W" role="37wK5m">
+                      <ref role="3cqZAo" node="3zBhpJM5Jws" resolve="repo" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="6Qumy0DWNrI" role="3cqZAp">
+              <node concept="3cpWsn" id="6Qumy0DWNrJ" role="3cpWs9">
+                <property role="TrG5h" value="leftCaption" />
+                <node concept="17QB3L" id="6Qumy0DWNqz" role="1tU5fm" />
+                <node concept="3cpWs3" id="6Qumy0DWNrK" role="33vP2m">
+                  <node concept="Xl_RD" id="6Qumy0DWNrL" role="3uHU7w">
+                    <property role="Xl_RC" value=")" />
+                  </node>
+                  <node concept="3cpWs3" id="6Qumy0DWNrM" role="3uHU7B">
+                    <node concept="3cpWs3" id="6Qumy0DWNrN" role="3uHU7B">
+                      <node concept="3cpWs3" id="6Qumy0DWNrO" role="3uHU7B">
+                        <node concept="Xl_RD" id="6Qumy0DWNrP" role="3uHU7B">
+                          <property role="Xl_RC" value="expected output (in root \&quot;" />
+                        </node>
+                        <node concept="2OqwBi" id="6Qumy0DWNrQ" role="3uHU7w">
+                          <node concept="2JrnkZ" id="6Qumy0DWNrR" role="2Oq$k0">
+                            <node concept="37vLTw" id="6Qumy0DWNrS" role="2JrQYb">
+                              <ref role="3cqZAo" node="3zBhpJM4Bmr" resolve="expected" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="6Qumy0DWNrT" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="6Qumy0DWNrU" role="3uHU7w">
+                        <property role="Xl_RC" value="\&quot; in model " />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="6Qumy0DWNrV" role="3uHU7w">
+                      <node concept="2OqwBi" id="6Qumy0DWNrW" role="2Oq$k0">
+                        <node concept="37vLTw" id="6Qumy0DWNrX" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3zBhpJM4Bmr" resolve="expected" />
+                        </node>
+                        <node concept="I4A8Y" id="6Qumy0DWNrY" role="2OqNvi" />
+                      </node>
+                      <node concept="LkI2h" id="6Qumy0DWNrZ" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="6Qumy0DWNZZ" role="3cqZAp">
+              <node concept="3cpWsn" id="6Qumy0DWO00" role="3cpWs9">
+                <property role="TrG5h" value="rightCaption" />
+                <node concept="17QB3L" id="6Qumy0DWNYZ" role="1tU5fm" />
+                <node concept="3cpWs3" id="6Qumy0DWO01" role="33vP2m">
+                  <node concept="3cpWs3" id="6Qumy0DWO02" role="3uHU7B">
+                    <node concept="Xl_RD" id="6Qumy0DWO03" role="3uHU7B">
+                      <property role="Xl_RC" value="actual output (in root \&quot;" />
+                    </node>
+                    <node concept="2OqwBi" id="6Qumy0DWO04" role="3uHU7w">
+                      <node concept="2JrnkZ" id="6Qumy0DWO05" role="2Oq$k0">
+                        <node concept="37vLTw" id="6Qumy0DWO06" role="2JrQYb">
+                          <ref role="3cqZAo" node="3zBhpJM4Bmt" resolve="actual" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6Qumy0DWO07" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Xl_RD" id="6Qumy0DWO08" role="3uHU7w">
+                    <property role="Xl_RC" value="\&quot; in generated model)" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="6Qumy0DWP1N" role="3cqZAp" />
+            <node concept="3cpWs8" id="6GJZxHzvkmL" role="3cqZAp">
+              <node concept="3cpWsn" id="6GJZxHzvkmM" role="3cpWs9">
+                <property role="TrG5h" value="actualTmpMdl" />
+                <node concept="H_c77" id="6GJZxHzvfWC" role="1tU5fm" />
+                <node concept="1rXfSq" id="6GJZxHzvkmN" role="33vP2m">
+                  <ref role="37wK5l" node="5oR1gCFG6qZ" resolve="addToTempModel" />
+                  <node concept="37vLTw" id="6GJZxHzvkmO" role="37wK5m">
+                    <ref role="3cqZAo" node="3zBhpJM4Bmt" resolve="actual" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="6GJZxHzvmJW" role="3cqZAp">
+              <node concept="3cpWsn" id="6GJZxHzvmJX" role="3cpWs9">
+                <property role="TrG5h" value="expectedTmpMdl" />
+                <node concept="H_c77" id="6GJZxHzvmsM" role="1tU5fm" />
+                <node concept="1rXfSq" id="6GJZxHzvmJY" role="33vP2m">
+                  <ref role="37wK5l" node="5oR1gCFG6qZ" resolve="addToTempModel" />
+                  <node concept="37vLTw" id="6GJZxHzvmJZ" role="37wK5m">
+                    <ref role="3cqZAo" node="3zBhpJM4Bmr" resolve="expected" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="6qlKzgha_da" role="3cqZAp" />
+            <node concept="3clFbH" id="6GJZxHzsWW$" role="3cqZAp" />
+            <node concept="3clFbF" id="6Qumy0DWKXB" role="3cqZAp">
+              <node concept="2OqwBi" id="6Qumy0DWLtM" role="3clFbG">
+                <node concept="2OqwBi" id="6Qumy0DWL7g" role="2Oq$k0">
+                  <node concept="37vLTw" id="6Qumy0DWKX_" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3zBhpJM5Jws" resolve="repo" />
+                  </node>
+                  <node concept="liA8E" id="6Qumy0DWLl1" role="2OqNvi">
+                    <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="6Qumy0DWLCJ" role="2OqNvi">
+                  <ref role="37wK5l" to="lui2:~ModelAccess.runReadAction(java.lang.Runnable)" resolve="runReadAction" />
+                  <node concept="1bVj0M" id="6Qumy0DWLL2" role="37wK5m">
+                    <node concept="3clFbS" id="6Qumy0DWLL3" role="1bW5cS">
+                      <node concept="3cpWs8" id="5oR1gCFGfvv" role="3cqZAp">
+                        <node concept="3cpWsn" id="5oR1gCFGfvw" role="3cpWs9">
+                          <property role="TrG5h" value="expectedCleaned" />
+                          <node concept="3Tqbb2" id="5oR1gCFGfsE" role="1tU5fm" />
+                          <node concept="1rXfSq" id="6GJZxHzjF1Y" role="33vP2m">
+                            <ref role="37wK5l" node="5oR1gCFG4ZA" resolve="cloneNode" />
+                            <node concept="37vLTw" id="6GJZxHzjF1Z" role="37wK5m">
+                              <ref role="3cqZAo" node="3zBhpJM4Bmr" resolve="expected" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="5oR1gCFGkys" role="3cqZAp" />
+                      <node concept="3cpWs8" id="778KdJ_sv3i" role="3cqZAp">
+                        <node concept="3cpWsn" id="778KdJ_sv3j" role="3cpWs9">
+                          <property role="TrG5h" value="dialog" />
+                          <node concept="2ShNRf" id="778KdJ_sv3k" role="33vP2m">
+                            <node concept="YeOm9" id="2u2Kgtdlo0Q" role="2ShVmc">
+                              <node concept="1Y3b0j" id="2u2Kgtdlo0T" role="YeSDq">
+                                <property role="2bfB8j" value="true" />
+                                <ref role="37wK5l" to="p37l:778KdJ_suSg" resolve="StructDifferenceDialog" />
+                                <ref role="1Y3XeK" to="p37l:778KdJ_suR6" resolve="StructDifferenceDialog" />
+                                <node concept="2tJIrI" id="2u2KgtdovIs" role="jymVt" />
+                                <node concept="3Tm1VV" id="2u2Kgtdlo0U" role="1B3o_S" />
+                                <node concept="2OqwBi" id="2u2KgtdlfvO" role="37wK5m">
+                                  <node concept="37vLTw" id="2u2KgtdlfvP" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="3zBhpJM4Blc" resolve="mpsProject" />
+                                  </node>
+                                  <node concept="liA8E" id="2u2KgtdlfvQ" role="2OqNvi">
+                                    <ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
+                                  </node>
+                                </node>
+                                <node concept="37vLTw" id="2u2KgtdlfvR" role="37wK5m">
+                                  <ref role="3cqZAo" node="5oR1gCFGfvw" resolve="expectedCleaned" />
+                                </node>
+                                <node concept="37vLTw" id="2u2KgtdlfvS" role="37wK5m">
+                                  <ref role="3cqZAo" node="3zBhpJM4Bmt" resolve="actual" />
+                                </node>
+                                <node concept="37vLTw" id="2u2KgtdlfvT" role="37wK5m">
+                                  <ref role="3cqZAo" node="6Qumy0DWNrJ" resolve="leftCaption" />
+                                </node>
+                                <node concept="37vLTw" id="2u2KgtdlfvU" role="37wK5m">
+                                  <ref role="3cqZAo" node="6Qumy0DWO00" resolve="rightCaption" />
+                                </node>
+                                <node concept="3clFb_" id="2u2Kgtdowmg" role="jymVt">
+                                  <property role="TrG5h" value="createSouthPanel" />
+                                  <property role="DiZV1" value="false" />
+                                  <node concept="3Tmbuc" id="2u2Kgtdowmh" role="1B3o_S" />
+                                  <node concept="3uibUv" id="2u2Kgtdowmi" role="3clF45">
+                                    <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+                                  </node>
+                                  <node concept="2AHcQZ" id="2u2Kgtdowmj" role="2AJF6D">
+                                    <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+                                  </node>
+                                  <node concept="2AHcQZ" id="2u2Kgtdowmn" role="2AJF6D">
+                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                  </node>
+                                  <node concept="3clFbS" id="2u2Kgtdowmp" role="3clF47">
+                                    <node concept="3clFbF" id="2u2KgtdozNv" role="3cqZAp">
+                                      <node concept="1rXfSq" id="2u2KgtdozNu" role="3clFbG">
+                                        <ref role="37wK5l" to="jkm4:~DialogWrapper.createButtonsPanel(java.util.List)" resolve="createButtonsPanel" />
+                                        <node concept="2ShNRf" id="2u2KgtdoKnY" role="37wK5m">
+                                          <node concept="Tc6Ow" id="2u2KgtdoLZf" role="2ShVmc">
+                                            <node concept="3uibUv" id="2u2KgtdoNM4" role="HW$YZ">
+                                              <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
+                                            </node>
+                                            <node concept="1rXfSq" id="2u2Kgtdo$YI" role="HW$Y0">
+                                              <ref role="37wK5l" to="jkm4:~DialogWrapper.createJButtonForAction(javax.swing.Action)" resolve="createJButtonForAction" />
+                                              <node concept="1rXfSq" id="2u2Kgtdo_VW" role="37wK5m">
+                                                <ref role="37wK5l" to="jkm4:~DialogWrapper.getOKAction()" resolve="getOKAction" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFb_" id="2u2KgtdlouM" role="jymVt">
+                                  <property role="TrG5h" value="doOKAction" />
+                                  <node concept="3Tmbuc" id="2u2KgtdlouN" role="1B3o_S" />
+                                  <node concept="3cqZAl" id="2u2KgtdlouP" role="3clF45" />
+                                  <node concept="3clFbS" id="2u2KgtdlouT" role="3clF47">
+                                    <node concept="2xdQw9" id="2u2Kgtdm5P5" role="3cqZAp">
+                                      <property role="2xdLsb" value="gZ5fh_4/error" />
+                                      <node concept="Xl_RD" id="2u2Kgtdm5P7" role="9lYJi">
+                                        <property role="Xl_RC" value="OK" />
+                                      </node>
+                                      <node concept="37vLTw" id="2u2KgtdmC0f" role="9lYEk">
+                                        <ref role="3cqZAo" node="3zBhpJM4Blc" resolve="mpsProject" />
+                                      </node>
+                                    </node>
+                                    <node concept="1QHqEO" id="2u2KgtdluI1" role="3cqZAp">
+                                      <node concept="1QHqEC" id="2u2KgtdluI3" role="1QHqEI">
+                                        <node concept="3clFbS" id="2u2KgtdluI5" role="1bW5cS">
+                                          <node concept="3cpWs8" id="5oR1gCFP9M2" role="3cqZAp">
+                                            <node concept="3cpWsn" id="5oR1gCFP9M3" role="3cpWs9">
+                                              <property role="TrG5h" value="originalLabel" />
+                                              <node concept="3Tqbb2" id="5oR1gCFP9Fu" role="1tU5fm">
+                                                <ref role="ehGHo" to="tp5g:hBxLA2s" resolve="TestNodeAnnotation" />
+                                              </node>
+                                              <node concept="2OqwBi" id="5oR1gCFURS0" role="33vP2m">
+                                                <node concept="2OqwBi" id="5oR1gCFP9M4" role="2Oq$k0">
+                                                  <node concept="37vLTw" id="5oR1gCFP9M5" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="3zBhpJM4Bmr" resolve="expected" />
+                                                  </node>
+                                                  <node concept="3CFZ6_" id="5oR1gCFP9M6" role="2OqNvi">
+                                                    <node concept="3CFYIy" id="5oR1gCFP9M7" role="3CFYIz">
+                                                      <ref role="3CFYIx" to="tp5g:hBxLA2s" resolve="TestNodeAnnotation" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="3YRAZt" id="2u2KgtdrlJF" role="2OqNvi" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3cpWs8" id="5oR1gCFPbmm" role="3cqZAp">
+                                            <node concept="3cpWsn" id="5oR1gCFPbmn" role="3cpWs9">
+                                              <property role="TrG5h" value="newOne" />
+                                              <node concept="3Tqbb2" id="5oR1gCFPbiB" role="1tU5fm" />
+                                              <node concept="2OqwBi" id="5oR1gCFPbmo" role="33vP2m">
+                                                <node concept="37vLTw" id="5oR1gCFPbmp" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="3zBhpJM4Bmr" resolve="expected" />
+                                                </node>
+                                                <node concept="1P9Npp" id="5oR1gCFPbmq" role="2OqNvi">
+                                                  <node concept="2OqwBi" id="2u2KgtdqJq_" role="1P9ThW">
+                                                    <node concept="37vLTw" id="5oR1gCFPbmr" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="5oR1gCFGfvw" resolve="expectedCleaned" />
+                                                    </node>
+                                                    <node concept="1$rogu" id="2u2KgtdqJRK" role="2OqNvi" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3clFbF" id="5oR1gCFGm9V" role="3cqZAp">
+                                            <node concept="37vLTI" id="5oR1gCFGnbR" role="3clFbG">
+                                              <node concept="2OqwBi" id="5oR1gCFGmq6" role="37vLTJ">
+                                                <node concept="37vLTw" id="5oR1gCFGm9T" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="5oR1gCFPbmn" resolve="newOne" />
+                                                </node>
+                                                <node concept="3CFZ6_" id="5oR1gCFGmH4" role="2OqNvi">
+                                                  <node concept="3CFYIy" id="5oR1gCFGmQC" role="3CFYIz">
+                                                    <ref role="3CFYIx" to="tp5g:hBxLA2s" resolve="TestNodeAnnotation" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="37vLTw" id="2u2KgtdrpeK" role="37vLTx">
+                                                <ref role="3cqZAo" node="5oR1gCFP9M3" resolve="originalLabel" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="37vLTw" id="2u2KgtdlvfM" role="ukAjM">
+                                        <ref role="3cqZAo" node="3zBhpJM5Jws" resolve="repo" />
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbF" id="2u2Kgtdni6S" role="3cqZAp">
+                                      <node concept="3nyPlj" id="2u2Kgtdni6Q" role="3clFbG">
+                                        <ref role="37wK5l" to="jkm4:~DialogWrapper.doOKAction()" resolve="doOKAction" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="2AHcQZ" id="2u2KgtdlouU" role="2AJF6D">
+                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                  </node>
+                                </node>
+                                <node concept="3clFb_" id="2u2KgtdnS9H" role="jymVt">
+                                  <property role="TrG5h" value="createActions" />
+                                  <node concept="2AHcQZ" id="2u2KgtdnS9I" role="2AJF6D">
+                                    <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+                                  </node>
+                                  <node concept="10Q1$e" id="2u2KgtdnS9J" role="3clF45">
+                                    <node concept="3uibUv" id="2u2KgtdnS9K" role="10Q1$1">
+                                      <ref role="3uigEE" to="dxuu:~Action" resolve="Action" />
+                                    </node>
+                                  </node>
+                                  <node concept="3Tmbuc" id="2u2KgtdnS9L" role="1B3o_S" />
+                                  <node concept="2AHcQZ" id="2u2KgtdnS9T" role="2AJF6D">
+                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                  </node>
+                                  <node concept="3clFbS" id="2u2KgtdnS9V" role="3clF47">
+                                    <node concept="3clFbF" id="2u2KgtdnTZ2" role="3cqZAp">
+                                      <node concept="2ShNRf" id="2u2KgtdnTYW" role="3clFbG">
+                                        <node concept="3g6Rrh" id="2u2KgtdnX3d" role="2ShVmc">
+                                          <node concept="3uibUv" id="2u2KgtdnWjQ" role="3g7fb8">
+                                            <ref role="3uigEE" to="dxuu:~Action" resolve="Action" />
+                                          </node>
+                                          <node concept="1rXfSq" id="2u2KgtdnXZl" role="3g7hyw">
+                                            <ref role="37wK5l" to="jkm4:~DialogWrapper.getOKAction()" resolve="getOKAction" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="2tJIrI" id="2u2KgtdrUWX" role="jymVt" />
+                                <node concept="3clFb_" id="2u2KgtdrVyu" role="jymVt">
+                                  <property role="TrG5h" value="dispose" />
+                                  <property role="DiZV1" value="false" />
+                                  <node concept="3Tmbuc" id="2u2KgtdrVyv" role="1B3o_S" />
+                                  <node concept="3cqZAl" id="2u2KgtdrVyw" role="3clF45" />
+                                  <node concept="2AHcQZ" id="2u2KgtdrVza" role="2AJF6D">
+                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                  </node>
+                                  <node concept="3clFbS" id="2u2KgtdrVzc" role="3clF47">
+                                    <node concept="3clFbF" id="2u2KgtdrVze" role="3cqZAp">
+                                      <node concept="3nyPlj" id="2u2KgtdrVzd" role="3clFbG">
+                                        <ref role="37wK5l" to="p37l:778KdJ_suYn" resolve="dispose" />
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbF" id="6GJZxHzwLvP" role="3cqZAp">
+                                      <node concept="1rXfSq" id="6GJZxHzwLvN" role="3clFbG">
+                                        <ref role="37wK5l" node="6GJZxHzvCoM" resolve="disposeTmpModel" />
+                                        <node concept="37vLTw" id="6GJZxHzwMo1" role="37wK5m">
+                                          <ref role="3cqZAo" node="6GJZxHzvmJX" resolve="expectedTmpMdl" />
+                                        </node>
+                                        <node concept="37vLTw" id="6GJZxHz$QWe" role="37wK5m">
+                                          <ref role="3cqZAo" node="3zBhpJM5Jws" resolve="repo" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbF" id="6GJZxHzwMXf" role="3cqZAp">
+                                      <node concept="1rXfSq" id="6GJZxHzwMXg" role="3clFbG">
+                                        <ref role="37wK5l" node="6GJZxHzvCoM" resolve="disposeTmpModel" />
+                                        <node concept="37vLTw" id="6GJZxHzwMXh" role="37wK5m">
+                                          <ref role="3cqZAo" node="6GJZxHzvkmM" resolve="actualTmpMdl" />
+                                        </node>
+                                        <node concept="37vLTw" id="6GJZxHz$RHd" role="37wK5m">
+                                          <ref role="3cqZAo" node="3zBhpJM5Jws" resolve="repo" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3uibUv" id="778KdJ_sv3s" role="1tU5fm">
+                            <ref role="3uigEE" to="p37l:778KdJ_suR6" resolve="StructDifferenceDialog" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="2u2KgtdliiO" role="3cqZAp">
+                        <node concept="2OqwBi" id="2u2KgtdliHp" role="3clFbG">
+                          <node concept="37vLTw" id="2u2KgtdliiM" role="2Oq$k0">
+                            <ref role="3cqZAo" node="778KdJ_sv3j" resolve="dialog" />
+                          </node>
+                          <node concept="liA8E" id="2u2Kgtdljsf" role="2OqNvi">
+                            <ref role="37wK5l" to="jkm4:~DialogWrapper.setOKActionEnabled(boolean)" resolve="setOKActionEnabled" />
+                            <node concept="3clFbT" id="2u2KgtdljSH" role="37wK5m">
+                              <property role="3clFbU" value="true" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="1wRTq$I_2bW" role="3cqZAp">
+                        <node concept="2OqwBi" id="1wRTq$I_2iP" role="3clFbG">
+                          <node concept="37vLTw" id="1wRTq$I_2bU" role="2Oq$k0">
+                            <ref role="3cqZAo" node="778KdJ_sv3j" resolve="dialog" />
+                          </node>
+                          <node concept="liA8E" id="1wRTq$I_2xv" role="2OqNvi">
+                            <ref role="37wK5l" to="jkm4:~DialogWrapper.setModal(boolean)" resolve="setModal" />
+                            <node concept="3clFbT" id="1wRTq$I_2Dy" role="37wK5m">
+                              <property role="3clFbU" value="false" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="778KdJ_sv4A" role="3cqZAp">
+                        <node concept="2OqwBi" id="778KdJ_sv4B" role="3clFbG">
+                          <node concept="37vLTw" id="778KdJ_sv4C" role="2Oq$k0">
+                            <ref role="3cqZAo" node="778KdJ_sv3j" resolve="dialog" />
+                          </node>
+                          <node concept="liA8E" id="778KdJ_sv4D" role="2OqNvi">
+                            <ref role="37wK5l" to="jkm4:~DialogWrapper.show()" resolve="show" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Wc70l" id="6Od11GYe2HI" role="3clFbw">
+            <node concept="2OqwBi" id="6Od11GYe2HJ" role="3uHU7w">
+              <node concept="37vLTw" id="6Od11GYe2HK" role="2Oq$k0">
+                <ref role="3cqZAo" node="3zBhpJM4Bmt" resolve="actual" />
+              </node>
+              <node concept="3x8VRR" id="6Od11GYe2HL" role="2OqNvi" />
+            </node>
+            <node concept="1Wc70l" id="6Od11GYe2HM" role="3uHU7B">
+              <node concept="2OqwBi" id="6Od11GYe2HN" role="3uHU7B">
+                <node concept="37vLTw" id="6Od11GYe2HO" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6Od11GY9ip0" resolve="input" />
+                </node>
+                <node concept="2qgKlT" id="6Od11GYe2HP" role="2OqNvi">
+                  <ref role="37wK5l" to="qjvf:6Od11GY7tN$" resolve="isDiffEnabled" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6Od11GYe2HQ" role="3uHU7w">
+                <node concept="37vLTw" id="6Od11GYe2HR" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3zBhpJM4Bmr" resolve="expected" />
+                </node>
+                <node concept="3x8VRR" id="6Od11GYe2HS" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2RIzFJ7PFsN" role="jymVt" />
+    <node concept="2YIFZL" id="5oR1gCFG4ZA" role="jymVt">
+      <property role="TrG5h" value="cloneNode" />
+      <node concept="3clFbS" id="5oR1gCFG4ZD" role="3clF47">
+        <node concept="3clFbJ" id="5oR1gCFG8Jb" role="3cqZAp">
+          <node concept="2OqwBi" id="5oR1gCFG9so" role="3clFbw">
+            <node concept="2OqwBi" id="5oR1gCFG8UK" role="2Oq$k0">
+              <node concept="37vLTw" id="5oR1gCFG8KM" role="2Oq$k0">
+                <ref role="3cqZAo" node="5oR1gCFG55c" resolve="expected" />
+              </node>
+              <node concept="3CFZ6_" id="5oR1gCFG97j" role="2OqNvi">
+                <node concept="3CFYIy" id="5oR1gCFG9bZ" role="3CFYIz">
+                  <ref role="3CFYIx" to="tp5g:hBxLA2s" resolve="TestNodeAnnotation" />
+                </node>
+              </node>
+            </node>
+            <node concept="3x8VRR" id="5oR1gCFG9Ry" role="2OqNvi" />
+          </node>
+          <node concept="3clFbS" id="5oR1gCFG8Jd" role="3clFbx">
+            <node concept="3cpWs8" id="5oR1gCFGbJe" role="3cqZAp">
+              <node concept="3cpWsn" id="5oR1gCFGbJf" role="3cpWs9">
+                <property role="TrG5h" value="copy" />
+                <node concept="3Tqbb2" id="5oR1gCFGaZN" role="1tU5fm" />
+                <node concept="2OqwBi" id="5oR1gCFGbJg" role="33vP2m">
+                  <node concept="37vLTw" id="5oR1gCFGbJh" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5oR1gCFG55c" resolve="expected" />
+                  </node>
+                  <node concept="1$rogu" id="5oR1gCFGbJi" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="6GJZxHzkxsG" role="3cqZAp">
+              <node concept="1PaTwC" id="6GJZxHzkxsH" role="1aUNEU">
+                <node concept="3oM_SD" id="6GJZxHzkxt4" role="1PaTwD">
+                  <property role="3oM_SC" value="remove" />
+                </node>
+                <node concept="3oM_SD" id="6GJZxHzky2q" role="1PaTwD">
+                  <property role="3oM_SC" value="test" />
+                </node>
+                <node concept="3oM_SD" id="6GJZxHzky2P" role="1PaTwD">
+                  <property role="3oM_SC" value="label" />
+                </node>
+                <node concept="3oM_SD" id="6GJZxHzky2T" role="1PaTwD">
+                  <property role="3oM_SC" value="from" />
+                </node>
+                <node concept="3oM_SD" id="6GJZxHzky2Y" role="1PaTwD">
+                  <property role="3oM_SC" value="diff" />
+                </node>
+                <node concept="3oM_SD" id="6GJZxHzky34" role="1PaTwD">
+                  <property role="3oM_SC" value="view" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="6GJZxHzkwgO" role="3cqZAp">
+              <node concept="2OqwBi" id="5oR1gCFP77I" role="3clFbG">
+                <node concept="2OqwBi" id="5oR1gCFGjeg" role="2Oq$k0">
+                  <node concept="37vLTw" id="5oR1gCFGjeh" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5oR1gCFGbJf" resolve="copy" />
+                  </node>
+                  <node concept="3CFZ6_" id="5oR1gCFGjei" role="2OqNvi">
+                    <node concept="3CFYIy" id="5oR1gCFGjej" role="3CFYIz">
+                      <ref role="3CFYIx" to="tp5g:hBxLA2s" resolve="TestNodeAnnotation" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3YRAZt" id="5oR1gCFP7UF" role="2OqNvi" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="5oR1gCFG9Y2" role="3cqZAp">
+              <node concept="1rXfSq" id="5oR1gCFG9Y1" role="3clFbG">
+                <ref role="37wK5l" node="5oR1gCFG6qZ" resolve="addToTempModel" />
+                <node concept="37vLTw" id="5oR1gCFGbJj" role="37wK5m">
+                  <ref role="3cqZAo" node="5oR1gCFGbJf" resolve="copy" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="5oR1gCFGd8w" role="3cqZAp">
+              <node concept="37vLTw" id="5oR1gCFGdh0" role="3cqZAk">
+                <ref role="3cqZAo" node="5oR1gCFGbJf" resolve="copy" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="5oR1gCFGdVs" role="3cqZAp">
+          <node concept="10Nm6u" id="6GJZxHzjDTK" role="3cqZAk" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="5oR1gCFG4Ul" role="1B3o_S" />
+      <node concept="37vLTG" id="5oR1gCFG55c" role="3clF46">
+        <property role="TrG5h" value="expected" />
+        <node concept="3Tqbb2" id="5oR1gCFG55b" role="1tU5fm" />
+      </node>
+      <node concept="P$JXv" id="5oR1gCFGaNf" role="lGtFl">
+        <node concept="TZ5HA" id="5oR1gCFGaNg" role="TZ5H$">
+          <node concept="1dT_AC" id="5oR1gCFGaNh" role="1dT_Ay">
+            <property role="1dT_AB" value="Any testlabel will be detached" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="5oR1gCFGaNi" role="3nqlJM">
+          <property role="TUZQ4" value="node in assert" />
+          <node concept="zr_55" id="5oR1gCFGaNk" role="zr_5Q">
+            <ref role="zr_51" node="5oR1gCFG55c" resolve="expected" />
+          </node>
+        </node>
+        <node concept="x79VA" id="5oR1gCFGaNl" role="3nqlJM">
+          <property role="x79VB" value="Clone of expected model placed in temp. model" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="5oR1gCFG54s" role="3clF45" />
+      <node concept="2AHcQZ" id="6GJZxHzjI$9" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5oR1gCFG57x" role="jymVt" />
+    <node concept="2YIFZL" id="5oR1gCFG6qZ" role="jymVt">
+      <property role="TrG5h" value="addToTempModel" />
+      <node concept="3clFbS" id="5oR1gCFG6r1" role="3clF47">
+        <node concept="3SKdUt" id="33$34j7LSVc" role="3cqZAp">
+          <node concept="1PaTwC" id="33$34j7LSVd" role="1aUNEU">
+            <node concept="3oM_SD" id="33$34j7LTR0" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="33$34j7LTR2" role="1PaTwD">
+              <property role="3oM_SC" value="memory" />
+            </node>
+            <node concept="3oM_SD" id="33$34j7LTR5" role="1PaTwD">
+              <property role="3oM_SC" value="ast" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="5oR1gCFG6r2" role="3cqZAp">
+          <node concept="3clFbS" id="5oR1gCFG6r3" role="3clFbx">
+            <node concept="3cpWs8" id="5oR1gCFG6r4" role="3cqZAp">
+              <node concept="3cpWsn" id="5oR1gCFG6r5" role="3cpWs9">
+                <property role="TrG5h" value="tmp" />
+                <node concept="H_c77" id="6GJZxHzuwJD" role="1tU5fm" />
+                <node concept="2OqwBi" id="5oR1gCFG6r7" role="33vP2m">
+                  <node concept="2YIFZM" id="5oR1gCFG6r8" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tqvn:~TemporaryModels" resolve="TemporaryModels" />
+                    <ref role="37wK5l" to="tqvn:~TemporaryModels.getInstance()" resolve="getInstance" />
+                  </node>
+                  <node concept="liA8E" id="5oR1gCFG6r9" role="2OqNvi">
+                    <ref role="37wK5l" to="tqvn:~TemporaryModels.createEditable(boolean,jetbrains.mps.smodel.tempmodel.TempModuleOptions)" resolve="createEditable" />
+                    <node concept="3clFbT" id="2u2Kgtdk$Ie" role="37wK5m">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                    <node concept="2YIFZM" id="5oR1gCFG6rb" role="37wK5m">
+                      <ref role="1Pybhc" to="tqvn:~TempModuleOptions" resolve="TempModuleOptions" />
+                      <ref role="37wK5l" to="tqvn:~TempModuleOptions.forDefaultModule()" resolve="forDefaultModule" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="6GJZxHzuyg5" role="3cqZAp">
+              <node concept="2OqwBi" id="6GJZxHzuyKr" role="3clFbG">
+                <node concept="37vLTw" id="6GJZxHzuyg3" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5oR1gCFG6r5" resolve="tmp" />
+                </node>
+                <node concept="3BYIHo" id="6GJZxHzuzmO" role="2OqNvi">
+                  <node concept="37vLTw" id="6GJZxHzu$ae" role="3BYIHq">
+                    <ref role="3cqZAo" node="5oR1gCFG6rp" resolve="node" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="6GJZxHzvehF" role="3cqZAp">
+              <node concept="37vLTw" id="6GJZxHzvehH" role="3cqZAk">
+                <ref role="3cqZAo" node="5oR1gCFG6r5" resolve="tmp" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="5oR1gCFG6rh" role="3clFbw">
+            <node concept="2OqwBi" id="5oR1gCFG6ri" role="3uHU7B">
+              <node concept="2JrnkZ" id="5oR1gCFG6rj" role="2Oq$k0">
+                <node concept="37vLTw" id="5oR1gCFG6rk" role="2JrQYb">
+                  <ref role="3cqZAo" node="5oR1gCFG6rp" resolve="node" />
+                </node>
+              </node>
+              <node concept="liA8E" id="5oR1gCFG6rl" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+              </node>
+            </node>
+            <node concept="10Nm6u" id="5oR1gCFG6rm" role="3uHU7w" />
+          </node>
+        </node>
+        <node concept="3SKdUt" id="33$34j7M9kj" role="3cqZAp">
+          <node concept="1PaTwC" id="33$34j7M9kk" role="1aUNEU">
+            <node concept="3oM_SD" id="33$34j7Magc" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="33$34j7Mage" role="1PaTwD">
+              <property role="3oM_SC" value="generator" />
+            </node>
+            <node concept="3oM_SD" id="33$34j7Magh" role="1PaTwD">
+              <property role="3oM_SC" value="output" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="33$34j7M7zc" role="3cqZAp">
+          <node concept="2ZW3vV" id="33$34j7M7zf" role="3clFbw">
+            <node concept="3uibUv" id="33$34j7M7zg" role="2ZW6by">
+              <ref role="3uigEE" to="31cb:~TransientSModule" resolve="TransientSModule" />
+            </node>
+            <node concept="2OqwBi" id="33$34j7M7zh" role="2ZW6bz">
+              <node concept="2OqwBi" id="33$34j7M7zi" role="2Oq$k0">
+                <node concept="2JrnkZ" id="33$34j7M7zj" role="2Oq$k0">
+                  <node concept="37vLTw" id="33$34j7M7zk" role="2JrQYb">
+                    <ref role="3cqZAo" node="5oR1gCFG6rp" resolve="node" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="33$34j7M7zl" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                </node>
+              </node>
+              <node concept="liA8E" id="33$34j7M7zm" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbS" id="33$34j7M7zn" role="3clFbx">
+            <node concept="3cpWs8" id="33$34j7M7zo" role="3cqZAp">
+              <node concept="3cpWsn" id="33$34j7M7zp" role="3cpWs9">
+                <property role="TrG5h" value="tmp" />
+                <node concept="H_c77" id="33$34j7M7zq" role="1tU5fm" />
+                <node concept="2OqwBi" id="33$34j7M7zr" role="33vP2m">
+                  <node concept="2YIFZM" id="33$34j7M7zs" role="2Oq$k0">
+                    <ref role="37wK5l" to="tqvn:~TemporaryModels.getInstance()" resolve="getInstance" />
+                    <ref role="1Pybhc" to="tqvn:~TemporaryModels" resolve="TemporaryModels" />
+                  </node>
+                  <node concept="liA8E" id="33$34j7M7zt" role="2OqNvi">
+                    <ref role="37wK5l" to="tqvn:~TemporaryModels.createEditable(boolean,jetbrains.mps.smodel.tempmodel.TempModuleOptions)" resolve="createEditable" />
+                    <node concept="3clFbT" id="33$34j7M7zu" role="37wK5m">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                    <node concept="2YIFZM" id="33$34j7M7zv" role="37wK5m">
+                      <ref role="37wK5l" to="tqvn:~TempModuleOptions.forDefaultModule()" resolve="forDefaultModule" />
+                      <ref role="1Pybhc" to="tqvn:~TempModuleOptions" resolve="TempModuleOptions" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="33$34j7M7zw" role="3cqZAp">
+              <node concept="2OqwBi" id="33$34j7M7zx" role="3clFbG">
+                <node concept="37vLTw" id="33$34j7M7zy" role="2Oq$k0">
+                  <ref role="3cqZAo" node="33$34j7M7zp" resolve="tmp" />
+                </node>
+                <node concept="3BYIHo" id="33$34j7M7zz" role="2OqNvi">
+                  <node concept="37vLTw" id="33$34j7M7z$" role="3BYIHq">
+                    <ref role="3cqZAo" node="5oR1gCFG6rp" resolve="node" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="33$34j7M7z_" role="3cqZAp">
+              <node concept="37vLTw" id="33$34j7M7zA" role="3cqZAk">
+                <ref role="3cqZAo" node="33$34j7M7zp" resolve="tmp" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6GJZxHzvdEP" role="3cqZAp">
+          <node concept="10Nm6u" id="6GJZxHzvdEN" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="H_c77" id="6GJZxHzvb4h" role="3clF45" />
+      <node concept="37vLTG" id="5oR1gCFG6rp" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="5oR1gCFG6rq" role="1tU5fm" />
+      </node>
+      <node concept="3Tm6S6" id="5oR1gCFG6rn" role="1B3o_S" />
+      <node concept="P$JXv" id="5oR1gCFG8pk" role="lGtFl">
+        <node concept="TZ5HA" id="5oR1gCFG8pl" role="TZ5H$">
+          <node concept="1dT_AC" id="5oR1gCFG8pm" role="1dT_Ay" />
+        </node>
+        <node concept="TUZQ0" id="5oR1gCFG8pn" role="3nqlJM">
+          <property role="TUZQ4" value="nodes in assert" />
+          <node concept="zr_55" id="5oR1gCFG8pp" role="zr_5Q">
+            <ref role="zr_51" node="5oR1gCFG6rp" resolve="node" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6GJZxHzveYA" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+    </node>
+    <node concept="2YIFZL" id="6GJZxHzvCoM" role="jymVt">
+      <property role="TrG5h" value="disposeTmpModel" />
+      <node concept="3clFbS" id="6GJZxHzvCoP" role="3clF47">
+        <node concept="3clFbJ" id="6GJZxHzvDww" role="3cqZAp">
+          <node concept="1Wc70l" id="6GJZxHzvEpX" role="3clFbw">
+            <node concept="2YIFZM" id="6GJZxHzvEEs" role="3uHU7w">
+              <ref role="37wK5l" to="tqvn:~TemporaryModels.isTemporary(org.jetbrains.mps.openapi.model.SModel)" resolve="isTemporary" />
+              <ref role="1Pybhc" to="tqvn:~TemporaryModels" resolve="TemporaryModels" />
+              <node concept="37vLTw" id="6GJZxHzvEMF" role="37wK5m">
+                <ref role="3cqZAo" node="6GJZxHzvDj3" resolve="tmpModel" />
+              </node>
+            </node>
+            <node concept="3y3z36" id="6GJZxHzvE5M" role="3uHU7B">
+              <node concept="37vLTw" id="6GJZxHzvDCp" role="3uHU7B">
+                <ref role="3cqZAo" node="6GJZxHzvDj3" resolve="tmpModel" />
+              </node>
+              <node concept="10Nm6u" id="6GJZxHzvEhS" role="3uHU7w" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="6GJZxHzvDwy" role="3clFbx">
+            <node concept="3clFbF" id="6GJZxHz$EYG" role="3cqZAp">
+              <node concept="2OqwBi" id="6GJZxHz$Hp6" role="3clFbG">
+                <node concept="2OqwBi" id="6GJZxHz$FVE" role="2Oq$k0">
+                  <node concept="37vLTw" id="6GJZxHz$EYE" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6GJZxHz$Cgg" resolve="repo" />
+                  </node>
+                  <node concept="liA8E" id="6GJZxHz$GEZ" role="2OqNvi">
+                    <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="6GJZxHz$IzB" role="2OqNvi">
+                  <ref role="37wK5l" to="lui2:~ModelAccess.runWriteAction(java.lang.Runnable)" resolve="runWriteAction" />
+                  <node concept="1bVj0M" id="6GJZxHz$Lfo" role="37wK5m">
+                    <node concept="3clFbS" id="6GJZxHz$Lfq" role="1bW5cS">
+                      <node concept="3clFbF" id="6GJZxHzzPoB" role="3cqZAp">
+                        <node concept="2OqwBi" id="6GJZxHzzPNO" role="3clFbG">
+                          <node concept="liA8E" id="6GJZxHzzQGD" role="2OqNvi">
+                            <ref role="37wK5l" to="tqvn:~TemporaryModels.dispose(org.jetbrains.mps.openapi.model.SModel)" resolve="dispose" />
+                            <node concept="37vLTw" id="6GJZxHzzRt9" role="37wK5m">
+                              <ref role="3cqZAo" node="6GJZxHzvDj3" resolve="tmpModel" />
+                            </node>
+                          </node>
+                          <node concept="2YIFZM" id="6GJZxHzzSqS" role="2Oq$k0">
+                            <ref role="37wK5l" to="tqvn:~TemporaryModels.getInstance()" resolve="getInstance" />
+                            <ref role="1Pybhc" to="tqvn:~TemporaryModels" resolve="TemporaryModels" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6GJZxHzvBKq" role="1B3o_S" />
+      <node concept="3cqZAl" id="6GJZxHzvCkZ" role="3clF45" />
+      <node concept="37vLTG" id="6GJZxHzvDj3" role="3clF46">
+        <property role="TrG5h" value="tmpModel" />
+        <node concept="H_c77" id="6GJZxHzvDj2" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6GJZxHz$Cgg" role="3clF46">
+        <property role="TrG5h" value="repo" />
+        <node concept="3uibUv" id="6GJZxHz$DbK" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="P$JXv" id="6GJZxHzwg$y" role="lGtFl">
+        <node concept="TZ5HA" id="6GJZxHzwg$z" role="TZ5H$">
+          <node concept="1dT_AC" id="6GJZxHzwg$$" role="1dT_Ay">
+            <property role="1dT_AB" value="requires read access" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="6GJZxHzwg$_" role="3nqlJM">
+          <property role="TUZQ4" value="temporal model in memory" />
+          <node concept="zr_55" id="6GJZxHzwg$B" role="zr_5Q">
+            <ref role="zr_51" node="6GJZxHzvDj3" resolve="tmpModel" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="3zBhpJM4AND" role="1B3o_S" />
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps
index fb5e028f1e..54d94b7f1c 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps
@@ -279,6 +279,10 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
+        <property id="8575328350543493365" name="message" index="huDt6" />
+        <property id="2423417345669755629" name="filter" index="1eyWvh" />
+      </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -2186,6 +2190,10 @@
                   <property role="TrG5h" value="cast1" />
                 </node>
               </node>
+              <node concept="15s5l7" id="56OidHFwtua" role="lGtFl">
+                <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;" />
+                <property role="huDt6" value="all typesystem messages" />
+              </node>
             </node>
             <node concept="3clFbF" id="18iyr$QYnUp" role="3cqZAp">
               <node concept="37vLTI" id="18iyr$QYnWC" role="3clFbG">
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps
index 148fdfea86..940391ca32 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps
@@ -5,7 +5,6 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f47b95d4-5e73-4c04-9204-18076950153b" name="com.mbeddr.mpsutil.compare" version="0" />
-    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
   </languages>
@@ -168,6 +167,10 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
+        <property id="8575328350543493365" name="message" index="huDt6" />
+        <property id="2423417345669755629" name="filter" index="1eyWvh" />
+      </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -614,6 +617,10 @@
             </node>
           </node>
           <node concept="3clFbF" id="Pu8Vy2cY9F" role="3cqZAp">
+            <node concept="15s5l7" id="56OidHFwudL" role="lGtFl">
+              <property role="1eyWvh" value="FLAVOUR_CLASS=&quot;class jetbrains.mps.project.validation.ConceptFeatureCardinalityError&quot;;FLAVOUR_MESSAGE=&quot;No reference in the obligatory role 'variableDeclaration'&quot;;FLAVOUR_NODE_FEATURE=&quot;variableDeclaration&quot;;" />
+              <property role="huDt6" value="No reference in the obligatory role 'variableDeclaration'" />
+            </node>
             <node concept="37vLTI" id="Pu8Vy2cYdI" role="3clFbG">
               <node concept="37vLTw" id="Pu8Vy2cYdY" role="37vLTx">
                 <node concept="3xLA65" id="Pu8Vy2e38c" role="lGtFl">
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd
index 4ec9fd68d7..679e72973c 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd
@@ -14,13 +14,12 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)</dependency>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6bbe9909-811d-4431-b023-f60f7e6d7891(test.com.mbeddr.mpsutil.compare.testlang)</dependency>
   </dependencies>
   <languageVersions>
+    <language slang="l:e0989c7a-8149-4be7-97b6-0b78561af099:com.mbeddr.demo.comparator.diff" version="0" />
     <language slang="l:f47b95d4-5e73-4c04-9204-18076950153b:com.mbeddr.mpsutil.compare" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />