From 63edc8e6b6e203f258cd33dc423bba848cb1f02a Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 12 Mar 2015 15:27:47 +0100
Subject: [PATCH] Fixing processing of constraint parameters: an unbound
 logical variable produces a local variable, some refactoring

---
 .../mps/lang/typesystem2/runtime/rule.mps     | 180 ++++---
 .../mps/lang/typesystem2/runtime/template.mps | 508 +++++++-----------
 .../models/jetbrains/mps/logic/builtin.mps    | 233 +++++++-
 .../mps/logic/builtin/unification.mps         |  42 ++
 .../mps/typechecking/handler/producer.mps     | 122 ++++-
 5 files changed, 691 insertions(+), 394 deletions(-)

diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
index d79c7042..bfb36e7e 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
@@ -2338,35 +2338,59 @@
               <node concept="3clFbS" id="aFQeb4jrB5" role="2LFqv$">
                 <node concept="3clFbJ" id="aFQeb4js0N" role="3cqZAp">
                   <node concept="3clFbS" id="aFQeb4js0O" role="3clFbx">
-                    <node concept="3clFbF" id="aFQeb4jDnV" role="3cqZAp">
-                      <node concept="2OqwBi" id="aFQeb4jDtC" role="3clFbG">
-                        <node concept="37vLTw" id="aFQeb4jDnU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="aFQeb4jt5t" resolve="headVars" />
-                        </node>
-                        <node concept="liA8E" id="aFQeb4jDIi" role="2OqNvi">
-                          <ref role="37wK5l" to="k7g3:~Set.add(java.lang.Object):boolean" resolve="add" />
-                          <node concept="2OqwBi" id="aFQeb4jEzf" role="37wK5m">
-                            <node concept="1eOMI4" id="aFQeb4jDLU" role="2Oq$k0">
-                              <node concept="10QFUN" id="aFQeb4jDLR" role="1eOMHV">
-                                <node concept="3uibUv" id="677NV56kfxl" role="10QFUM">
-                                  <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="ITreeLogical" />
+                    <node concept="3clFbJ" id="6YyAPwCXr0I" role="3cqZAp">
+                      <node concept="3clFbS" id="6YyAPwCXr0K" role="3clFbx">
+                        <node concept="3clFbF" id="aFQeb4jDnV" role="3cqZAp">
+                          <node concept="2OqwBi" id="aFQeb4jDtC" role="3clFbG">
+                            <node concept="37vLTw" id="aFQeb4jDnU" role="2Oq$k0">
+                              <ref role="3cqZAo" node="aFQeb4jt5t" resolve="headVars" />
+                            </node>
+                            <node concept="liA8E" id="aFQeb4jDIi" role="2OqNvi">
+                              <ref role="37wK5l" to="k7g3:~Set.add(java.lang.Object):boolean" resolve="add" />
+                              <node concept="2OqwBi" id="aFQeb4jEzf" role="37wK5m">
+                                <node concept="1eOMI4" id="aFQeb4jDLU" role="2Oq$k0">
+                                  <node concept="10QFUN" id="aFQeb4jDLR" role="1eOMHV">
+                                    <node concept="3uibUv" id="6YyAPwCXrfB" role="10QFUM">
+                                      <ref role="3uigEE" to="yg8f:1mP5b6jQP$C" resolve="ILogical" />
+                                      <node concept="3qTvmN" id="6YyAPwCXrkL" role="11_B2D" />
+                                    </node>
+                                    <node concept="37vLTw" id="aFQeb4jE1Z" role="10QFUP">
+                                      <ref role="3cqZAo" node="aFQeb4jrB8" resolve="arg" />
+                                    </node>
+                                  </node>
                                 </node>
-                                <node concept="37vLTw" id="aFQeb4jE1Z" role="10QFUP">
-                                  <ref role="3cqZAo" node="aFQeb4jrB8" resolve="arg" />
+                                <node concept="liA8E" id="aFQeb4jEFS" role="2OqNvi">
+                                  <ref role="37wK5l" to="yg8f:677NV56hh2k" resolve="name" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="aFQeb4jEFS" role="2OqNvi">
-                              <ref role="37wK5l" to="yg8f:677NV56hh2k" resolve="name" />
-                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3fqX7Q" id="6YyAPwCXra7" role="3clFbw">
+                        <node concept="2OqwBi" id="6YyAPwCXra9" role="3fr31v">
+                          <node concept="1eOMI4" id="6YyAPwCXraa" role="2Oq$k0">
+                            <node concept="10QFUN" id="6YyAPwCXrab" role="1eOMHV">
+                              <node concept="3uibUv" id="6YyAPwCXrac" role="10QFUM">
+                                <ref role="3uigEE" to="yg8f:1mP5b6jQP$C" resolve="ILogical" />
+                                <node concept="3qTvmN" id="6YyAPwCXrnf" role="11_B2D" />
+                              </node>
+                              <node concept="37vLTw" id="6YyAPwCXrad" role="10QFUP">
+                                <ref role="3cqZAo" node="aFQeb4jrB8" resolve="arg" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="6YyAPwCXrae" role="2OqNvi">
+                            <ref role="37wK5l" to="yg8f:1mP5b6jQPKP" resolve="isBound" />
                           </node>
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbH" id="6YyAPwCXrqL" role="3cqZAp" />
                   </node>
                   <node concept="2ZW3vV" id="aFQeb4js39" role="3clFbw">
-                    <node concept="3uibUv" id="677NV56kfvO" role="2ZW6by">
-                      <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="ITreeLogical" />
+                    <node concept="3uibUv" id="6YyAPwCXmJh" role="2ZW6by">
+                      <ref role="3uigEE" to="yg8f:1mP5b6jQP$C" resolve="ILogical" />
                     </node>
                     <node concept="37vLTw" id="aFQeb4js1Q" role="2ZW6bz">
                       <ref role="3cqZAo" node="aFQeb4jrB8" resolve="arg" />
@@ -2409,39 +2433,63 @@
           <node concept="3clFbS" id="aFQeb4jqI8" role="2LFqv$">
             <node concept="1DcWWT" id="aFQeb4jF96" role="3cqZAp">
               <node concept="3clFbS" id="aFQeb4jF97" role="2LFqv$">
-                <node concept="3clFbJ" id="aFQeb4jF98" role="3cqZAp">
-                  <node concept="3clFbS" id="aFQeb4jF99" role="3clFbx">
-                    <node concept="3clFbF" id="aFQeb4jF9a" role="3cqZAp">
-                      <node concept="2OqwBi" id="aFQeb4jF9b" role="3clFbG">
-                        <node concept="37vLTw" id="aFQeb4jF9c" role="2Oq$k0">
-                          <ref role="3cqZAo" node="aFQeb4jt5t" resolve="headVars" />
-                        </node>
-                        <node concept="liA8E" id="aFQeb4jF9d" role="2OqNvi">
-                          <ref role="37wK5l" to="k7g3:~Set.add(java.lang.Object):boolean" resolve="add" />
-                          <node concept="2OqwBi" id="aFQeb4jF9e" role="37wK5m">
-                            <node concept="1eOMI4" id="aFQeb4jF9f" role="2Oq$k0">
-                              <node concept="10QFUN" id="aFQeb4jF9g" role="1eOMHV">
-                                <node concept="3uibUv" id="677NV56kfGL" role="10QFUM">
-                                  <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="ITreeLogical" />
+                <node concept="3clFbJ" id="6YyAPwCXte0" role="3cqZAp">
+                  <node concept="3clFbS" id="6YyAPwCXte1" role="3clFbx">
+                    <node concept="3clFbJ" id="6YyAPwCXte2" role="3cqZAp">
+                      <node concept="3clFbS" id="6YyAPwCXte3" role="3clFbx">
+                        <node concept="3clFbF" id="6YyAPwCXte4" role="3cqZAp">
+                          <node concept="2OqwBi" id="6YyAPwCXte5" role="3clFbG">
+                            <node concept="37vLTw" id="6YyAPwCXte6" role="2Oq$k0">
+                              <ref role="3cqZAo" node="aFQeb4jt5t" resolve="headVars" />
+                            </node>
+                            <node concept="liA8E" id="6YyAPwCXte7" role="2OqNvi">
+                              <ref role="37wK5l" to="k7g3:~Set.add(java.lang.Object):boolean" resolve="add" />
+                              <node concept="2OqwBi" id="6YyAPwCXte8" role="37wK5m">
+                                <node concept="1eOMI4" id="6YyAPwCXte9" role="2Oq$k0">
+                                  <node concept="10QFUN" id="6YyAPwCXtea" role="1eOMHV">
+                                    <node concept="3uibUv" id="6YyAPwCXteb" role="10QFUM">
+                                      <ref role="3uigEE" to="yg8f:1mP5b6jQP$C" resolve="ILogical" />
+                                      <node concept="3qTvmN" id="6YyAPwCXtec" role="11_B2D" />
+                                    </node>
+                                    <node concept="37vLTw" id="6YyAPwCXted" role="10QFUP">
+                                      <ref role="3cqZAo" node="aFQeb4jF9n" resolve="arg" />
+                                    </node>
+                                  </node>
                                 </node>
-                                <node concept="37vLTw" id="aFQeb4jF9i" role="10QFUP">
-                                  <ref role="3cqZAo" node="aFQeb4jF9n" resolve="arg" />
+                                <node concept="liA8E" id="6YyAPwCXtee" role="2OqNvi">
+                                  <ref role="37wK5l" to="yg8f:677NV56hh2k" resolve="name" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="aFQeb4jF9j" role="2OqNvi">
-                              <ref role="37wK5l" to="yg8f:677NV56hh2k" resolve="name" />
-                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3fqX7Q" id="6YyAPwCXtef" role="3clFbw">
+                        <node concept="2OqwBi" id="6YyAPwCXteg" role="3fr31v">
+                          <node concept="1eOMI4" id="6YyAPwCXteh" role="2Oq$k0">
+                            <node concept="10QFUN" id="6YyAPwCXtei" role="1eOMHV">
+                              <node concept="3uibUv" id="6YyAPwCXtej" role="10QFUM">
+                                <ref role="3uigEE" to="yg8f:1mP5b6jQP$C" resolve="ILogical" />
+                                <node concept="3qTvmN" id="6YyAPwCXtek" role="11_B2D" />
+                              </node>
+                              <node concept="37vLTw" id="6YyAPwCXtel" role="10QFUP">
+                                <ref role="3cqZAo" node="aFQeb4jF9n" resolve="arg" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="6YyAPwCXtem" role="2OqNvi">
+                            <ref role="37wK5l" to="yg8f:1mP5b6jQPKP" resolve="isBound" />
                           </node>
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbH" id="6YyAPwCXten" role="3cqZAp" />
                   </node>
-                  <node concept="2ZW3vV" id="aFQeb4jF9k" role="3clFbw">
-                    <node concept="3uibUv" id="677NV56kfFg" role="2ZW6by">
-                      <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="ITreeLogical" />
+                  <node concept="2ZW3vV" id="6YyAPwCXteo" role="3clFbw">
+                    <node concept="3uibUv" id="6YyAPwCXtep" role="2ZW6by">
+                      <ref role="3uigEE" to="yg8f:1mP5b6jQP$C" resolve="ILogical" />
                     </node>
-                    <node concept="37vLTw" id="aFQeb4jF9m" role="2ZW6bz">
+                    <node concept="37vLTw" id="6YyAPwCXteq" role="2ZW6bz">
                       <ref role="3cqZAo" node="aFQeb4jF9n" resolve="arg" />
                     </node>
                   </node>
@@ -2507,10 +2555,10 @@
           <node concept="3clFbS" id="aFQeb4jmaj" role="2LFqv$">
             <node concept="1DcWWT" id="aFQeb4jJd2" role="3cqZAp">
               <node concept="3clFbS" id="aFQeb4jJd3" role="2LFqv$">
-                <node concept="3clFbJ" id="aFQeb4jJd4" role="3cqZAp">
-                  <node concept="3clFbS" id="aFQeb4jJd5" role="3clFbx">
-                    <node concept="3clFbJ" id="aFQeb4jKjS" role="3cqZAp">
-                      <node concept="3clFbS" id="aFQeb4jKjT" role="3clFbx">
+                <node concept="3clFbJ" id="6YyAPwCXuTh" role="3cqZAp">
+                  <node concept="3clFbS" id="6YyAPwCXuTi" role="3clFbx">
+                    <node concept="3clFbJ" id="6YyAPwCXuTj" role="3cqZAp">
+                      <node concept="3clFbS" id="6YyAPwCXuTk" role="3clFbx">
                         <node concept="3clFbF" id="aFQeb4jOam" role="3cqZAp">
                           <node concept="2OqwBi" id="aFQeb4jOmU" role="3clFbG">
                             <node concept="37vLTw" id="aFQeb4jOal" role="2Oq$k0">
@@ -2537,38 +2585,32 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3fqX7Q" id="aFQeb4jKsd" role="3clFbw">
-                        <node concept="2OqwBi" id="aFQeb4jKse" role="3fr31v">
-                          <node concept="37vLTw" id="aFQeb4jKsf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="aFQeb4jt5t" resolve="headVars" />
-                          </node>
-                          <node concept="liA8E" id="aFQeb4jKsg" role="2OqNvi">
-                            <ref role="37wK5l" to="k7g3:~Set.contains(java.lang.Object):boolean" resolve="contains" />
-                            <node concept="2OqwBi" id="aFQeb4jKsh" role="37wK5m">
-                              <node concept="1eOMI4" id="aFQeb4jKsi" role="2Oq$k0">
-                                <node concept="10QFUN" id="aFQeb4jKsj" role="1eOMHV">
-                                  <node concept="3uibUv" id="677NV56kfSd" role="10QFUM">
-                                    <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="ITreeLogical" />
-                                  </node>
-                                  <node concept="37vLTw" id="aFQeb4jKsl" role="10QFUP">
-                                    <ref role="3cqZAo" node="aFQeb4jJdj" resolve="arg" />
-                                  </node>
-                                </node>
+                      <node concept="3fqX7Q" id="6YyAPwCXuTw" role="3clFbw">
+                        <node concept="2OqwBi" id="6YyAPwCXuTx" role="3fr31v">
+                          <node concept="1eOMI4" id="6YyAPwCXuTy" role="2Oq$k0">
+                            <node concept="10QFUN" id="6YyAPwCXuTz" role="1eOMHV">
+                              <node concept="3uibUv" id="6YyAPwCXuT$" role="10QFUM">
+                                <ref role="3uigEE" to="yg8f:1mP5b6jQP$C" resolve="ILogical" />
+                                <node concept="3qTvmN" id="6YyAPwCXuT_" role="11_B2D" />
                               </node>
-                              <node concept="liA8E" id="aFQeb4jKsm" role="2OqNvi">
-                                <ref role="37wK5l" to="yg8f:677NV56hh2k" resolve="name" />
+                              <node concept="37vLTw" id="6YyAPwCXuTA" role="10QFUP">
+                                <ref role="3cqZAo" node="aFQeb4jJdj" resolve="arg" />
                               </node>
                             </node>
                           </node>
+                          <node concept="liA8E" id="6YyAPwCXuTB" role="2OqNvi">
+                            <ref role="37wK5l" to="yg8f:1mP5b6jQPKP" resolve="isBound" />
+                          </node>
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbH" id="6YyAPwCXuTC" role="3cqZAp" />
                   </node>
-                  <node concept="2ZW3vV" id="aFQeb4jJdg" role="3clFbw">
-                    <node concept="3uibUv" id="677NV56kfQG" role="2ZW6by">
-                      <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="ITreeLogical" />
+                  <node concept="2ZW3vV" id="6YyAPwCXuTD" role="3clFbw">
+                    <node concept="3uibUv" id="6YyAPwCXuTE" role="2ZW6by">
+                      <ref role="3uigEE" to="yg8f:1mP5b6jQP$C" resolve="ILogical" />
                     </node>
-                    <node concept="37vLTw" id="aFQeb4jJdi" role="2ZW6bz">
+                    <node concept="37vLTw" id="6YyAPwCXuTF" role="2ZW6bz">
                       <ref role="3cqZAo" node="aFQeb4jJdj" resolve="arg" />
                     </node>
                   </node>
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps
index 27987fa5..ba9b0251 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps
@@ -16,6 +16,7 @@
     <import index="rzz2" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang.annotation(JDK/java.lang.annotation@java_stub)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.unification.tree)" />
     <import index="t3eg" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/f:java_stub#8865b7a8-5271-43d3-884c-6fd1d9cfdd34#org.jetbrains.mps.openapi.language(MPS.OpenAPI/org.jetbrains.mps.openapi.language@java_stub)" />
+    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -146,9 +147,6 @@
       </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="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" />
@@ -157,18 +155,19 @@
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
         <child id="1107880067339" name="method" index="3MN40a" />
       </concept>
+      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </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" />
+        <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" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1184950988562" name="jetbrains.mps.baseLanguage.structure.ArrayCreator" flags="nn" index="3$_iS1">
         <child id="1184951007469" name="componentType" index="3$_nBY" />
         <child id="1184952969026" name="dimensionExpression" index="3$GQph" />
@@ -186,11 +185,6 @@
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
-      <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="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="2580416627845338977" name="jetbrains.mps.baseLanguage.structure.ImplicitAnnotationInstanceValue" flags="ng" index="1SXeKx" />
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -416,398 +410,294 @@
   <node concept="312cEu" id="6ntBQ9KIZRc">
     <property role="TrG5h" value="AnchorUtil" />
     <node concept="2tJIrI" id="6ntBQ9KJ1cF" role="jymVt" />
-    <node concept="2YIFZL" id="6ntBQ9KJ1a_" role="jymVt">
-      <property role="TrG5h" value="asAnchor" />
-      <node concept="37vLTG" id="6ntBQ9KJ1aA" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="6ntBQ9KJ1gj" role="1tU5fm" />
-      </node>
-      <node concept="17QB3L" id="1lUeO1N84Pa" role="3clF45" />
-      <node concept="3Tm1VV" id="6ntBQ9KJ1aD" role="1B3o_S" />
-      <node concept="3clFbS" id="6ntBQ9KJ1aE" role="3clF47">
-        <node concept="3cpWs8" id="aFQeb4bEdq" role="3cqZAp">
-          <node concept="3cpWsn" id="aFQeb4bEdr" role="3cpWs9">
-            <property role="TrG5h" value="text" />
-            <node concept="17QB3L" id="aFQeb4bEdm" role="1tU5fm" />
-            <node concept="3K4zz7" id="aFQeb4bFMU" role="33vP2m">
-              <node concept="2OqwBi" id="aFQeb4bG08" role="3K4E3e">
-                <node concept="1PxgMI" id="aFQeb4bFTX" role="2Oq$k0">
-                  <ref role="1PxNhF" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                  <node concept="37vLTw" id="aFQeb4bFQd" role="1PxMeX">
-                    <ref role="3cqZAo" node="6ntBQ9KJ1aA" resolve="node" />
-                  </node>
-                </node>
-                <node concept="3TrcHB" id="aFQeb4bGcA" role="2OqNvi">
-                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="aFQeb4c16d" role="3K4GZi">
-                <node concept="2YIFZM" id="aFQeb4bGkf" role="2Oq$k0">
-                  <ref role="37wK5l" to="e2lb:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                  <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
-                  <node concept="37vLTw" id="aFQeb4bGy6" role="37wK5m">
-                    <ref role="3cqZAo" node="6ntBQ9KJ1aA" resolve="node" />
-                  </node>
-                </node>
-                <node concept="EvHYZ" id="aFQeb4c2jj" role="2OqNvi" />
-              </node>
-              <node concept="2OqwBi" id="aFQeb4bFkT" role="3K4Cdx">
-                <node concept="37vLTw" id="aFQeb4bFjv" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6ntBQ9KJ1aA" resolve="node" />
-                </node>
-                <node concept="1mIQ4w" id="aFQeb4bFt1" role="2OqNvi">
-                  <node concept="chp4Y" id="aFQeb4bF$a" role="cj9EA">
-                    <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="aFQeb4bESo" role="3cqZAp" />
-        <node concept="3clFbF" id="6ntBQ9KJc$L" role="3cqZAp">
-          <node concept="3K4zz7" id="6ntBQ9KJcFm" role="3clFbG">
-            <node concept="10Nm6u" id="aFQeb4bZh3" role="3K4GZi" />
-            <node concept="3y3z36" id="6ntBQ9KJcAU" role="3K4Cdx">
-              <node concept="10Nm6u" id="6ntBQ9KJcDR" role="3uHU7w" />
-              <node concept="37vLTw" id="6ntBQ9KJc$J" role="3uHU7B">
-                <ref role="3cqZAo" node="6ntBQ9KJ1aA" resolve="node" />
-              </node>
-            </node>
-            <node concept="1eOMI4" id="7gr_romel1E" role="3K4E3e">
-              <node concept="3cpWs3" id="7gr_romel1F" role="1eOMHV">
-                <node concept="Xl_RD" id="7gr_romel1G" role="3uHU7w">
-                  <property role="Xl_RC" value=")" />
-                </node>
-                <node concept="3cpWs3" id="7gr_romel1H" role="3uHU7B">
-                  <node concept="37vLTw" id="7gr_romel1I" role="3uHU7w">
-                    <ref role="3cqZAo" node="aFQeb4bEdr" resolve="text" />
-                  </node>
-                  <node concept="3cpWs3" id="7gr_romel1J" role="3uHU7B">
-                    <node concept="3cpWs3" id="7gr_romeBFM" role="3uHU7B">
-                      <node concept="3cpWs3" id="7gr_romeDFJ" role="3uHU7B">
-                        <node concept="Xl_RD" id="7gr_romeDMi" role="3uHU7w">
-                          <property role="Xl_RC" value="#" />
-                        </node>
-                        <node concept="2OqwBi" id="7gr_romeD7H" role="3uHU7B">
-                          <node concept="2OqwBi" id="7gr_romeCH6" role="2Oq$k0">
-                            <node concept="2JrnkZ" id="7gr_romeCyi" role="2Oq$k0">
-                              <node concept="37vLTw" id="7gr_romeBMe" role="2JrQYb">
-                                <ref role="3cqZAo" node="6ntBQ9KJ1aA" resolve="node" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="7gr_romeD2u" role="2OqNvi">
-                              <ref role="37wK5l" to="ec5l:~SNode.getConcept():org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="7gr_romeDmH" role="2OqNvi">
-                            <ref role="37wK5l" to="t3eg:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2YIFZM" id="7gr_romel1K" role="3uHU7w">
-                        <ref role="37wK5l" to="e2lb:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                        <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
-                        <node concept="2OqwBi" id="7gr_romel1L" role="37wK5m">
-                          <node concept="2JrnkZ" id="7gr_romel1M" role="2Oq$k0">
-                            <node concept="37vLTw" id="7gr_romel1N" role="2JrQYb">
-                              <ref role="3cqZAo" node="6ntBQ9KJ1aA" resolve="node" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="7gr_romel1O" role="2OqNvi">
-                            <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Xl_RD" id="7gr_romel1P" role="3uHU7w">
-                      <property role="Xl_RC" value="(" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1lUeO1NbZ__" role="jymVt" />
     <node concept="2YIFZL" id="1lUeO1NbZUR" role="jymVt">
       <property role="TrG5h" value="anchorTree" />
       <node concept="37vLTG" id="1lUeO1Nc1F3" role="3clF46">
         <property role="TrG5h" value="node" />
         <node concept="3Tqbb2" id="1lUeO1Nc1HN" role="1tU5fm" />
       </node>
-      <node concept="3uibUv" id="1lUeO1Nc033" role="3clF45">
+      <node concept="3uibUv" id="2ev$9JFmkVr" role="3clF45">
         <ref role="3uigEE" to="ie8e:2xQ7eRABXh4" resolve="Tree" />
       </node>
       <node concept="3Tm1VV" id="1lUeO1NbZUU" role="1B3o_S" />
       <node concept="3clFbS" id="1lUeO1NbZUV" role="3clF47">
-        <node concept="3clFbJ" id="1lUeO1NeAy$" role="3cqZAp">
-          <node concept="3clFbS" id="1lUeO1NeAyA" role="3clFbx">
-            <node concept="3cpWs6" id="1lUeO1NeFFN" role="3cqZAp">
-              <node concept="2YIFZM" id="1lUeO1NeGyi" role="3cqZAk">
-                <ref role="37wK5l" to="ie8e:5JQSuNsxMa3" resolve="tree" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                <node concept="2YIFZM" id="1lUeO1NeGyj" role="37wK5m">
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
-                  <node concept="Xl_RD" id="1lUeO1NeGyk" role="37wK5m">
-                    <property role="Xl_RC" value="node" />
-                  </node>
-                  <node concept="2YIFZM" id="1lUeO1NeGyl" role="37wK5m">
-                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                    <node concept="Xl_RD" id="1lUeO1NeGym" role="37wK5m">
-                      <property role="Xl_RC" value="node" />
-                    </node>
-                    <node concept="Xl_RD" id="1lUeO1NePTh" role="37wK5m">
-                      <property role="Xl_RC" value="null" />
-                    </node>
-                  </node>
-                </node>
+        <node concept="3clFbF" id="2ev$9JF_T40" role="3cqZAp">
+          <node concept="2YIFZM" id="2ev$9JF_T4G" role="3clFbG">
+            <ref role="37wK5l" to="ie8e:5JQSuNsxMzt" resolve="create" />
+            <ref role="1Pybhc" to="ie8e:2xQ7eRABXh4" resolve="Tree" />
+            <node concept="2YIFZM" id="2ev$9JF_T5g" role="37wK5m">
+              <ref role="1Pybhc" node="6ntBQ9KIZRc" resolve="AnchorUtil" />
+              <ref role="37wK5l" node="6YyAPwCTFuv" resolve="anchor" />
+              <node concept="37vLTw" id="2ev$9JF_T5h" role="37wK5m">
+                <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
               </node>
             </node>
           </node>
-          <node concept="3clFbC" id="1lUeO1NeCsx" role="3clFbw">
-            <node concept="10Nm6u" id="1lUeO1NeDdw" role="3uHU7w" />
-            <node concept="37vLTw" id="1lUeO1NeBmQ" role="3uHU7B">
-              <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
-            </node>
-          </node>
         </node>
-        <node concept="3clFbH" id="1lUeO1NeERv" role="3cqZAp" />
-        <node concept="3cpWs8" id="1lUeO1NexFO" role="3cqZAp">
-          <node concept="3cpWsn" id="1lUeO1NexFP" role="3cpWs9">
-            <property role="TrG5h" value="cpt" />
-            <node concept="17QB3L" id="1lUeO1NezAK" role="1tU5fm" />
-            <node concept="2OqwBi" id="1lUeO1NexFQ" role="33vP2m">
-              <node concept="2OqwBi" id="1lUeO1NexFR" role="2Oq$k0">
-                <node concept="2JrnkZ" id="1lUeO1NexFS" role="2Oq$k0">
-                  <node concept="37vLTw" id="1lUeO1NexFT" role="2JrQYb">
-                    <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6YyAPwCTH5$" role="jymVt" />
+    <node concept="2YIFZL" id="6YyAPwCTFuv" role="jymVt">
+      <property role="TrG5h" value="anchor" />
+      <node concept="3Tm6S6" id="6YyAPwCTFuw" role="1B3o_S" />
+      <node concept="3uibUv" id="2ev$9JF_T7C" role="3clF45">
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="ITreePart" />
+        <node concept="3qTvmN" id="2ev$9JF_Uo1" role="11_B2D" />
+      </node>
+      <node concept="37vLTG" id="6YyAPwCTFuj" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="6YyAPwCTFuk" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="6YyAPwCTFsH" role="3clF47">
+        <node concept="3clFbJ" id="6YyAPwCTFsI" role="3cqZAp">
+          <node concept="3clFbS" id="6YyAPwCTFsJ" role="3clFbx">
+            <node concept="3cpWs6" id="6YyAPwCVMeb" role="3cqZAp">
+              <node concept="2YIFZM" id="6YyAPwCVNEK" role="3cqZAk">
+                <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                <node concept="Xl_RD" id="6YyAPwCVNEL" role="37wK5m">
+                  <property role="Xl_RC" value="node" />
+                </node>
+                <node concept="2YIFZM" id="6YyAPwCVNEM" role="37wK5m">
+                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <node concept="Xl_RD" id="6YyAPwCVNEN" role="37wK5m">
+                    <property role="Xl_RC" value="node" />
+                  </node>
+                  <node concept="Xl_RD" id="6YyAPwCVNEO" role="37wK5m">
+                    <property role="Xl_RC" value="null" />
                   </node>
                 </node>
-                <node concept="liA8E" id="1lUeO1NexFU" role="2OqNvi">
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="6YyAPwCTFsR" role="3clFbw">
+            <node concept="10Nm6u" id="6YyAPwCTFsS" role="3uHU7w" />
+            <node concept="37vLTw" id="6YyAPwCTFuo" role="3uHU7B">
+              <ref role="3cqZAo" node="6YyAPwCTFuj" resolve="node" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6YyAPwCTFsU" role="3cqZAp" />
+        <node concept="3cpWs8" id="6YyAPwCTFsV" role="3cqZAp">
+          <node concept="3cpWsn" id="6YyAPwCTFsW" role="3cpWs9">
+            <property role="TrG5h" value="cpt" />
+            <node concept="17QB3L" id="6YyAPwCTFsX" role="1tU5fm" />
+            <node concept="2OqwBi" id="6YyAPwCTFsY" role="33vP2m">
+              <node concept="2OqwBi" id="6YyAPwCTFsZ" role="2Oq$k0">
+                <node concept="2JrnkZ" id="6YyAPwCTFt0" role="2Oq$k0">
+                  <node concept="37vLTw" id="6YyAPwCTFuq" role="2JrQYb">
+                    <ref role="3cqZAo" node="6YyAPwCTFuj" resolve="node" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="6YyAPwCTFt2" role="2OqNvi">
                   <ref role="37wK5l" to="ec5l:~SNode.getConcept():org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
                 </node>
               </node>
-              <node concept="liA8E" id="1lUeO1NexFV" role="2OqNvi">
+              <node concept="liA8E" id="6YyAPwCTFt3" role="2OqNvi">
                 <ref role="37wK5l" to="t3eg:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="1lUeO1NeywL" role="3cqZAp">
-          <node concept="3cpWsn" id="1lUeO1NeywM" role="3cpWs9">
+        <node concept="3cpWs8" id="6YyAPwCTFt4" role="3cqZAp">
+          <node concept="3cpWsn" id="6YyAPwCTFt5" role="3cpWs9">
             <property role="TrG5h" value="id" />
-            <node concept="17QB3L" id="1lUeO1NezPL" role="1tU5fm" />
-            <node concept="2YIFZM" id="1lUeO1NeywN" role="33vP2m">
+            <node concept="17QB3L" id="6YyAPwCTFt6" role="1tU5fm" />
+            <node concept="2YIFZM" id="6YyAPwCTFt7" role="33vP2m">
               <ref role="37wK5l" to="e2lb:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
               <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
-              <node concept="2OqwBi" id="1lUeO1NeywO" role="37wK5m">
-                <node concept="2JrnkZ" id="1lUeO1NeywP" role="2Oq$k0">
-                  <node concept="37vLTw" id="1lUeO1NeywQ" role="2JrQYb">
-                    <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+              <node concept="2OqwBi" id="6YyAPwCTFt8" role="37wK5m">
+                <node concept="2JrnkZ" id="6YyAPwCTFt9" role="2Oq$k0">
+                  <node concept="37vLTw" id="6YyAPwCTFup" role="2JrQYb">
+                    <ref role="3cqZAo" node="6YyAPwCTFuj" resolve="node" />
                   </node>
                 </node>
-                <node concept="liA8E" id="1lUeO1NeywR" role="2OqNvi">
+                <node concept="liA8E" id="6YyAPwCTFtb" role="2OqNvi">
                   <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1lUeO1Ngnn1" role="3cqZAp" />
-        <node concept="3clFbJ" id="1lUeO1NgoLN" role="3cqZAp">
-          <node concept="3clFbS" id="1lUeO1NgoLP" role="3clFbx">
-            <node concept="3cpWs8" id="1lUeO1NewCH" role="3cqZAp">
-              <node concept="3cpWsn" id="1lUeO1NewCI" role="3cpWs9">
+        <node concept="3clFbH" id="6YyAPwCTFtc" role="3cqZAp" />
+        <node concept="3clFbJ" id="6YyAPwCTFtd" role="3cqZAp">
+          <node concept="3clFbS" id="6YyAPwCTFte" role="3clFbx">
+            <node concept="3cpWs8" id="6YyAPwCTFtf" role="3cqZAp">
+              <node concept="3cpWsn" id="6YyAPwCTFtg" role="3cpWs9">
                 <property role="TrG5h" value="name" />
-                <node concept="17QB3L" id="1lUeO1NewCJ" role="1tU5fm" />
-                <node concept="2OqwBi" id="1lUeO1NewCL" role="33vP2m">
-                  <node concept="1PxgMI" id="1lUeO1NewCM" role="2Oq$k0">
+                <node concept="17QB3L" id="6YyAPwCTFth" role="1tU5fm" />
+                <node concept="2OqwBi" id="6YyAPwCTFti" role="33vP2m">
+                  <node concept="1PxgMI" id="6YyAPwCTFtj" role="2Oq$k0">
                     <ref role="1PxNhF" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                    <node concept="37vLTw" id="1lUeO1NewCN" role="1PxMeX">
-                      <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+                    <node concept="37vLTw" id="6YyAPwCTFun" role="1PxMeX">
+                      <ref role="3cqZAo" node="6YyAPwCTFuj" resolve="node" />
                     </node>
                   </node>
-                  <node concept="3TrcHB" id="1lUeO1NewCO" role="2OqNvi">
+                  <node concept="3TrcHB" id="6YyAPwCTFtl" role="2OqNvi">
                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs6" id="1lUeO1NgAl$" role="3cqZAp">
-              <node concept="2YIFZM" id="1lUeO1NgBIZ" role="3cqZAk">
+            <node concept="3cpWs6" id="6YyAPwCVPe9" role="3cqZAp">
+              <node concept="2YIFZM" id="6YyAPwCVQ$E" role="3cqZAk">
+                <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
                 <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                <ref role="37wK5l" to="ie8e:5JQSuNsxMa3" resolve="tree" />
-                <node concept="2YIFZM" id="1lUeO1NgBJ0" role="37wK5m">
+                <node concept="Xl_RD" id="6YyAPwCVQ$F" role="37wK5m">
+                  <property role="Xl_RC" value="node" />
+                </node>
+                <node concept="2YIFZM" id="6YyAPwCVQ$G" role="37wK5m">
+                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
                   <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
-                  <node concept="Xl_RD" id="1lUeO1NgBJ1" role="37wK5m">
-                    <property role="Xl_RC" value="node" />
+                  <node concept="Xl_RD" id="6YyAPwCVQ$H" role="37wK5m">
+                    <property role="Xl_RC" value="concept" />
                   </node>
-                  <node concept="2YIFZM" id="1lUeO1NgBJ2" role="37wK5m">
-                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                    <node concept="Xl_RD" id="1lUeO1NgBJ3" role="37wK5m">
-                      <property role="Xl_RC" value="concept" />
-                    </node>
-                    <node concept="37vLTw" id="1lUeO1NgBJ4" role="37wK5m">
-                      <ref role="3cqZAo" node="1lUeO1NexFP" resolve="cpt" />
-                    </node>
+                  <node concept="37vLTw" id="6YyAPwCVQ$I" role="37wK5m">
+                    <ref role="3cqZAo" node="6YyAPwCTFsW" resolve="cpt" />
                   </node>
-                  <node concept="2YIFZM" id="1lUeO1NgBJ5" role="37wK5m">
-                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                    <node concept="Xl_RD" id="1lUeO1NgBJ6" role="37wK5m">
-                      <property role="Xl_RC" value="name" />
-                    </node>
-                    <node concept="37vLTw" id="1lUeO1NgBJ7" role="37wK5m">
-                      <ref role="3cqZAo" node="1lUeO1NewCI" resolve="name" />
-                    </node>
+                </node>
+                <node concept="2YIFZM" id="6YyAPwCVQ$J" role="37wK5m">
+                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="6YyAPwCVQ$K" role="37wK5m">
+                    <property role="Xl_RC" value="name" />
                   </node>
-                  <node concept="2YIFZM" id="1lUeO1NgBJ8" role="37wK5m">
-                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                    <node concept="Xl_RD" id="1lUeO1NgBJ9" role="37wK5m">
-                      <property role="Xl_RC" value="id" />
-                    </node>
-                    <node concept="37vLTw" id="1lUeO1NgBJa" role="37wK5m">
-                      <ref role="3cqZAo" node="1lUeO1NeywM" resolve="id" />
-                    </node>
+                  <node concept="37vLTw" id="6YyAPwCVQ$L" role="37wK5m">
+                    <ref role="3cqZAo" node="6YyAPwCTFtg" resolve="name" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="6YyAPwCVQ$M" role="37wK5m">
+                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <node concept="Xl_RD" id="6YyAPwCVQ$N" role="37wK5m">
+                    <property role="Xl_RC" value="id" />
+                  </node>
+                  <node concept="37vLTw" id="6YyAPwCVQ$O" role="37wK5m">
+                    <ref role="3cqZAo" node="6YyAPwCTFt5" resolve="id" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="1lUeO1NgqRU" role="3clFbw">
-            <node concept="37vLTw" id="1lUeO1NgqbO" role="2Oq$k0">
-              <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+          <node concept="2OqwBi" id="6YyAPwCTFtz" role="3clFbw">
+            <node concept="37vLTw" id="6YyAPwCTFum" role="2Oq$k0">
+              <ref role="3cqZAo" node="6YyAPwCTFuj" resolve="node" />
             </node>
-            <node concept="1mIQ4w" id="1lUeO1NgAdW" role="2OqNvi">
-              <node concept="chp4Y" id="1lUeO1NgAfr" role="cj9EA">
+            <node concept="1mIQ4w" id="6YyAPwCTFt_" role="2OqNvi">
+              <node concept="chp4Y" id="6YyAPwCTFtA" role="cj9EA">
                 <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1lUeO1NinP6" role="3cqZAp" />
-        <node concept="3cpWs8" id="1lUeO1Nhag3" role="3cqZAp">
-          <node concept="3cpWsn" id="1lUeO1Nhag4" role="3cpWs9">
+        <node concept="3clFbH" id="6YyAPwCTFtB" role="3cqZAp" />
+        <node concept="3cpWs8" id="6YyAPwCTFtC" role="3cqZAp">
+          <node concept="3cpWsn" id="6YyAPwCTFtD" role="3cpWs9">
             <property role="TrG5h" value="text" />
-            <node concept="17QB3L" id="1lUeO1Nhag1" role="1tU5fm" />
-            <node concept="2OqwBi" id="1lUeO1Nhag5" role="33vP2m">
-              <node concept="2YIFZM" id="1lUeO1Nhag6" role="2Oq$k0">
+            <node concept="17QB3L" id="6YyAPwCTFtE" role="1tU5fm" />
+            <node concept="2OqwBi" id="6YyAPwCTFtF" role="33vP2m">
+              <node concept="2YIFZM" id="6YyAPwCTFtG" role="2Oq$k0">
                 <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
                 <ref role="37wK5l" to="e2lb:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                <node concept="37vLTw" id="1lUeO1Nhag7" role="37wK5m">
-                  <ref role="3cqZAo" node="1lUeO1Nc1F3" resolve="node" />
+                <node concept="37vLTw" id="6YyAPwCTFul" role="37wK5m">
+                  <ref role="3cqZAo" node="6YyAPwCTFuj" resolve="node" />
                 </node>
               </node>
-              <node concept="EvHYZ" id="1lUeO1Nhag8" role="2OqNvi" />
+              <node concept="EvHYZ" id="6YyAPwCTFtI" role="2OqNvi" />
             </node>
           </node>
         </node>
-        <node concept="2ty0qM" id="1lUeO1NhMzg" role="3cqZAp">
-          <node concept="1Qi9sc" id="1lUeO1NhMzi" role="1YN4dH">
-            <node concept="1OJ37Q" id="1lUeO1NhPT9" role="1QigWp">
-              <node concept="2t4tHJ" id="1lUeO1NhPPo" role="1OLpdg" />
-              <node concept="1OJ37Q" id="1lUeO1NhQ3Z" role="1OLqdY">
-                <node concept="1Tukvm" id="1lUeO1NhPT7" role="1OLpdg">
+        <node concept="2ty0qM" id="6YyAPwCTFtJ" role="3cqZAp">
+          <node concept="1Qi9sc" id="6YyAPwCTFtK" role="1YN4dH">
+            <node concept="1OJ37Q" id="6YyAPwCTFtL" role="1QigWp">
+              <node concept="2t4tHJ" id="6YyAPwCTFtM" role="1OLpdg" />
+              <node concept="1OJ37Q" id="6YyAPwCTFtN" role="1OLqdY">
+                <node concept="1Tukvm" id="6YyAPwCTFtO" role="1OLpdg">
                   <property role="TrG5h" value="ascii" />
-                  <node concept="1OClNT" id="1lUeO1NhQ2Q" role="1TuGhC">
-                    <node concept="2e2xP4" id="1lUeO1NhPZd" role="1OLDsb">
-                      <ref role="2e2_8$" node="1lUeO1NhPT7" resolve="ascii" />
+                  <node concept="1OClNT" id="6YyAPwCTFtP" role="1TuGhC">
+                    <node concept="2e2xP4" id="6YyAPwCTFtQ" role="1OLDsb">
+                      <ref role="2e2_8$" node="6YyAPwCTFtO" resolve="ascii" />
                     </node>
                   </node>
                 </node>
-                <node concept="1OCmVF" id="1lUeO1NhQ7a" role="1OLqdY">
-                  <node concept="1T2EwR" id="1lUeO1NhQ5d" role="1OLDsb" />
+                <node concept="1OCmVF" id="6YyAPwCTFtR" role="1OLqdY">
+                  <node concept="1T2EwR" id="6YyAPwCTFtS" role="1OLDsb" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="37vLTw" id="1lUeO1NhP52" role="2ty3UH">
-            <ref role="3cqZAo" node="1lUeO1Nhag4" resolve="text" />
+          <node concept="37vLTw" id="6YyAPwCTFtT" role="2ty3UH">
+            <ref role="3cqZAo" node="6YyAPwCTFtD" resolve="text" />
           </node>
-          <node concept="3clFbS" id="1lUeO1NhMzm" role="2tyzPh">
-            <node concept="3cpWs6" id="1lUeO1NhSaB" role="3cqZAp">
-              <node concept="2YIFZM" id="1lUeO1NhSaC" role="3cqZAk">
-                <ref role="37wK5l" to="ie8e:5JQSuNsxMa3" resolve="tree" />
+          <node concept="3clFbS" id="6YyAPwCTFtU" role="2tyzPh">
+            <node concept="3cpWs6" id="6YyAPwCVS1s" role="3cqZAp">
+              <node concept="2YIFZM" id="6YyAPwCVTne" role="3cqZAk">
                 <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                <node concept="2YIFZM" id="1lUeO1NhSaD" role="37wK5m">
+                <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
+                <node concept="Xl_RD" id="6YyAPwCVTnf" role="37wK5m">
+                  <property role="Xl_RC" value="node" />
+                </node>
+                <node concept="2YIFZM" id="6YyAPwCVTng" role="37wK5m">
+                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
                   <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
-                  <node concept="Xl_RD" id="1lUeO1NhSaE" role="37wK5m">
-                    <property role="Xl_RC" value="node" />
+                  <node concept="Xl_RD" id="6YyAPwCVTnh" role="37wK5m">
+                    <property role="Xl_RC" value="concept" />
                   </node>
-                  <node concept="2YIFZM" id="1lUeO1NhSaF" role="37wK5m">
-                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                    <node concept="Xl_RD" id="1lUeO1NhSaG" role="37wK5m">
-                      <property role="Xl_RC" value="concept" />
-                    </node>
-                    <node concept="37vLTw" id="1lUeO1NhSaH" role="37wK5m">
-                      <ref role="3cqZAo" node="1lUeO1NexFP" resolve="cpt" />
-                    </node>
+                  <node concept="37vLTw" id="6YyAPwCVTni" role="37wK5m">
+                    <ref role="3cqZAo" node="6YyAPwCTFsW" resolve="cpt" />
                   </node>
-                  <node concept="2YIFZM" id="1lUeO1NhSaI" role="37wK5m">
-                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                    <node concept="Xl_RD" id="1lUeO1NhSaJ" role="37wK5m">
-                      <property role="Xl_RC" value="text" />
-                    </node>
-                    <node concept="1TxZTf" id="1lUeO1NifzY" role="37wK5m">
-                      <ref role="1Ty1U8" node="1lUeO1NhPT7" resolve="ascii" />
-                    </node>
+                </node>
+                <node concept="2YIFZM" id="6YyAPwCVTnj" role="37wK5m">
+                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="6YyAPwCVTnk" role="37wK5m">
+                    <property role="Xl_RC" value="text" />
                   </node>
-                  <node concept="2YIFZM" id="1lUeO1NhSS2" role="37wK5m">
-                    <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                    <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                    <node concept="Xl_RD" id="1lUeO1NhSS3" role="37wK5m">
-                      <property role="Xl_RC" value="id" />
-                    </node>
-                    <node concept="37vLTw" id="1lUeO1NhSS4" role="37wK5m">
-                      <ref role="3cqZAo" node="1lUeO1NeywM" resolve="id" />
-                    </node>
+                  <node concept="1TxZTf" id="6YyAPwCVTnl" role="37wK5m">
+                    <ref role="1Ty1U8" node="6YyAPwCTFtO" resolve="ascii" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="6YyAPwCVTnm" role="37wK5m">
+                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="6YyAPwCVTnn" role="37wK5m">
+                    <property role="Xl_RC" value="id" />
+                  </node>
+                  <node concept="37vLTw" id="6YyAPwCVTno" role="37wK5m">
+                    <ref role="3cqZAo" node="6YyAPwCTFt5" resolve="id" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1lUeO1NhKzJ" role="3cqZAp" />
-        <node concept="3cpWs6" id="1lUeO1Nhr2c" role="3cqZAp">
-          <node concept="2YIFZM" id="1lUeO1Nc2xK" role="3cqZAk">
-            <ref role="37wK5l" to="ie8e:5JQSuNsxMa3" resolve="tree" />
+        <node concept="3clFbH" id="6YyAPwCTFu8" role="3cqZAp" />
+        <node concept="3cpWs6" id="6YyAPwCVUNT" role="3cqZAp">
+          <node concept="2YIFZM" id="6YyAPwCVWaO" role="3cqZAk">
+            <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
             <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-            <node concept="2YIFZM" id="1lUeO1Nc4Ei" role="37wK5m">
-              <ref role="37wK5l" to="ie8e:5JQSuNsxgzn" resolve="child" />
+            <node concept="Xl_RD" id="6YyAPwCVWaP" role="37wK5m">
+              <property role="Xl_RC" value="node" />
+            </node>
+            <node concept="2YIFZM" id="6YyAPwCVWaQ" role="37wK5m">
+              <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
               <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-              <node concept="Xl_RD" id="1lUeO1Nc4Qd" role="37wK5m">
-                <property role="Xl_RC" value="node" />
+              <node concept="Xl_RD" id="6YyAPwCVWaR" role="37wK5m">
+                <property role="Xl_RC" value="concept" />
               </node>
-              <node concept="2YIFZM" id="1lUeO1Nf3pS" role="37wK5m">
-                <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                <node concept="Xl_RD" id="1lUeO1Nf44O" role="37wK5m">
-                  <property role="Xl_RC" value="concept" />
-                </node>
-                <node concept="37vLTw" id="1lUeO1Nf67U" role="37wK5m">
-                  <ref role="3cqZAo" node="1lUeO1NexFP" resolve="cpt" />
-                </node>
+              <node concept="37vLTw" id="6YyAPwCVWaS" role="37wK5m">
+                <ref role="3cqZAo" node="6YyAPwCTFsW" resolve="cpt" />
               </node>
-              <node concept="2YIFZM" id="1lUeO1NeZtl" role="37wK5m">
-                <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                <node concept="Xl_RD" id="1lUeO1NeZUZ" role="37wK5m">
-                  <property role="Xl_RC" value="id" />
-                </node>
-                <node concept="37vLTw" id="1lUeO1Nf1jT" role="37wK5m">
-                  <ref role="3cqZAo" node="1lUeO1NeywM" resolve="id" />
-                </node>
+            </node>
+            <node concept="2YIFZM" id="6YyAPwCVWaT" role="37wK5m">
+              <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+              <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+              <node concept="Xl_RD" id="6YyAPwCVWaU" role="37wK5m">
+                <property role="Xl_RC" value="id" />
+              </node>
+              <node concept="37vLTw" id="6YyAPwCVWaV" role="37wK5m">
+                <ref role="3cqZAo" node="6YyAPwCTFt5" resolve="id" />
               </node>
             </node>
           </node>
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
index c8f46a77..64d1231d 100644
--- a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
+++ b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
@@ -979,7 +979,7 @@
             <node concept="2tJIrI" id="5JTOzCR3zrP" role="jymVt" />
             <node concept="3Tm1VV" id="5JTOzCR3hYA" role="1B3o_S" />
             <node concept="3clFb_" id="5JTOzCR3hYB" role="jymVt">
-              <property role="TrG5h" value="createLogical" />
+              <property role="TrG5h" value="unbound" />
               <property role="1EzhhJ" value="false" />
               <node concept="37vLTG" id="5JTOzCR3hYC" role="3clF46">
                 <property role="TrG5h" value="cls" />
@@ -1011,7 +1011,6 @@
                     <property role="3SKdUp" value="TODO: inversion of control" />
                   </node>
                 </node>
-                <node concept="3clFbH" id="5JTOzCR3i5y" role="3cqZAp" />
                 <node concept="3clFbJ" id="5JTOzCR3i6e" role="3cqZAp">
                   <node concept="3clFbS" id="5JTOzCR3i6g" role="3clFbx">
                     <node concept="3cpWs6" id="5JTOzCR3kmJ" role="3cqZAp">
@@ -1043,7 +1042,38 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="5JTOzCR3qV8" role="3cqZAp" />
+                <node concept="3clFbJ" id="6YyAPwCQM7n" role="3cqZAp">
+                  <node concept="3clFbS" id="6YyAPwCQM7p" role="3clFbx">
+                    <node concept="3cpWs6" id="6YyAPwCQNMc" role="3cqZAp">
+                      <node concept="10QFUN" id="6YyAPwCQPmn" role="3cqZAk">
+                        <node concept="16syzq" id="6YyAPwCQPmi" role="10QFUM">
+                          <ref role="16sUi3" node="5JTOzCR3hYI" resolve="T" />
+                        </node>
+                        <node concept="2ShNRf" id="6YyAPwCQPmj" role="10QFUP">
+                          <node concept="1pGfFk" id="6YyAPwCQPmk" role="2ShVmc">
+                            <ref role="37wK5l" to="oy3s:1H8E3iB8adK" resolve="StringLogical" />
+                            <node concept="37vLTw" id="6YyAPwCQPml" role="37wK5m">
+                              <ref role="3cqZAo" node="5JTOzCR3pAY" resolve="name" />
+                            </node>
+                            <node concept="10Nm6u" id="6YyAPwCQPmm" role="37wK5m" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="6YyAPwCQMHd" role="3clFbw">
+                    <node concept="3VsKOn" id="6YyAPwCQMhb" role="2Oq$k0">
+                      <ref role="3VsUkX" node="7jC45KcfYla" resolve="IStringLogical" />
+                    </node>
+                    <node concept="liA8E" id="6YyAPwCQNAs" role="2OqNvi">
+                      <ref role="37wK5l" to="e2lb:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                      <node concept="37vLTw" id="6YyAPwCQNG9" role="37wK5m">
+                        <ref role="3cqZAo" node="5JTOzCR3hYC" resolve="cls" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6YyAPwCQCsC" role="3cqZAp" />
                 <node concept="YS8fn" id="5JTOzCR3rqm" role="3cqZAp">
                   <node concept="2ShNRf" id="5JTOzCR3rOQ" role="YScLw">
                     <node concept="1pGfFk" id="5JTOzCR3slq" role="2ShVmc">
@@ -1057,8 +1087,132 @@
               </node>
             </node>
             <node concept="2tJIrI" id="677NV56dyNm" role="jymVt" />
+            <node concept="3clFb_" id="6YyAPwCTS4Q" role="jymVt">
+              <property role="TrG5h" value="bound" />
+              <property role="1EzhhJ" value="false" />
+              <node concept="37vLTG" id="6YyAPwCTS4R" role="3clF46">
+                <property role="TrG5h" value="cls" />
+                <node concept="3uibUv" id="6YyAPwCTS4S" role="1tU5fm">
+                  <ref role="3uigEE" to="e2lb:~Class" resolve="Class" />
+                  <node concept="16syzq" id="6YyAPwCTS4T" role="11_B2D">
+                    <ref role="16sUi3" node="6YyAPwCTS50" resolve="T" />
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTG" id="6YyAPwCTS4U" role="3clF46">
+                <property role="TrG5h" value="value" />
+                <node concept="16syzq" id="6YyAPwCTS4V" role="1tU5fm">
+                  <ref role="16sUi3" node="6YyAPwCTS4Z" resolve="V" />
+                </node>
+              </node>
+              <node concept="16syzq" id="6YyAPwCTS4W" role="3clF45">
+                <ref role="16sUi3" node="6YyAPwCTS50" resolve="T" />
+              </node>
+              <node concept="3Tm1VV" id="6YyAPwCTS4X" role="1B3o_S" />
+              <node concept="16euLQ" id="6YyAPwCTS4Z" role="16eVyc">
+                <property role="TrG5h" value="V" />
+              </node>
+              <node concept="16euLQ" id="6YyAPwCTS50" role="16eVyc">
+                <property role="TrG5h" value="T" />
+                <node concept="3uibUv" id="6YyAPwCTS51" role="3ztrMU">
+                  <ref role="3uigEE" node="1mP5b6jQP$C" resolve="ILogical" />
+                  <node concept="16syzq" id="6YyAPwCTS52" role="11_B2D">
+                    <ref role="16sUi3" node="6YyAPwCTS4Z" resolve="V" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="6YyAPwCTS54" role="3clF47">
+                <node concept="3SKdUt" id="6YyAPwCTTcu" role="3cqZAp">
+                  <node concept="3SKdUq" id="6YyAPwCTTcv" role="3SKWNk">
+                    <property role="3SKdUp" value="TODO: inversion of control" />
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="6YyAPwCTTcw" role="3cqZAp">
+                  <node concept="3clFbS" id="6YyAPwCTTcx" role="3clFbx">
+                    <node concept="3cpWs6" id="6YyAPwCTTcy" role="3cqZAp">
+                      <node concept="10QFUN" id="6YyAPwCTTcz" role="3cqZAk">
+                        <node concept="16syzq" id="6YyAPwCTTc$" role="10QFUM">
+                          <ref role="16sUi3" node="6YyAPwCTS50" resolve="T" />
+                        </node>
+                        <node concept="2ShNRf" id="6YyAPwCTTc_" role="10QFUP">
+                          <node concept="1pGfFk" id="6YyAPwCTTcA" role="2ShVmc">
+                            <ref role="37wK5l" to="oy3s:1GDBwhEEL82" resolve="TreeLogical" />
+                            <node concept="10Nm6u" id="6YyAPwCTTvw" role="37wK5m" />
+                            <node concept="10QFUN" id="6YyAPwCTUrF" role="37wK5m">
+                              <node concept="37vLTw" id="6YyAPwCTU7F" role="10QFUP">
+                                <ref role="3cqZAo" node="6YyAPwCTS4U" resolve="value" />
+                              </node>
+                              <node concept="3uibUv" id="6YyAPwCTUrG" role="10QFUM">
+                                <ref role="3uigEE" to="ie8e:2xQ7eRABXh4" resolve="Tree" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="6YyAPwCTTcD" role="3clFbw">
+                    <node concept="3VsKOn" id="6YyAPwCTTcE" role="2Oq$k0">
+                      <ref role="3VsUkX" node="dfChU1jXdE" resolve="ITreeLogical" />
+                    </node>
+                    <node concept="liA8E" id="6YyAPwCTTcF" role="2OqNvi">
+                      <ref role="37wK5l" to="e2lb:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                      <node concept="37vLTw" id="6YyAPwCTTcG" role="37wK5m">
+                        <ref role="3cqZAo" node="6YyAPwCTS4R" resolve="cls" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="6YyAPwCTTcH" role="3cqZAp">
+                  <node concept="3clFbS" id="6YyAPwCTTcI" role="3clFbx">
+                    <node concept="3cpWs6" id="6YyAPwCTTcJ" role="3cqZAp">
+                      <node concept="10QFUN" id="6YyAPwCTTcK" role="3cqZAk">
+                        <node concept="16syzq" id="6YyAPwCTTcL" role="10QFUM">
+                          <ref role="16sUi3" node="6YyAPwCTS50" resolve="T" />
+                        </node>
+                        <node concept="2ShNRf" id="6YyAPwCTTcM" role="10QFUP">
+                          <node concept="1pGfFk" id="6YyAPwCTTcN" role="2ShVmc">
+                            <ref role="37wK5l" to="oy3s:1H8E3iB8adK" resolve="StringLogical" />
+                            <node concept="10Nm6u" id="6YyAPwCTUSL" role="37wK5m" />
+                            <node concept="10QFUN" id="6YyAPwCTVvH" role="37wK5m">
+                              <node concept="37vLTw" id="6YyAPwCTVc_" role="10QFUP">
+                                <ref role="3cqZAo" node="6YyAPwCTS4U" resolve="value" />
+                              </node>
+                              <node concept="17QB3L" id="6YyAPwCTVvI" role="10QFUM" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="6YyAPwCTTcQ" role="3clFbw">
+                    <node concept="3VsKOn" id="6YyAPwCTTcR" role="2Oq$k0">
+                      <ref role="3VsUkX" node="7jC45KcfYla" resolve="IStringLogical" />
+                    </node>
+                    <node concept="liA8E" id="6YyAPwCTTcS" role="2OqNvi">
+                      <ref role="37wK5l" to="e2lb:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                      <node concept="37vLTw" id="6YyAPwCTTcT" role="37wK5m">
+                        <ref role="3cqZAo" node="6YyAPwCTS4R" resolve="cls" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6YyAPwCTTcU" role="3cqZAp" />
+                <node concept="YS8fn" id="6YyAPwCTTcV" role="3cqZAp">
+                  <node concept="2ShNRf" id="6YyAPwCTTcW" role="YScLw">
+                    <node concept="1pGfFk" id="6YyAPwCTTcX" role="2ShVmc">
+                      <ref role="37wK5l" to="e2lb:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="6YyAPwCTSNo" role="2AJF6D">
+                <ref role="2AI5Lk" to="e2lb:~Override" resolve="Override" />
+              </node>
+            </node>
+            <node concept="2tJIrI" id="6YyAPwCTStx" role="jymVt" />
             <node concept="3clFb_" id="677NV56dysj" role="jymVt">
-              <property role="TrG5h" value="createLogical" />
+              <property role="TrG5h" value="anon" />
               <property role="1EzhhJ" value="false" />
               <node concept="37vLTG" id="677NV56dysk" role="3clF46">
                 <property role="TrG5h" value="cls" />
@@ -1086,7 +1240,6 @@
                     <property role="3SKdUp" value="TODO: inversion of control" />
                   </node>
                 </node>
-                <node concept="3clFbH" id="677NV56dzre" role="3cqZAp" />
                 <node concept="3clFbJ" id="677NV56dzrf" role="3cqZAp">
                   <node concept="3clFbS" id="677NV56dzrg" role="3clFbx">
                     <node concept="3cpWs6" id="677NV56dzrh" role="3cqZAp">
@@ -1116,6 +1269,35 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3clFbJ" id="6YyAPwCQRP4" role="3cqZAp">
+                  <node concept="3clFbS" id="6YyAPwCQRP5" role="3clFbx">
+                    <node concept="3cpWs6" id="6YyAPwCQRP6" role="3cqZAp">
+                      <node concept="10QFUN" id="6YyAPwCQRP7" role="3cqZAk">
+                        <node concept="16syzq" id="6YyAPwCQRP8" role="10QFUM">
+                          <ref role="16sUi3" node="677NV56dysq" resolve="T" />
+                        </node>
+                        <node concept="2ShNRf" id="6YyAPwCQRP9" role="10QFUP">
+                          <node concept="1pGfFk" id="6YyAPwCQRPa" role="2ShVmc">
+                            <ref role="37wK5l" to="oy3s:1H8E3iB8adK" resolve="StringLogical" />
+                            <node concept="10Nm6u" id="6YyAPwCQUmX" role="37wK5m" />
+                            <node concept="10Nm6u" id="6YyAPwCQRPc" role="37wK5m" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="6YyAPwCQRPd" role="3clFbw">
+                    <node concept="3VsKOn" id="6YyAPwCQRPe" role="2Oq$k0">
+                      <ref role="3VsUkX" node="7jC45KcfYla" resolve="IStringLogical" />
+                    </node>
+                    <node concept="liA8E" id="6YyAPwCQRPf" role="2OqNvi">
+                      <ref role="37wK5l" to="e2lb:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                      <node concept="37vLTw" id="6YyAPwCQRPg" role="37wK5m">
+                        <ref role="3cqZAo" node="677NV56dysk" resolve="cls" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3clFbH" id="677NV56dzrr" role="3cqZAp" />
                 <node concept="YS8fn" id="677NV56dzrs" role="3cqZAp">
                   <node concept="2ShNRf" id="677NV56dzrt" role="YScLw">
@@ -1150,7 +1332,7 @@
     </node>
     <node concept="2tJIrI" id="5JTOzCR38sR" role="jymVt" />
     <node concept="3clFb_" id="677NV56dwQ$" role="jymVt">
-      <property role="TrG5h" value="createLogical" />
+      <property role="TrG5h" value="anon" />
       <property role="1EzhhJ" value="true" />
       <node concept="37vLTG" id="677NV56dwQ_" role="3clF46">
         <property role="TrG5h" value="cls" />
@@ -1175,8 +1357,45 @@
       </node>
     </node>
     <node concept="2tJIrI" id="677NV56dxVi" role="jymVt" />
+    <node concept="3clFb_" id="6YyAPwCTQx_" role="jymVt">
+      <property role="TrG5h" value="bound" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="6YyAPwCTQxA" role="3clF46">
+        <property role="TrG5h" value="cls" />
+        <node concept="3uibUv" id="6YyAPwCTQxB" role="1tU5fm">
+          <ref role="3uigEE" to="e2lb:~Class" resolve="Class" />
+          <node concept="16syzq" id="6YyAPwCTQxC" role="11_B2D">
+            <ref role="16sUi3" node="6YyAPwCTQxG" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6YyAPwCTRCZ" role="3clF46">
+        <property role="TrG5h" value="value" />
+        <node concept="16syzq" id="6YyAPwCTRJj" role="1tU5fm">
+          <ref role="16sUi3" node="6YyAPwCTRsW" resolve="V" />
+        </node>
+      </node>
+      <node concept="16syzq" id="6YyAPwCTQxD" role="3clF45">
+        <ref role="16sUi3" node="6YyAPwCTQxG" resolve="T" />
+      </node>
+      <node concept="3Tm1VV" id="6YyAPwCTQxE" role="1B3o_S" />
+      <node concept="3clFbS" id="6YyAPwCTQxF" role="3clF47" />
+      <node concept="16euLQ" id="6YyAPwCTRsW" role="16eVyc">
+        <property role="TrG5h" value="V" />
+      </node>
+      <node concept="16euLQ" id="6YyAPwCTQxG" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="6YyAPwCTQxH" role="3ztrMU">
+          <ref role="3uigEE" node="1mP5b6jQP$C" resolve="ILogical" />
+          <node concept="16syzq" id="6YyAPwCTRxO" role="11_B2D">
+            <ref role="16sUi3" node="6YyAPwCTRsW" resolve="V" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6YyAPwCTR9T" role="jymVt" />
     <node concept="3clFb_" id="5JTOzCR390E" role="jymVt">
-      <property role="TrG5h" value="createLogical" />
+      <property role="TrG5h" value="unbound" />
       <property role="1EzhhJ" value="true" />
       <node concept="37vLTG" id="5JTOzCR397c" role="3clF46">
         <property role="TrG5h" value="cls" />
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
index 4c5434eb..a6dc2760 100644
--- a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
+++ b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
@@ -3761,6 +3761,48 @@
     <node concept="3uibUv" id="dfChU1k2Og" role="EKbjA">
       <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="ITreeLogical" />
     </node>
+    <node concept="3UR2Jj" id="2ev$9JF$huc" role="lGtFl">
+      <node concept="TZ5HA" id="2ev$9JF$hud" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$hue" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iKo" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iKp" role="1dT_Ay">
+          <property role="1dT_AB" value="TODO: the existance of this class and the possibility to present a logical variable referring " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iKi" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iKj" role="1dT_Ay">
+          <property role="1dT_AB" value="to its instance effectively makes a Tree mutable, so it should be supported in reactive schemes, such" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iLe" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iLf" role="1dT_Ay">
+          <property role="1dT_AB" value="as a constraint occurrence. " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iLq" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iLr" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iLC" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iLD" role="1dT_Ay">
+          <property role="1dT_AB" value="So far Tree has been treated as an immutable construct, constraints are matched with its instances as " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iMa" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iMb" role="1dT_Ay">
+          <property role="1dT_AB" value="with opaque objects. This may change in the future. " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iKM" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iKN" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="2GO7tyJVmP4">
     <property role="TrG5h" value="UnificationBuiltinConstraint" />
diff --git a/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps b/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
index 0481b6bf..fe72f838 100644
--- a/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
+++ b/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
@@ -801,6 +801,11 @@
                   </node>
                 </node>
                 <node concept="3clFbH" id="aFQeb4csPh" role="3cqZAp" />
+                <node concept="3SKdUt" id="2ev$9JFpzXK" role="3cqZAp">
+                  <node concept="3SKdUq" id="2ev$9JFp$3p" role="3SKWNk">
+                    <property role="3SKdUp" value="FIXME: conversion of constraint parameter types" />
+                  </node>
+                </node>
                 <node concept="3clFbJ" id="aFQeb4csRr" role="3cqZAp">
                   <node concept="3clFbS" id="aFQeb4csRu" role="3clFbx">
                     <node concept="3clFbF" id="ZqZbw4SI29" role="3cqZAp">
@@ -832,26 +837,125 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="9aQIb" id="aFQeb4cvk9" role="9aQIa">
-                    <node concept="3clFbS" id="aFQeb4cvka" role="9aQI4">
-                      <node concept="3clFbF" id="5dz6b545hpD" role="3cqZAp">
-                        <node concept="2OqwBi" id="5dz6b545hpE" role="3clFbG">
-                          <node concept="2OqwBi" id="5dz6b545hpF" role="2Oq$k0">
-                            <node concept="37vLTw" id="5dz6b545hpG" role="2Oq$k0">
+                  <node concept="3eNFk2" id="2ev$9JFptNq" role="3eNLev">
+                    <node concept="3clFbS" id="2ev$9JFptNr" role="3eOfB_">
+                      <node concept="3clFbF" id="2ev$9JFptNs" role="3cqZAp">
+                        <node concept="2OqwBi" id="2ev$9JFptNt" role="3clFbG">
+                          <node concept="2OqwBi" id="2ev$9JFptNu" role="2Oq$k0">
+                            <node concept="37vLTw" id="2ev$9JFptNv" role="2Oq$k0">
                               <ref role="3cqZAo" node="ZqZbw4SMAd" resolve="cltNode" />
                             </node>
-                            <node concept="3TrEf2" id="5dz6b545hpH" role="2OqNvi">
+                            <node concept="3TrEf2" id="2ev$9JFptNw" role="2OqNvi">
                               <ref role="3Tt5mk" to="tpee:g7uigIF" />
                             </node>
                           </node>
-                          <node concept="2oxUTD" id="5dz6b545hpI" role="2OqNvi">
-                            <node concept="3B5_sB" id="5dz6b545hpJ" role="2oxUTC">
+                          <node concept="2oxUTD" id="2ev$9JFptNx" role="2OqNvi">
+                            <node concept="3B5_sB" id="2ev$9JFptNy" role="2oxUTC">
                               <ref role="3B5MYn" to="oy3s:1H8E3iB85PX" resolve="StringLogical" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
+                    <node concept="2OqwBi" id="2ev$9JFpxmY" role="3eO9$A">
+                      <node concept="3VsKOn" id="2ev$9JFpvzy" role="2Oq$k0">
+                        <ref role="3VsUkX" to="yg8f:7jC45KcfYla" resolve="IStringLogical" />
+                      </node>
+                      <node concept="liA8E" id="2ev$9JFpyv4" role="2OqNvi">
+                        <ref role="37wK5l" to="e2lb:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
+                        <node concept="37vLTw" id="2ev$9JFpy$D" role="37wK5m">
+                          <ref role="3cqZAo" node="aFQeb4csrX" resolve="cls" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3eNFk2" id="2ev$9JFp$wZ" role="3eNLev">
+                    <node concept="3clFbS" id="2ev$9JFp$x0" role="3eOfB_">
+                      <node concept="3clFbF" id="2ev$9JFp$x2" role="3cqZAp">
+                        <node concept="2OqwBi" id="2ev$9JFp$x3" role="3clFbG">
+                          <node concept="2OqwBi" id="2ev$9JFp$x4" role="2Oq$k0">
+                            <node concept="37vLTw" id="2ev$9JFp$x5" role="2Oq$k0">
+                              <ref role="3cqZAo" node="ZqZbw4SMAd" resolve="cltNode" />
+                            </node>
+                            <node concept="3TrEf2" id="2ev$9JFp$x6" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:g7uigIF" />
+                            </node>
+                          </node>
+                          <node concept="2oxUTD" id="2ev$9JFp$x7" role="2OqNvi">
+                            <node concept="3B5_sB" id="2ev$9JFpA2d" role="2oxUTC">
+                              <ref role="3B5MYn" to="ie8e:2xQ7eRABXh4" resolve="Tree" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="2ev$9JFp$KH" role="3eO9$A">
+                      <node concept="3VsKOn" id="2ev$9JFp$DP" role="2Oq$k0">
+                        <ref role="3VsUkX" to="ie8e:2xQ7eRABXh4" resolve="Tree" />
+                      </node>
+                      <node concept="liA8E" id="2ev$9JFp_PO" role="2OqNvi">
+                        <ref role="37wK5l" to="e2lb:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
+                        <node concept="37vLTw" id="2ev$9JFp_U9" role="37wK5m">
+                          <ref role="3cqZAo" node="aFQeb4csrX" resolve="cls" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3eNFk2" id="2ev$9JFpAyV" role="3eNLev">
+                    <node concept="3clFbS" id="2ev$9JFpAyW" role="3eOfB_">
+                      <node concept="3clFbF" id="2ev$9JFpAyX" role="3cqZAp">
+                        <node concept="2OqwBi" id="2ev$9JFpAyY" role="3clFbG">
+                          <node concept="2OqwBi" id="2ev$9JFpAyZ" role="2Oq$k0">
+                            <node concept="37vLTw" id="2ev$9JFpAz0" role="2Oq$k0">
+                              <ref role="3cqZAo" node="ZqZbw4SMAd" resolve="cltNode" />
+                            </node>
+                            <node concept="3TrEf2" id="2ev$9JFpAz1" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:g7uigIF" />
+                            </node>
+                          </node>
+                          <node concept="2oxUTD" id="2ev$9JFpAz2" role="2OqNvi">
+                            <node concept="3B5_sB" id="2ev$9JFpAz3" role="2oxUTC">
+                              <ref role="3B5MYn" to="e2lb:~String" resolve="String" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="2ev$9JFpAz4" role="3eO9$A">
+                      <node concept="3VsKOn" id="2ev$9JFpAz5" role="2Oq$k0">
+                        <ref role="3VsUkX" to="e2lb:~String" resolve="String" />
+                      </node>
+                      <node concept="liA8E" id="2ev$9JFpAz6" role="2OqNvi">
+                        <ref role="37wK5l" to="e2lb:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
+                        <node concept="37vLTw" id="2ev$9JFpAz7" role="37wK5m">
+                          <ref role="3cqZAo" node="aFQeb4csrX" resolve="cls" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="9aQIb" id="2ev$9JFpKNx" role="9aQIa">
+                    <node concept="3clFbS" id="2ev$9JFpKNy" role="9aQI4">
+                      <node concept="YS8fn" id="2ev$9JFpL00" role="3cqZAp">
+                        <node concept="2ShNRf" id="2ev$9JFpL1O" role="YScLw">
+                          <node concept="1pGfFk" id="2ev$9JFpO5_" role="2ShVmc">
+                            <ref role="37wK5l" to="e2lb:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                            <node concept="3cpWs3" id="2ev$9JFpODr" role="37wK5m">
+                              <node concept="Xl_RD" id="2ev$9JFpOW9" role="3uHU7w">
+                                <property role="Xl_RC" value="'" />
+                              </node>
+                              <node concept="3cpWs3" id="2ev$9JFpOoh" role="3uHU7B">
+                                <node concept="Xl_RD" id="2ev$9JFpO7z" role="3uHU7B">
+                                  <property role="Xl_RC" value="unsupported parameter type: '" />
+                                </node>
+                                <node concept="37vLTw" id="2ev$9JFpOqT" role="3uHU7w">
+                                  <ref role="3cqZAo" node="aFQeb4csrX" resolve="cls" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>