From 8df5c22c8bece47b3eef1ebb355636cedfc4f8d9 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 28 Apr 2021 15:38:40 +0200
Subject: [PATCH] Fix pattern terms used in typeOf: always specify concept

For SModel types that reference AbstractConceptDeclaration
a type term created without specifying the reference
automatically becomes a pattern.
A pattern can't be used in typeOf, so the default
concept (BaseConcept) is provided explicitly.
This may be later refactored into a default value in the term
table.
---
 ...tbrains.mps.lang.smodel.queryExt.types.mps |   32 +
 .../jetbrains.mps.lang.smodelExt.types.mps    | 1613 ++++++++++++-----
 ...jetbrains.mps.lang.typesystemExt.types.mps |   16 +
 3 files changed, 1239 insertions(+), 422 deletions(-)

diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps
index e4f06c65..0ee3ebd4 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps
@@ -125,6 +125,10 @@
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
       <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
+      <concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
+        <reference id="6097203247184207800" name="template" index="3jm46O" />
+        <child id="6097203247184212024" name="logical" index="3jm6SO" />
+      </concept>
       <concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
         <child id="4814011019633607808" name="parameter" index="0Rg$4" />
         <child id="3575255234174969658" name="head" index="1nLNMb" />
@@ -774,7 +778,27 @@
               </node>
               <node concept="32pEOW" id="28u2HUPWQmn" role="3vLBG7" />
             </node>
+            <node concept="3NuqgR" id="7kXqzcTBg31" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTBg32" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTBg3c" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
             <node concept="3xSepi" id="28u2HUPWRBR" role="3xSepv">
+              <node concept="3Aq9E8" id="7kXqzcTBg1d" role="3xSepj">
+                <node concept="3I6sU6" id="7kXqzcTBg1e" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTBg0k" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTBg0i" role="3I6s78">
+                      <ref role="3jm46O" to="jxwi:7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTBg3o" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTBg32" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
               <node concept="3Aq9E8" id="28u2HUPWRBS" role="3xSepj">
                 <node concept="3I6sU6" id="28u2HUPWRBT" role="3Ip0Jz">
                   <node concept="3I6s7M" id="28u2HUPWRC1" role="3I6sU7">
@@ -798,6 +822,14 @@
                                       <node concept="1nq8_$" id="28u2HUPWRDY" role="nsMwV">
                                         <node concept="ns1u0" id="28u2HUPWRDX" role="1nq8_t">
                                           <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
+                                          <node concept="nsMwS" id="7kXqzcTBg3u" role="ns1xD">
+                                            <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
+                                            <node concept="1nq8_$" id="7kXqzcTBg3A" role="nsMwV">
+                                              <node concept="a7P8L" id="7kXqzcTBg3_" role="1nq8_t">
+                                                <ref role="a7OzE" node="7kXqzcTBg32" resolve="Concept" />
+                                              </node>
+                                            </node>
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
index aee47fd1..3d7f0143 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
@@ -283,6 +283,7 @@
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
+      <concept id="5472444609684539882" name="jetbrains.mps.lang.smodel.structure.SConceptTypeLiteral" flags="ig" index="2uNoUa" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="8758390115029295477" name="jetbrains.mps.lang.smodel.structure.SReferenceType" flags="in" index="2z4iKi" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
@@ -427,6 +428,17 @@
         <child id="1204249894870289978" name="nodes" index="Oftjs" />
       </concept>
       <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
+      <concept id="6097203247139556923" name="jetbrains.mps.lang.coderules.structure.CallMacroTemplate" flags="ng" index="3hwh0R">
+        <child id="6097203247147235901" name="logical" index="3h32gL" />
+        <child id="6097203247141261094" name="code" index="3hEL4E" />
+        <child id="6097203247142518497" name="parameter" index="3hP23H" />
+      </concept>
+      <concept id="6097203247142995359" name="jetbrains.mps.lang.coderules.structure.CallMacroParameterReference" flags="ng" index="3hN9Ij">
+        <reference id="6097203247143507437" name="declaration" index="3hLkJx" />
+      </concept>
+      <concept id="6097203247142432582" name="jetbrains.mps.lang.coderules.structure.CallMacroParameterDeclaration" flags="ng" index="3hPv5a">
+        <child id="6097203247142468229" name="type" index="3hPmi9" />
+      </concept>
       <concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
         <reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
         <child id="6097203247156107501" name="input" index="3ix8rx" />
@@ -577,6 +589,11 @@
       <ref role="ns1xW" node="3lXUvG03UmG" resolve="conceptDeclRef" />
       <node concept="nspSf" id="3bgqfmmKxBJ" role="ns1xx" />
     </node>
+    <node concept="ns1x$" id="32iFMN7s9Ry" role="ns1xc">
+      <property role="TrG5h" value="conceptLit" />
+      <ref role="ns1xW" node="3lXUvG03UmG" resolve="conceptDeclRef" />
+      <node concept="nspSf" id="32iFMN7s9Rz" role="ns1xx" />
+    </node>
     <node concept="ns1x$" id="3bgqfmmKNsS" role="ns1xc">
       <property role="TrG5h" value="conceptNode" />
       <ref role="ns1xW" node="3lXUvG03UmG" resolve="conceptDeclRef" />
@@ -1098,6 +1115,128 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="32iFMN7saCm" role="1nK1Vg">
+      <property role="TrG5h" value="recover_conceptLit" />
+      <node concept="3clFbS" id="32iFMN7saCn" role="1nLNMH">
+        <node concept="1nLNNL" id="32iFMN7saCo" role="3cqZAp">
+          <node concept="1nLNMm" id="32iFMN7saCp" role="1nLNNK">
+            <node concept="3Aq93q" id="32iFMN7saCq" role="1nLNMb">
+              <node concept="3I6sU6" id="32iFMN7saCr" role="3Ip0Jz">
+                <node concept="3I6s7M" id="32iFMN7saCs" role="3I6sU7">
+                  <node concept="3Aqt3T" id="32iFMN7saCt" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                    <node concept="a7P8L" id="32iFMN7saCu" role="3AunhB">
+                      <ref role="a7OzE" node="32iFMN7saCA" resolve="Node" />
+                    </node>
+                    <node concept="1HFMs5" id="32iFMN7saCv" role="3AunhB">
+                      <node concept="a7P8L" id="32iFMN7saCw" role="1uarlU">
+                        <ref role="a7OzE" node="32iFMN7saCD" resolve="Type" />
+                      </node>
+                      <node concept="ns1u0" id="32iFMN7saCx" role="1uarlW">
+                        <ref role="ns1xF" node="32iFMN7s9Ry" resolve="conceptLit" />
+                        <node concept="nsMwS" id="32iFMN7saCy" role="ns1xD">
+                          <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                          <node concept="1nq8_$" id="32iFMN7saCz" role="nsMwV">
+                            <node concept="a7P8L" id="32iFMN7saC$" role="1nq8_t">
+                              <ref role="a7OzE" node="32iFMN7saCG" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="32iFMN7saC_" role="0Rg$4">
+              <node concept="aZer4" id="32iFMN7saCA" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="32iFMN7saCB" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="32iFMN7saCC" role="0Rg$4">
+              <node concept="aZer4" id="32iFMN7saCD" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="32iFMN7saCE" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="32iFMN7saCF" role="0Rg$4">
+              <node concept="aZer4" id="32iFMN7saCG" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="32iFMN7saCH" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
+            <node concept="3xSepi" id="32iFMN7saCI" role="3xSepv">
+              <node concept="3Aq9E8" id="32iFMN7saCJ" role="3xSepj">
+                <node concept="3I6sU6" id="32iFMN7saCK" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="32iFMN7saCL" role="3I6sU7">
+                    <node concept="3A8Hvi" id="32iFMN7saCM" role="3I6s78">
+                      <node concept="HKQnh" id="32iFMN7saCN" role="3A8w4Q">
+                        <node concept="2Sg_IR" id="32iFMN7saCO" role="HKQng">
+                          <node concept="1Ft4W6" id="32iFMN7saCP" role="2SgHGx">
+                            <node concept="a7P8L" id="32iFMN7saCQ" role="1FtiSR">
+                              <ref role="a7OzE" node="32iFMN7saCG" resolve="Concept" />
+                            </node>
+                          </node>
+                          <node concept="1bVj0M" id="32iFMN7saCR" role="2SgG2M">
+                            <node concept="3clFbS" id="32iFMN7saCS" role="1bW5cS">
+                              <node concept="3cpWs8" id="32iFMN7saCT" role="3cqZAp">
+                                <node concept="3cpWsn" id="32iFMN7saCU" role="3cpWs9">
+                                  <property role="TrG5h" value="node" />
+                                  <node concept="3Tqbb2" id="32iFMN7saCV" role="1tU5fm">
+                                    <ref role="ehGHo" to="tp25:4JM1Q3lfSBE" resolve="SConceptTypeLiteral" />
+                                  </node>
+                                  <node concept="2c44tf" id="32iFMN7saCW" role="33vP2m">
+                                    <node concept="2uNoUa" id="32iFMN7saML" role="2c44tc" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="32iFMN7saCY" role="3cqZAp">
+                                <node concept="2OqwBi" id="32iFMN7saCZ" role="3clFbG">
+                                  <node concept="2OqwBi" id="32iFMN7saD0" role="2Oq$k0">
+                                    <node concept="37vLTw" id="32iFMN7saD1" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="32iFMN7saCU" resolve="node" />
+                                    </node>
+                                    <node concept="3TrEf2" id="32iFMN7sbtg" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tp25:4JM1Q3lfSBF" resolve="conceptDeclaraton" />
+                                    </node>
+                                  </node>
+                                  <node concept="2oxUTD" id="32iFMN7saD3" role="2OqNvi">
+                                    <node concept="37vLTw" id="32iFMN7saD4" role="2oxUTC">
+                                      <ref role="3cqZAo" node="32iFMN7saD7" resolve="cpt" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="32iFMN7saD5" role="3cqZAp">
+                                <node concept="37vLTw" id="32iFMN7saD6" role="3clFbG">
+                                  <ref role="3cqZAo" node="32iFMN7saCU" resolve="node" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTG" id="32iFMN7saD7" role="1bW2Oz">
+                              <property role="TrG5h" value="cpt" />
+                              <node concept="3Tqbb2" id="32iFMN7saD8" role="1tU5fm">
+                                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="32iFMN7saD9" role="3A8wtg">
+                        <ref role="a7OzE" node="32iFMN7saCA" resolve="Node" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="5wYq9r4SC7Q" role="1nK1Vg">
       <property role="TrG5h" value="recover_conceptNode" />
       <node concept="3clFbS" id="5wYq9r4SC7R" role="1nLNMH">
@@ -2172,6 +2311,14 @@
                         </node>
                         <node concept="9aQIb" id="6tm4iVtPxDT" role="9aQIa">
                           <node concept="3clFbS" id="6tm4iVtPxDU" role="9aQI4">
+                            <node concept="3Aqczg" id="7kXqzcTBv5i" role="3cqZAp">
+                              <node concept="3jm4v3" id="7kXqzcTBv5g" role="3Aqpz8">
+                                <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                                <node concept="a7P8L" id="7kXqzcTBv65" role="3jm6SO">
+                                  <ref role="a7OzE" node="7kXqzcTBv5u" resolve="Concept" />
+                                </node>
+                              </node>
+                            </node>
                             <node concept="3Aqczg" id="6tm4iVtPxMF" role="3cqZAp">
                               <node concept="3Aqt3T" id="6tm4iVtPxME" role="3Aqpz8">
                                 <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -2182,6 +2329,14 @@
                                 </node>
                                 <node concept="ns1u0" id="6tm4iVtPxQM" role="3AunhB">
                                   <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                                  <node concept="nsMwS" id="7kXqzcTBwLH" role="ns1xD">
+                                    <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                                    <node concept="1nq8_$" id="7kXqzcTBwLO" role="nsMwV">
+                                      <node concept="a7P8L" id="7kXqzcTBwLN" role="1nq8_t">
+                                        <ref role="a7OzE" node="7kXqzcTBv5u" resolve="Concept" />
+                                      </node>
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -2199,6 +2354,14 @@
               </node>
               <node concept="32pEOW" id="6tm4iVtPzWH" role="3vLBG7" />
             </node>
+            <node concept="3NuqgR" id="7kXqzcTBv5t" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTBv5u" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTBv5C" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -2836,6 +2999,14 @@
             <node concept="3xSepi" id="6tm4iVtQCgZ" role="3xSepv">
               <node concept="3Aq9E8" id="6tm4iVtQCh0" role="3xSepj">
                 <node concept="3I6sU6" id="6tm4iVtQCh1" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTBwM6" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTBwM4" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTBwMh" role="3jm6SO">
+                        <ref role="a7OzE" node="6tm4iVtQBMc" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6tm4iVtQCnp" role="3I6sU7">
                     <node concept="3Aqt3T" id="6tm4iVtQCnq" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -2846,6 +3017,14 @@
                       </node>
                       <node concept="ns1u0" id="6tm4iVtQCnt" role="3AunhB">
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="7kXqzcTByup" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTByuw" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTByuv" role="1nq8_t">
+                              <ref role="a7OzE" node="6tm4iVtQBMc" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -4978,113 +5157,57 @@
       <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
       <node concept="3clFbS" id="3bgqfmmNdKZ" role="3iwQuN">
         <node concept="3clFbJ" id="3lXUvG02zDt" role="3cqZAp">
-          <node concept="3clFbS" id="3lXUvG02zDv" role="3clFbx">
-            <node concept="3SKdUt" id="3lXUvG02$Zw" role="3cqZAp">
-              <node concept="1PaTwC" id="3lXUvG02$Zx" role="1aUNEU">
-                <node concept="3oM_SD" id="3lXUvG02$Zy" role="1PaTwD">
-                  <property role="3oM_SC" value="pattern" />
-                </node>
-              </node>
-            </node>
-            <node concept="3Aqczg" id="3lXUvG02$qh" role="3cqZAp">
-              <node concept="3A8Hvi" id="3lXUvG02$qe" role="3Aqpz8">
-                <node concept="a7P8L" id="3lXUvG02$z3" role="3A8wtg">
-                  <ref role="a7OzE" node="3bgqfmmNdL2" resolve="Type" />
-                </node>
-                <node concept="ns1u0" id="3lXUvG02A5G" role="3A8w4Q">
-                  <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
-                  <node concept="nsMwS" id="3lXUvG02Acw" role="ns1xD">
-                    <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                    <node concept="1nq8_$" id="3lXUvG02AtZ" role="nsMwV">
-                      <node concept="a7P8L" id="3lXUvG02AtY" role="1nq8_t">
-                        <ref role="a7OzE" node="3lXUvG02$HO" resolve="Concept" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="3lXUvG02AJU" role="3cqZAp" />
-          </node>
-          <node concept="3clFbC" id="3lXUvG02$4A" role="3clFbw">
-            <node concept="10Nm6u" id="3lXUvG02$6C" role="3uHU7w" />
+          <node concept="3y3z36" id="7kXqzcT$zqd" role="3clFbw">
             <node concept="3j8tct" id="3lXUvG02zKQ" role="3uHU7B">
               <ref role="3j8tcu" node="3bgqfmmNdL4" resolve="nt" />
             </node>
+            <node concept="10Nm6u" id="3lXUvG02$6C" role="3uHU7w" />
           </node>
-          <node concept="9aQIb" id="3lXUvG02AAV" role="9aQIa">
-            <node concept="3clFbS" id="3lXUvG02AAW" role="9aQI4">
-              <node concept="3SKdUt" id="3lXUvG02BiO" role="3cqZAp">
-                <node concept="1PaTwC" id="3lXUvG02BiP" role="1aUNEU">
-                  <node concept="3oM_SD" id="3lXUvG02BiQ" role="1PaTwD">
-                    <property role="3oM_SC" value="always" />
-                  </node>
-                  <node concept="3oM_SD" id="3lXUvG02B$I" role="1PaTwD">
-                    <property role="3oM_SC" value="specify" />
-                  </node>
-                  <node concept="3oM_SD" id="3lXUvG02BHu" role="1PaTwD">
-                    <property role="3oM_SC" value="concept" />
-                  </node>
-                  <node concept="3oM_SD" id="3lXUvG02C3N" role="1PaTwD" />
+          <node concept="3clFbS" id="3lXUvG02AAW" role="3clFbx">
+            <node concept="3SKdUt" id="3lXUvG02BiO" role="3cqZAp">
+              <node concept="1PaTwC" id="3lXUvG02BiP" role="1aUNEU">
+                <node concept="3oM_SD" id="3lXUvG02BiQ" role="1PaTwD">
+                  <property role="3oM_SC" value="always" />
                 </node>
+                <node concept="3oM_SD" id="3lXUvG02B$I" role="1PaTwD">
+                  <property role="3oM_SC" value="specify" />
+                </node>
+                <node concept="3oM_SD" id="3lXUvG02BHu" role="1PaTwD">
+                  <property role="3oM_SC" value="concept" />
+                </node>
+                <node concept="3oM_SD" id="3lXUvG02C3N" role="1PaTwD" />
               </node>
-              <node concept="3cpWs8" id="5wYq9r5m9Cl" role="3cqZAp">
-                <node concept="3cpWsn" id="5wYq9r5m9Cm" role="3cpWs9">
-                  <property role="TrG5h" value="concept" />
-                  <node concept="3Tqbb2" id="3CulEO20nw4" role="1tU5fm">
-                    <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+            </node>
+            <node concept="3Aqczg" id="7kXqzcT$xyj" role="3cqZAp">
+              <node concept="3jm4v3" id="7kXqzcT$xyi" role="3Aqpz8">
+                <ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
+                <node concept="2OqwBi" id="7kXqzcT$zo5" role="3jicU7">
+                  <node concept="3j8tct" id="7kXqzcT$zo6" role="2Oq$k0">
+                    <ref role="3j8tcu" node="3bgqfmmNdL4" resolve="nt" />
                   </node>
-                  <node concept="3K4zz7" id="5wYq9r5m9Cn" role="33vP2m">
-                    <node concept="2OqwBi" id="5wYq9r5m9Co" role="3K4Cdx">
-                      <node concept="2OqwBi" id="5wYq9r5m9Cp" role="2Oq$k0">
-                        <node concept="3j8tct" id="5wYq9r5m9Cq" role="2Oq$k0">
-                          <ref role="3j8tcu" node="3bgqfmmNdL4" resolve="nt" />
-                        </node>
-                        <node concept="3TrEf2" id="5wYq9r5m9Cr" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tp25:g$ehGDh" resolve="concept" />
-                        </node>
-                      </node>
-                      <node concept="3x8VRR" id="5wYq9r5m9Cs" role="2OqNvi" />
-                    </node>
-                    <node concept="2OqwBi" id="5wYq9r5m9Cu" role="3K4E3e">
-                      <node concept="3j8tct" id="5wYq9r5m9Cv" role="2Oq$k0">
-                        <ref role="3j8tcu" node="3bgqfmmNdL4" resolve="nt" />
-                      </node>
-                      <node concept="3TrEf2" id="5wYq9r5m9Cw" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tp25:g$ehGDh" resolve="concept" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="3CulEO20pwi" role="3K4GZi">
-                      <node concept="2c44tf" id="3CulEO20pGs" role="2Oq$k0">
-                        <node concept="3bZ5Sz" id="3CulEO20pGt" role="2c44tc">
-                          <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="3CulEO20pF_" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                      </node>
-                    </node>
+                  <node concept="3TrEf2" id="7kXqzcT$zo7" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tp25:g$ehGDh" resolve="concept" />
                   </node>
                 </node>
-              </node>
-              <node concept="1mebxG" id="3CulEO2Jd8U" role="3cqZAp">
-                <node concept="37vLTw" id="3CulEO2Jd8V" role="1mebXD">
-                  <ref role="3cqZAo" node="5wYq9r5m9Cm" resolve="concept" />
+                <node concept="a7P8L" id="7kXqzcT$znW" role="3jm6SO">
+                  <ref role="a7OzE" node="3lXUvG02$HO" resolve="Concept" />
                 </node>
               </node>
-              <node concept="3Aqczg" id="3bgqfmmNryS" role="3cqZAp">
-                <node concept="3A8Hvi" id="3bgqfmmNryT" role="3Aqpz8">
-                  <node concept="a7P8L" id="3bgqfmmNryW" role="3A8wtg">
-                    <ref role="a7OzE" node="3bgqfmmNdL2" resolve="Type" />
-                  </node>
-                  <node concept="ns1u0" id="3bgqfmmNryX" role="3A8w4Q">
-                    <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
-                    <node concept="nsMwS" id="3bgqfmmNryY" role="ns1xD">
-                      <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                      <node concept="37vLTw" id="5wYq9r5ma8Q" role="nsMwV">
-                        <ref role="3cqZAo" node="5wYq9r5m9Cm" resolve="concept" />
-                      </node>
-                    </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Aqczg" id="3bgqfmmNryS" role="3cqZAp">
+          <node concept="3A8Hvi" id="3bgqfmmNryT" role="3Aqpz8">
+            <node concept="a7P8L" id="3bgqfmmNryW" role="3A8wtg">
+              <ref role="a7OzE" node="3bgqfmmNdL2" resolve="Type" />
+            </node>
+            <node concept="ns1u0" id="3bgqfmmNryX" role="3A8w4Q">
+              <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+              <node concept="nsMwS" id="3bgqfmmNryY" role="ns1xD">
+                <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                <node concept="1nq8_$" id="7kXqzcT_WCK" role="nsMwV">
+                  <node concept="a7P8L" id="7kXqzcT_WCJ" role="1nq8_t">
+                    <ref role="a7OzE" node="3lXUvG02$HO" resolve="Concept" />
                   </node>
                 </node>
               </node>
@@ -5115,92 +5238,43 @@
       <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
       <node concept="3clFbS" id="5wYq9r5mcxT" role="3iwQuN">
         <node concept="3clFbJ" id="t7AM9FH$AD" role="3cqZAp">
-          <node concept="3clFbS" id="t7AM9FH$AF" role="3clFbx">
-            <node concept="3Aqczg" id="t7AM9FH$T6" role="3cqZAp">
-              <node concept="3A8Hvi" id="t7AM9FH$T0" role="3Aqpz8">
-                <node concept="a7P8L" id="t7AM9FH_Xp" role="3A8wtg">
-                  <ref role="a7OzE" node="5wYq9r5mcyk" resolve="Type" />
-                </node>
-                <node concept="ns1u0" id="t7AM9FHVt6" role="3A8w4Q">
-                  <ref role="ns1xF" node="4$wPwNd_PNt" resolve="nodeptr" />
-                  <node concept="nsMwS" id="t7AM9FHVKK" role="ns1xD">
-                    <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                    <node concept="1nq8_$" id="t7AM9FHW4Y" role="nsMwV">
-                      <node concept="a7P8L" id="t7AM9FHW4X" role="1nq8_t">
-                        <ref role="a7OzE" node="t7AM9FHVSu" resolve="Concept" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="t7AM9FHVDp" role="3cqZAp" />
-          </node>
-          <node concept="3clFbC" id="t7AM9FH$SN" role="3clFbw">
-            <node concept="10Nm6u" id="t7AM9FH$SU" role="3uHU7w" />
+          <node concept="3y3z36" id="7kXqzcT$zDy" role="3clFbw">
             <node concept="3j8tct" id="t7AM9FH$Ba" role="3uHU7B">
               <ref role="3j8tcu" node="5wYq9r5mcym" resolve="nt" />
             </node>
+            <node concept="10Nm6u" id="t7AM9FH$SU" role="3uHU7w" />
           </node>
-          <node concept="9aQIb" id="t7AM9FHVxV" role="9aQIa">
-            <node concept="3clFbS" id="t7AM9FHVxW" role="9aQI4">
-              <node concept="3cpWs8" id="5wYq9r5mcxU" role="3cqZAp">
-                <node concept="3cpWsn" id="5wYq9r5mcxV" role="3cpWs9">
-                  <property role="TrG5h" value="concept" />
-                  <node concept="3Tqbb2" id="3CulEO20pHK" role="1tU5fm">
-                    <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+          <node concept="3clFbS" id="t7AM9FHVxW" role="3clFbx">
+            <node concept="3Aqczg" id="7kXqzcT$zr7" role="3cqZAp">
+              <node concept="3jm4v3" id="7kXqzcT$zr8" role="3Aqpz8">
+                <ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
+                <node concept="2OqwBi" id="7kXqzcT$zr9" role="3jicU7">
+                  <node concept="3j8tct" id="7kXqzcT$zra" role="2Oq$k0">
+                    <ref role="3j8tcu" node="5wYq9r5mcym" resolve="nt" />
                   </node>
-                  <node concept="3K4zz7" id="3CulEO20pWQ" role="33vP2m">
-                    <node concept="2OqwBi" id="3CulEO20pWR" role="3K4Cdx">
-                      <node concept="2OqwBi" id="3CulEO20pWS" role="2Oq$k0">
-                        <node concept="3j8tct" id="3CulEO20pWT" role="2Oq$k0">
-                          <ref role="3j8tcu" node="5wYq9r5mcym" resolve="nt" />
-                        </node>
-                        <node concept="3TrEf2" id="3CulEO20pWU" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tp25:6qMaajUPFaH" resolve="concept" />
-                        </node>
-                      </node>
-                      <node concept="3x8VRR" id="3CulEO20pWV" role="2OqNvi" />
-                    </node>
-                    <node concept="2OqwBi" id="3CulEO20pWW" role="3K4E3e">
-                      <node concept="3j8tct" id="3CulEO20pWX" role="2Oq$k0">
-                        <ref role="3j8tcu" node="5wYq9r5mcym" resolve="nt" />
-                      </node>
-                      <node concept="3TrEf2" id="3CulEO20qjz" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tp25:6qMaajUPFaH" resolve="concept" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="3CulEO20pWZ" role="3K4GZi">
-                      <node concept="2c44tf" id="3CulEO20pX0" role="2Oq$k0">
-                        <node concept="3bZ5Sz" id="3CulEO20pX1" role="2c44tc">
-                          <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="3CulEO20pX2" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                      </node>
-                    </node>
+                  <node concept="3TrEf2" id="7kXqzcT$zrb" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tp25:6qMaajUPFaH" resolve="concept" />
                   </node>
                 </node>
-              </node>
-              <node concept="1mebxG" id="3CulEO2Jd48" role="3cqZAp">
-                <node concept="37vLTw" id="3CulEO2Jd49" role="1mebXD">
-                  <ref role="3cqZAo" node="5wYq9r5mcxV" resolve="concept" />
+                <node concept="a7P8L" id="7kXqzcT$zrc" role="3jm6SO">
+                  <ref role="a7OzE" node="t7AM9FHVSu" resolve="Concept" />
                 </node>
               </node>
-              <node concept="3Aqczg" id="5wYq9r5mcya" role="3cqZAp">
-                <node concept="3A8Hvi" id="5wYq9r5mcyb" role="3Aqpz8">
-                  <node concept="a7P8L" id="5wYq9r5mcye" role="3A8wtg">
-                    <ref role="a7OzE" node="5wYq9r5mcyk" resolve="Type" />
-                  </node>
-                  <node concept="ns1u0" id="5wYq9r5mcyf" role="3A8w4Q">
-                    <ref role="ns1xF" node="4$wPwNd_PNt" resolve="nodeptr" />
-                    <node concept="nsMwS" id="5wYq9r5mcyg" role="ns1xD">
-                      <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                      <node concept="37vLTw" id="5wYq9r5mcyh" role="nsMwV">
-                        <ref role="3cqZAo" node="5wYq9r5mcxV" resolve="concept" />
-                      </node>
-                    </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Aqczg" id="t7AM9FH$T6" role="3cqZAp">
+          <node concept="3A8Hvi" id="t7AM9FH$T0" role="3Aqpz8">
+            <node concept="a7P8L" id="t7AM9FH_Xp" role="3A8wtg">
+              <ref role="a7OzE" node="5wYq9r5mcyk" resolve="Type" />
+            </node>
+            <node concept="ns1u0" id="t7AM9FHVt6" role="3A8w4Q">
+              <ref role="ns1xF" node="4$wPwNd_PNt" resolve="nodeptr" />
+              <node concept="nsMwS" id="t7AM9FHVKK" role="ns1xD">
+                <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                <node concept="1nq8_$" id="t7AM9FHW4Y" role="nsMwV">
+                  <node concept="a7P8L" id="t7AM9FHW4X" role="1nq8_t">
+                    <ref role="a7OzE" node="t7AM9FHVSu" resolve="Concept" />
                   </node>
                 </node>
               </node>
@@ -5233,92 +5307,43 @@
       <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
       <node concept="3clFbS" id="5wYq9r5mbmO" role="3iwQuN">
         <node concept="3clFbJ" id="43iDt9R2n81" role="3cqZAp">
-          <node concept="3clFbS" id="43iDt9R2n83" role="3clFbx">
-            <node concept="3Aqczg" id="43iDt9R2nGQ" role="3cqZAp">
-              <node concept="3A8Hvi" id="43iDt9R2nGK" role="3Aqpz8">
-                <node concept="a7P8L" id="43iDt9R2oNx" role="3A8wtg">
-                  <ref role="a7OzE" node="5wYq9r5mbnf" resolve="Type" />
-                </node>
-                <node concept="ns1u0" id="43iDt9R2oPZ" role="3A8w4Q">
-                  <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
-                  <node concept="nsMwS" id="43iDt9R2oSq" role="ns1xD">
-                    <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                    <node concept="1nq8_$" id="43iDt9R2pcy" role="nsMwV">
-                      <node concept="a7P8L" id="43iDt9R2pcx" role="1nq8_t">
-                        <ref role="a7OzE" node="43iDt9R2oZP" resolve="Concept" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="43iDt9R2pjT" role="3cqZAp" />
-          </node>
-          <node concept="3clFbC" id="43iDt9R2nv0" role="3clFbw">
-            <node concept="10Nm6u" id="43iDt9R2nBV" role="3uHU7w" />
+          <node concept="3y3z36" id="7kXqzcT$zH0" role="3clFbw">
             <node concept="3j8tct" id="43iDt9R2ndj" role="3uHU7B">
               <ref role="3j8tcu" node="5wYq9r5mbnh" resolve="nt" />
             </node>
+            <node concept="10Nm6u" id="43iDt9R2nBV" role="3uHU7w" />
           </node>
-          <node concept="9aQIb" id="43iDt9R2pht" role="9aQIa">
-            <node concept="3clFbS" id="43iDt9R2phu" role="9aQI4">
-              <node concept="3cpWs8" id="5wYq9r5mbmP" role="3cqZAp">
-                <node concept="3cpWsn" id="5wYq9r5mbmQ" role="3cpWs9">
-                  <property role="TrG5h" value="concept" />
-                  <node concept="3Tqbb2" id="3CulEO20qkh" role="1tU5fm">
-                    <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+          <node concept="3clFbS" id="43iDt9R2phu" role="3clFbx">
+            <node concept="3Aqczg" id="7kXqzcT$zEp" role="3cqZAp">
+              <node concept="3jm4v3" id="7kXqzcT$zEq" role="3Aqpz8">
+                <ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
+                <node concept="2OqwBi" id="7kXqzcT$zFh" role="3jicU7">
+                  <node concept="3j8tct" id="7kXqzcT$zFi" role="2Oq$k0">
+                    <ref role="3j8tcu" node="5wYq9r5mbnh" resolve="nt" />
                   </node>
-                  <node concept="3K4zz7" id="5wYq9r5mbmS" role="33vP2m">
-                    <node concept="2OqwBi" id="5wYq9r5mbmT" role="3K4Cdx">
-                      <node concept="2OqwBi" id="5wYq9r5mbmU" role="2Oq$k0">
-                        <node concept="3j8tct" id="5wYq9r5mbmV" role="2Oq$k0">
-                          <ref role="3j8tcu" node="5wYq9r5mbnh" resolve="nt" />
-                        </node>
-                        <node concept="3TrEf2" id="5wYq9r5mchw" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tp25:gEI9Wgx" resolve="elementConcept" />
-                        </node>
-                      </node>
-                      <node concept="3x8VRR" id="5wYq9r5mbmX" role="2OqNvi" />
-                    </node>
-                    <node concept="2OqwBi" id="5wYq9r5mbmZ" role="3K4E3e">
-                      <node concept="3j8tct" id="5wYq9r5mbn0" role="2Oq$k0">
-                        <ref role="3j8tcu" node="5wYq9r5mbnh" resolve="nt" />
-                      </node>
-                      <node concept="3TrEf2" id="5wYq9r5mRRq" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tp25:gEI9Wgx" resolve="elementConcept" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="3CulEO20sVQ" role="3K4GZi">
-                      <node concept="2c44tf" id="3CulEO20sVR" role="2Oq$k0">
-                        <node concept="3bZ5Sz" id="3CulEO20sVS" role="2c44tc">
-                          <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="3CulEO20sVT" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                      </node>
-                    </node>
+                  <node concept="3TrEf2" id="7kXqzcT$zFj" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tp25:gEI9Wgx" resolve="elementConcept" />
                   </node>
                 </node>
-              </node>
-              <node concept="1mebxG" id="3CulEO2Ih$n" role="3cqZAp">
-                <node concept="37vLTw" id="3CulEO2Ih$S" role="1mebXD">
-                  <ref role="3cqZAo" node="5wYq9r5mbmQ" resolve="concept" />
+                <node concept="a7P8L" id="7kXqzcT$zEu" role="3jm6SO">
+                  <ref role="a7OzE" node="43iDt9R2oZP" resolve="Concept" />
                 </node>
               </node>
-              <node concept="3Aqczg" id="5wYq9r5mbn5" role="3cqZAp">
-                <node concept="3A8Hvi" id="5wYq9r5mbn6" role="3Aqpz8">
-                  <node concept="a7P8L" id="5wYq9r5mbn9" role="3A8wtg">
-                    <ref role="a7OzE" node="5wYq9r5mbnf" resolve="Type" />
-                  </node>
-                  <node concept="ns1u0" id="5wYq9r5mbna" role="3A8w4Q">
-                    <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
-                    <node concept="nsMwS" id="5wYq9r5mbnb" role="ns1xD">
-                      <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                      <node concept="37vLTw" id="5wYq9r5mbnc" role="nsMwV">
-                        <ref role="3cqZAo" node="5wYq9r5mbmQ" resolve="concept" />
-                      </node>
-                    </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Aqczg" id="43iDt9R2nGQ" role="3cqZAp">
+          <node concept="3A8Hvi" id="43iDt9R2nGK" role="3Aqpz8">
+            <node concept="a7P8L" id="43iDt9R2oNx" role="3A8wtg">
+              <ref role="a7OzE" node="5wYq9r5mbnf" resolve="Type" />
+            </node>
+            <node concept="ns1u0" id="43iDt9R2oPZ" role="3A8w4Q">
+              <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
+              <node concept="nsMwS" id="43iDt9R2oSq" role="ns1xD">
+                <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                <node concept="1nq8_$" id="43iDt9R2pcy" role="nsMwV">
+                  <node concept="a7P8L" id="43iDt9R2pcx" role="1nq8_t">
+                    <ref role="a7OzE" node="43iDt9R2oZP" resolve="Concept" />
                   </node>
                 </node>
               </node>
@@ -5351,92 +5376,43 @@
       <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
       <node concept="3clFbS" id="4boCUQtpq12" role="3iwQuN">
         <node concept="3clFbJ" id="43iDt9R2pwg" role="3cqZAp">
-          <node concept="3clFbS" id="43iDt9R2pwi" role="3clFbx">
-            <node concept="3Aqczg" id="43iDt9R2pH$" role="3cqZAp">
-              <node concept="3A8Hvi" id="43iDt9R2pHu" role="3Aqpz8">
-                <node concept="a7P8L" id="43iDt9R2pK3" role="3A8wtg">
-                  <ref role="a7OzE" node="4boCUQtpq15" resolve="Type" />
-                </node>
-                <node concept="ns1u0" id="43iDt9R2pMx" role="3A8w4Q">
-                  <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
-                  <node concept="nsMwS" id="43iDt9R2pOW" role="ns1xD">
-                    <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
-                    <node concept="1nq8_$" id="43iDt9R2q8_" role="nsMwV">
-                      <node concept="a7P8L" id="43iDt9R2q8$" role="1nq8_t">
-                        <ref role="a7OzE" node="43iDt9R2pTO" resolve="Concept" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="43iDt9R2qkz" role="3cqZAp" />
-          </node>
-          <node concept="3clFbC" id="43iDt9R2pzB" role="3clFbw">
-            <node concept="10Nm6u" id="43iDt9R2pF1" role="3uHU7w" />
+          <node concept="3y3z36" id="7kXqzcT$zTT" role="3clFbw">
             <node concept="3j8tct" id="43iDt9R2pza" role="3uHU7B">
               <ref role="3j8tcu" node="4boCUQtpq17" resolve="ct" />
             </node>
+            <node concept="10Nm6u" id="43iDt9R2pF1" role="3uHU7w" />
           </node>
-          <node concept="9aQIb" id="43iDt9R2qdw" role="9aQIa">
-            <node concept="3clFbS" id="43iDt9R2qdx" role="9aQI4">
-              <node concept="3cpWs8" id="5wYq9r5maju" role="3cqZAp">
-                <node concept="3cpWsn" id="5wYq9r5majv" role="3cpWs9">
-                  <property role="TrG5h" value="concept" />
-                  <node concept="3Tqbb2" id="3CulEO20sZy" role="1tU5fm">
-                    <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+          <node concept="3clFbS" id="43iDt9R2qdx" role="3clFbx">
+            <node concept="3Aqczg" id="7kXqzcT$zRb" role="3cqZAp">
+              <node concept="3jm4v3" id="7kXqzcT$zRc" role="3Aqpz8">
+                <ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
+                <node concept="2OqwBi" id="7kXqzcT$zS0" role="3jicU7">
+                  <node concept="3j8tct" id="7kXqzcT$zS1" role="2Oq$k0">
+                    <ref role="3j8tcu" node="4boCUQtpq17" resolve="ct" />
                   </node>
-                  <node concept="3K4zz7" id="5wYq9r5majx" role="33vP2m">
-                    <node concept="2OqwBi" id="5wYq9r5majy" role="3K4Cdx">
-                      <node concept="2OqwBi" id="5wYq9r5majz" role="2Oq$k0">
-                        <node concept="3j8tct" id="5wYq9r5max$" role="2Oq$k0">
-                          <ref role="3j8tcu" node="4boCUQtpq17" resolve="ct" />
-                        </node>
-                        <node concept="3TrEf2" id="5wYq9r5maSB" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                        </node>
-                      </node>
-                      <node concept="3x8VRR" id="5wYq9r5majA" role="2OqNvi" />
-                    </node>
-                    <node concept="2OqwBi" id="5wYq9r5majC" role="3K4E3e">
-                      <node concept="3j8tct" id="5wYq9r5mSgI" role="2Oq$k0">
-                        <ref role="3j8tcu" node="4boCUQtpq17" resolve="ct" />
-                      </node>
-                      <node concept="3TrEf2" id="5wYq9r5mSqN" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="3CulEO20tIr" role="3K4GZi">
-                      <node concept="2c44tf" id="3CulEO20tIs" role="2Oq$k0">
-                        <node concept="3bZ5Sz" id="3CulEO20tIt" role="2c44tc">
-                          <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="3CulEO20tIu" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                      </node>
-                    </node>
+                  <node concept="3TrEf2" id="7kXqzcT$zS2" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
                   </node>
                 </node>
-              </node>
-              <node concept="1mebxG" id="3CulEO2Jd9D" role="3cqZAp">
-                <node concept="37vLTw" id="3CulEO2Jd9E" role="1mebXD">
-                  <ref role="3cqZAo" node="5wYq9r5majv" resolve="concept" />
+                <node concept="a7P8L" id="7kXqzcT$zRg" role="3jm6SO">
+                  <ref role="a7OzE" node="43iDt9R2pTO" resolve="Concept" />
                 </node>
               </node>
-              <node concept="3Aqczg" id="4boCUQtpqzW" role="3cqZAp">
-                <node concept="3A8Hvi" id="4boCUQtpqzX" role="3Aqpz8">
-                  <node concept="a7P8L" id="4boCUQtpq$0" role="3A8wtg">
-                    <ref role="a7OzE" node="4boCUQtpq15" resolve="Type" />
-                  </node>
-                  <node concept="ns1u0" id="4boCUQtpq$1" role="3A8w4Q">
-                    <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
-                    <node concept="nsMwS" id="4boCUQtpq$2" role="ns1xD">
-                      <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
-                      <node concept="37vLTw" id="5wYq9r5mbbF" role="nsMwV">
-                        <ref role="3cqZAo" node="5wYq9r5majv" resolve="concept" />
-                      </node>
-                    </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Aqczg" id="43iDt9R2pH$" role="3cqZAp">
+          <node concept="3A8Hvi" id="43iDt9R2pHu" role="3Aqpz8">
+            <node concept="a7P8L" id="43iDt9R2pK3" role="3A8wtg">
+              <ref role="a7OzE" node="4boCUQtpq15" resolve="Type" />
+            </node>
+            <node concept="ns1u0" id="43iDt9R2pMx" role="3A8w4Q">
+              <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
+              <node concept="nsMwS" id="43iDt9R2pOW" role="ns1xD">
+                <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                <node concept="1nq8_$" id="43iDt9R2q8_" role="nsMwV">
+                  <node concept="a7P8L" id="43iDt9R2q8$" role="1nq8_t">
+                    <ref role="a7OzE" node="43iDt9R2pTO" resolve="Concept" />
                   </node>
                 </node>
               </node>
@@ -5468,61 +5444,45 @@
     <node concept="3iyZe8" id="5dFCr0y80Jy" role="0oKgB">
       <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
       <node concept="3clFbS" id="5dFCr0y80Jz" role="3iwQuN">
-        <node concept="3cpWs8" id="5dFCr0y80J$" role="3cqZAp">
-          <node concept="3cpWsn" id="5dFCr0y80J_" role="3cpWs9">
-            <property role="TrG5h" value="concept" />
-            <node concept="3Tqbb2" id="5dFCr0y80JA" role="1tU5fm">
-              <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        <node concept="3clFbJ" id="32iFMN7s9cz" role="3cqZAp">
+          <node concept="3y3z36" id="7kXqzcT$$0p" role="3clFbw">
+            <node concept="3j8tct" id="32iFMN7s9d5" role="3uHU7B">
+              <ref role="3j8tcu" node="5dFCr0y80K0" resolve="ct" />
             </node>
-            <node concept="3K4zz7" id="5dFCr0y80JB" role="33vP2m">
-              <node concept="2OqwBi" id="5dFCr0y80JC" role="3K4Cdx">
-                <node concept="2OqwBi" id="5dFCr0y80JD" role="2Oq$k0">
-                  <node concept="3j8tct" id="5dFCr0y80JE" role="2Oq$k0">
+            <node concept="10Nm6u" id="32iFMN7s9BA" role="3uHU7w" />
+          </node>
+          <node concept="3clFbS" id="32iFMN7s9C4" role="3clFbx">
+            <node concept="3Aqczg" id="7kXqzcT$zUo" role="3cqZAp">
+              <node concept="3jm4v3" id="7kXqzcT$zUp" role="3Aqpz8">
+                <ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
+                <node concept="2OqwBi" id="7kXqzcT$zUq" role="3jicU7">
+                  <node concept="3j8tct" id="7kXqzcT$zUr" role="2Oq$k0">
                     <ref role="3j8tcu" node="5dFCr0y80K0" resolve="ct" />
                   </node>
-                  <node concept="3TrEf2" id="5dFCr0y81jm" role="2OqNvi">
+                  <node concept="3TrEf2" id="7kXqzcT$zUs" role="2OqNvi">
                     <ref role="3Tt5mk" to="tp25:4JM1Q3lfSBF" resolve="conceptDeclaraton" />
                   </node>
                 </node>
-                <node concept="3x8VRR" id="5dFCr0y80JG" role="2OqNvi" />
-              </node>
-              <node concept="2OqwBi" id="5dFCr0y80JH" role="3K4E3e">
-                <node concept="3j8tct" id="5dFCr0y80JI" role="2Oq$k0">
-                  <ref role="3j8tcu" node="5dFCr0y80K0" resolve="ct" />
-                </node>
-                <node concept="3TrEf2" id="5dFCr0y81m0" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tp25:4JM1Q3lfSBF" resolve="conceptDeclaraton" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="5dFCr0y80JK" role="3K4GZi">
-                <node concept="2c44tf" id="5dFCr0y80JL" role="2Oq$k0">
-                  <node concept="3bZ5Sz" id="5dFCr0y80JM" role="2c44tc">
-                    <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                  </node>
-                </node>
-                <node concept="3TrEf2" id="5dFCr0y80JN" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
+                <node concept="a7P8L" id="7kXqzcT$$0e" role="3jm6SO">
+                  <ref role="a7OzE" node="7kXqzcT$zVf" resolve="Concept" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="1mebxG" id="5dFCr0y80JO" role="3cqZAp">
-          <node concept="37vLTw" id="5dFCr0y80JP" role="1mebXD">
-            <ref role="3cqZAo" node="5dFCr0y80J_" resolve="concept" />
-          </node>
-        </node>
-        <node concept="3Aqczg" id="5dFCr0y80JQ" role="3cqZAp">
-          <node concept="3A8Hvi" id="5dFCr0y80JR" role="3Aqpz8">
-            <node concept="a7P8L" id="5dFCr0y80JS" role="3A8wtg">
+        <node concept="3Aqczg" id="32iFMN7s9BL" role="3cqZAp">
+          <node concept="3A8Hvi" id="32iFMN7s9BF" role="3Aqpz8">
+            <node concept="a7P8L" id="32iFMN7s9BS" role="3A8wtg">
               <ref role="a7OzE" node="5dFCr0y80JY" resolve="Type" />
             </node>
-            <node concept="ns1u0" id="5dFCr0y80JT" role="3A8w4Q">
+            <node concept="ns1u0" id="32iFMN7s9BY" role="3A8w4Q">
               <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
-              <node concept="nsMwS" id="5dFCr0y80JU" role="ns1xD">
+              <node concept="nsMwS" id="7kXqzcT$zVw" role="ns1xD">
                 <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
-                <node concept="37vLTw" id="5dFCr0y80JV" role="nsMwV">
-                  <ref role="3cqZAo" node="5dFCr0y80J_" resolve="concept" />
+                <node concept="1nq8_$" id="7kXqzcT$zVB" role="nsMwV">
+                  <node concept="a7P8L" id="7kXqzcT$zVA" role="1nq8_t">
+                    <ref role="a7OzE" node="7kXqzcT$zVf" resolve="Concept" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -5541,65 +5501,57 @@
           <property role="TrG5h" value="ct" />
         </node>
       </node>
+      <node concept="3uniRu" id="7kXqzcT$zVe" role="3iJhzY">
+        <node concept="aZer4" id="7kXqzcT$zVf" role="3XD1gS">
+          <property role="TrG5h" value="Concept" />
+        </node>
+        <node concept="3Tqbb2" id="7kXqzcT$zVm" role="3vLBG7">
+          <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        </node>
+      </node>
     </node>
     <node concept="3iyZe8" id="5wYq9r5mdts" role="0oKgB">
       <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
       <node concept="3clFbS" id="5wYq9r5mdtt" role="3iwQuN">
-        <node concept="3cpWs8" id="5wYq9r5mdtu" role="3cqZAp">
-          <node concept="3cpWsn" id="5wYq9r5mdtv" role="3cpWs9">
-            <property role="TrG5h" value="concept" />
-            <node concept="3Tqbb2" id="3CulEO20tJT" role="1tU5fm">
-              <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        <node concept="3clFbJ" id="32iFMN7s9Eu" role="3cqZAp">
+          <node concept="3y3z36" id="7kXqzcT$$hw" role="3clFbw">
+            <node concept="3j8tct" id="32iFMN7s9F0" role="3uHU7B">
+              <ref role="3j8tcu" node="5wYq9r5mdtU" resolve="cnt" />
             </node>
-            <node concept="3K4zz7" id="5wYq9r5mdtx" role="33vP2m">
-              <node concept="2OqwBi" id="5wYq9r5mdty" role="3K4Cdx">
-                <node concept="2OqwBi" id="5wYq9r5mdtz" role="2Oq$k0">
-                  <node concept="3j8tct" id="5wYq9r5mdt$" role="2Oq$k0">
+            <node concept="10Nm6u" id="32iFMN7s9FI" role="3uHU7w" />
+          </node>
+          <node concept="3clFbS" id="32iFMN7s9Gj" role="3clFbx">
+            <node concept="3Aqczg" id="7kXqzcT$$eI" role="3cqZAp">
+              <node concept="3jm4v3" id="7kXqzcT$$eJ" role="3Aqpz8">
+                <ref role="3jm46O" node="7kXqzcT$7jb" resolve="conceptOrDefault" />
+                <node concept="2OqwBi" id="7kXqzcT$$eK" role="3jicU7">
+                  <node concept="3j8tct" id="7kXqzcT$$fv" role="2Oq$k0">
                     <ref role="3j8tcu" node="5wYq9r5mdtU" resolve="cnt" />
                   </node>
-                  <node concept="3TrEf2" id="5wYq9r5me04" role="2OqNvi">
+                  <node concept="3TrEf2" id="7kXqzcT$$gs" role="2OqNvi">
                     <ref role="3Tt5mk" to="tp25:hbqa45m" resolve="conceptDeclaraton" />
                   </node>
                 </node>
-                <node concept="3x8VRR" id="5wYq9r5mdtA" role="2OqNvi" />
-              </node>
-              <node concept="2OqwBi" id="5wYq9r5mdtC" role="3K4E3e">
-                <node concept="3j8tct" id="5wYq9r5mSxg" role="2Oq$k0">
-                  <ref role="3j8tcu" node="5wYq9r5mdtU" resolve="cnt" />
-                </node>
-                <node concept="3TrEf2" id="5wYq9r5mSSv" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tp25:hbqa45m" resolve="conceptDeclaraton" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="3CulEO20uuG" role="3K4GZi">
-                <node concept="2c44tf" id="3CulEO20uuH" role="2Oq$k0">
-                  <node concept="3bZ5Sz" id="3CulEO20uuI" role="2c44tc">
-                    <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                  </node>
-                </node>
-                <node concept="3TrEf2" id="3CulEO20uuJ" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
+                <node concept="a7P8L" id="7kXqzcT$$eN" role="3jm6SO">
+                  <ref role="a7OzE" node="7kXqzcT$$0U" resolve="Concept" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="1mebxG" id="3CulEO2Jdai" role="3cqZAp">
-          <node concept="37vLTw" id="3CulEO2Jdaj" role="1mebXD">
-            <ref role="3cqZAo" node="5wYq9r5mdtv" resolve="concept" />
-          </node>
-        </node>
-        <node concept="3Aqczg" id="5wYq9r5mdtI" role="3cqZAp">
-          <node concept="3A8Hvi" id="5wYq9r5mdtJ" role="3Aqpz8">
-            <node concept="a7P8L" id="5wYq9r5mdtM" role="3A8wtg">
+        <node concept="3Aqczg" id="32iFMN7s9FT" role="3cqZAp">
+          <node concept="3A8Hvi" id="32iFMN7s9FN" role="3Aqpz8">
+            <node concept="a7P8L" id="32iFMN7s9G0" role="3A8wtg">
               <ref role="a7OzE" node="5wYq9r5mdtS" resolve="Type" />
             </node>
-            <node concept="ns1u0" id="5wYq9r5mdtN" role="3A8w4Q">
+            <node concept="ns1u0" id="32iFMN7s9G6" role="3A8w4Q">
               <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
-              <node concept="nsMwS" id="5wYq9r5mdtO" role="ns1xD">
+              <node concept="nsMwS" id="7kXqzcT$$1b" role="ns1xD">
                 <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
-                <node concept="37vLTw" id="5wYq9r5mdtP" role="nsMwV">
-                  <ref role="3cqZAo" node="5wYq9r5mdtv" resolve="concept" />
+                <node concept="1nq8_$" id="7kXqzcT$$1i" role="nsMwV">
+                  <node concept="a7P8L" id="7kXqzcT$$1h" role="1nq8_t">
+                    <ref role="a7OzE" node="7kXqzcT$$0U" resolve="Concept" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -5618,6 +5570,14 @@
           <property role="TrG5h" value="cnt" />
         </node>
       </node>
+      <node concept="3uniRu" id="7kXqzcT$$0T" role="3iJhzY">
+        <node concept="aZer4" id="7kXqzcT$$0U" role="3XD1gS">
+          <property role="TrG5h" value="Concept" />
+        </node>
+        <node concept="3Tqbb2" id="7kXqzcT$$11" role="3vLBG7">
+          <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        </node>
+      </node>
     </node>
     <node concept="3iyZe8" id="5wYq9r5meoE" role="0oKgB">
       <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
@@ -5792,6 +5752,108 @@
         </node>
       </node>
     </node>
+    <node concept="3hwh0R" id="7kXqzcT$7jb" role="0oKgB">
+      <property role="TrG5h" value="conceptOrDefault" />
+      <node concept="3hPv5a" id="7kXqzcT$7oW" role="3hP23H">
+        <property role="TrG5h" value="cd" />
+        <node concept="3Tqbb2" id="7kXqzcT$7p1" role="3hPmi9">
+          <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7kXqzcT$7jd" role="3hEL4E">
+        <node concept="3clFbJ" id="7kXqzcTAj_h" role="3cqZAp">
+          <node concept="3clFbS" id="7kXqzcTAj_j" role="3clFbx">
+            <node concept="3Aqczg" id="7kXqzcTAjLd" role="3cqZAp">
+              <node concept="3jm4v3" id="7kXqzcTAjLb" role="3Aqpz8">
+                <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                <node concept="a7P8L" id="7kXqzcTAjLj" role="3jm6SO">
+                  <ref role="a7OzE" node="7kXqzcT$znl" resolve="Concept" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="7kXqzcTAjMx" role="3cqZAp" />
+          </node>
+          <node concept="3clFbC" id="7kXqzcTAjA6" role="3clFbw">
+            <node concept="10Nm6u" id="7kXqzcTAjK8" role="3uHU7w" />
+            <node concept="3hN9Ij" id="7kXqzcTAj_I" role="3uHU7B">
+              <ref role="3hLkJx" node="7kXqzcT$7oW" resolve="cd" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="7kXqzcTAjL2" role="9aQIa">
+            <node concept="3clFbS" id="7kXqzcTAjL3" role="9aQI4">
+              <node concept="1mebxG" id="7kXqzcT$7_q" role="3cqZAp">
+                <node concept="3hN9Ij" id="7kXqzcTAjNi" role="1mebXD">
+                  <ref role="3hLkJx" node="7kXqzcT$7oW" resolve="cd" />
+                </node>
+              </node>
+              <node concept="3Aqczg" id="7kXqzcT$7A7" role="3cqZAp">
+                <node concept="3A8Hvi" id="7kXqzcT$7A1" role="3Aqpz8">
+                  <node concept="37jhX" id="7kXqzcT$7AY" role="3A8w4Q">
+                    <node concept="3hN9Ij" id="7kXqzcTAjNw" role="37jj2">
+                      <ref role="3hLkJx" node="7kXqzcT$7oW" resolve="cd" />
+                    </node>
+                  </node>
+                  <node concept="a7P8L" id="7kXqzcT$znL" role="3A8wtg">
+                    <ref role="a7OzE" node="7kXqzcT$znl" resolve="Concept" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uniRu" id="7kXqzcT$znk" role="3h32gL">
+        <node concept="aZer4" id="7kXqzcT$znl" role="3XD1gS">
+          <property role="TrG5h" value="Concept" />
+        </node>
+        <node concept="3Tqbb2" id="7kXqzcT$zns" role="3vLBG7">
+          <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        </node>
+      </node>
+    </node>
+    <node concept="3hwh0R" id="7kXqzcTAj1H" role="0oKgB">
+      <property role="TrG5h" value="defaultConcept" />
+      <node concept="3clFbS" id="7kXqzcTAj1J" role="3hEL4E">
+        <node concept="3cpWs8" id="7kXqzcTAjz9" role="3cqZAp">
+          <node concept="3cpWsn" id="7kXqzcTAjza" role="3cpWs9">
+            <property role="TrG5h" value="concept" />
+            <node concept="3Tqbb2" id="7kXqzcTAjz8" role="1tU5fm">
+              <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="7kXqzcTAjzb" role="33vP2m">
+              <node concept="2c44tf" id="7kXqzcTAjzc" role="2Oq$k0">
+                <node concept="3bZ5Sz" id="7kXqzcTAjzd" role="2c44tc">
+                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                </node>
+              </node>
+              <node concept="3TrEf2" id="7kXqzcTAjze" role="2OqNvi">
+                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Aqczg" id="7kXqzcTAjoA" role="3cqZAp">
+          <node concept="3A8Hvi" id="7kXqzcTAjow" role="3Aqpz8">
+            <node concept="a7P8L" id="7kXqzcTAjoM" role="3A8wtg">
+              <ref role="a7OzE" node="7kXqzcTAj65" resolve="Concept" />
+            </node>
+            <node concept="37jhX" id="7kXqzcTAj$8" role="3A8w4Q">
+              <node concept="37vLTw" id="7kXqzcTAj$6" role="37jj2">
+                <ref role="3cqZAo" node="7kXqzcTAjza" resolve="concept" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uniRu" id="7kXqzcTAj64" role="3h32gL">
+        <node concept="aZer4" id="7kXqzcTAj65" role="3XD1gS">
+          <property role="TrG5h" value="Concept" />
+        </node>
+        <node concept="3Tqbb2" id="7kXqzcTAj6c" role="3vLBG7">
+          <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="AVZre" id="5OjpQKwiNCq">
     <property role="TrG5h" value="Operation" />
@@ -7938,12 +8000,28 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCSY2Qg" role="3AunhB">
                         <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
+                        <node concept="nsMwS" id="7kXqzcTBBKY" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTBBL5" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTBBL4" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTB_Ro" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTB_Rn" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTB_Ro" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTB_Rv" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -7972,6 +8050,14 @@
             <node concept="3xSepi" id="6RzTUCSY3Aa" role="3xSepv">
               <node concept="3Aq9E8" id="6RzTUCSY3Ab" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCSY3Ac" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTAiU0" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTAiTY" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTAiUk" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTAiTx" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCSY3C9" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCSY3C8" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -7987,6 +8073,14 @@
                           <node concept="1nq8_$" id="6RzTUCSY6cL" role="nsMwV">
                             <node concept="ns1u0" id="6RzTUCSY6cK" role="1nq8_t">
                               <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                              <node concept="nsMwS" id="7kXqzcTAiU$" role="ns1xD">
+                                <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTAiUG" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTAiUF" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTAiTx" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -7996,6 +8090,14 @@
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTAiTw" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTAiTx" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTAiTC" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -8141,12 +8243,28 @@
                             </node>
                             <node concept="ns1u0" id="6RzTUCSYbXI" role="3AunhB">
                               <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
+                              <node concept="nsMwS" id="7kXqzcTBDFi" role="ns1xD">
+                                <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTBDFp" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTBDFo" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTBBLg" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="3NuqgR" id="7kXqzcTBBLf" role="0Rg$4">
+                    <node concept="aZer4" id="7kXqzcTBBLg" role="3XD1gS">
+                      <property role="TrG5h" value="Concept" />
+                    </node>
+                    <node concept="3Tqbb2" id="7kXqzcTBBLn" role="3vLBG7">
+                      <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -8318,6 +8436,14 @@
             <node concept="3xSepi" id="6RzTUCSYk5L" role="3xSepv">
               <node concept="3Aq9E8" id="6RzTUCSYk5M" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCSYk5N" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTAiVH" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTAiVF" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTAiVS" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTAiVf" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCSYk7K" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCSYk7J" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -8328,12 +8454,28 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCSYkhv" role="3AunhB">
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="7kXqzcTAiW5" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTAiWc" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTAiWb" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTAiVf" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTAiVe" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTAiVf" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTAiVm" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -8406,6 +8548,14 @@
             <node concept="3xSepi" id="6RzTUCSYnae" role="3xSepv">
               <node concept="3Aq9E8" id="6RzTUCSYnaf" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCSYnag" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTAiWN" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTAiWL" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTAiWY" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTAiWn" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCSYne5" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCSYne4" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -8416,12 +8566,28 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCSYnk4" role="3AunhB">
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="7kXqzcTAiXb" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTAiXi" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTAiXh" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTAiWn" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTAiWm" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTAiWn" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTAiWu" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -8450,6 +8616,14 @@
             <node concept="3xSepi" id="6RzTUCSYnwz" role="3xSepv">
               <node concept="3Aq9E8" id="6RzTUCSYnw$" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCSYnw_" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTAjNV" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTAjNW" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTAjNY" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTAjNC" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCSYnwA" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCSYnwB" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -8460,12 +8634,28 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCSYof7" role="3AunhB">
                         <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
+                        <node concept="nsMwS" id="7kXqzcTAjOd" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTAjOk" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTAjOj" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTAjNC" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTAjNB" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTAjNC" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTAjNJ" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -8494,6 +8684,14 @@
             <node concept="3xSepi" id="6RzTUCSYpII" role="3xSepv">
               <node concept="3Aq9E8" id="6RzTUCSYpIJ" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCSYpIK" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTAjO$" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTAjO_" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTAjPa" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTAjOR" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCSYpIL" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCSYpIM" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -8504,12 +8702,28 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCSYpIP" role="3AunhB">
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="7kXqzcTAjPg" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTAjPn" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTAjPm" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTAjOR" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTAjOQ" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTAjOR" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTAjOY" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -8538,6 +8752,14 @@
             <node concept="3xSepi" id="6RzTUCSYqMh" role="3xSepv">
               <node concept="3Aq9E8" id="6RzTUCSYqMi" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCSYqMj" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTAjPw" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTAjPx" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTAjQ4" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTAjPL" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCSYqMk" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCSYqMl" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -8548,12 +8770,28 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCSYqMo" role="3AunhB">
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="7kXqzcTAjQa" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTAjQh" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTAjQg" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTAjPL" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTAjPK" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTAjPL" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTAjPS" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -8582,6 +8820,14 @@
             <node concept="3xSepi" id="6RzTUCSYr9I" role="3xSepv">
               <node concept="3Aq9E8" id="6RzTUCSYr9J" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCSYr9K" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTAjQJ" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTAjQK" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTAjQL" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTAjQs" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCSYr9L" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCSYr9M" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -8592,12 +8838,28 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCSYrPo" role="3AunhB">
                         <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
+                        <node concept="nsMwS" id="7kXqzcTAlJE" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTAlJL" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTAlJK" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTAjQs" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTAjQr" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTAjQs" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTAjQz" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -10693,6 +10955,7 @@
                             <node concept="3clFbJ" id="2q9s7foGPtp" role="3cqZAp">
                               <node concept="9aQIb" id="2q9s7foGPtq" role="9aQIa">
                                 <node concept="3clFbS" id="2q9s7foGPtr" role="9aQI4">
+                                  <node concept="3clFbH" id="7kXqzcTByJP" role="3cqZAp" />
                                   <node concept="3Aqczg" id="2q9s7foGPts" role="3cqZAp">
                                     <node concept="3Aqt3T" id="2q9s7foGPtt" role="3Aqpz8">
                                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -10703,6 +10966,14 @@
                                       </node>
                                       <node concept="ns1u0" id="2q9s7foGPtw" role="3AunhB">
                                         <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
+                                        <node concept="nsMwS" id="7kXqzcTBzLm" role="ns1xD">
+                                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                                          <node concept="1nq8_$" id="7kXqzcTBzLt" role="nsMwV">
+                                            <node concept="a7P8L" id="7kXqzcTBzLs" role="1nq8_t">
+                                              <ref role="a7OzE" node="7kXqzcTByJY" resolve="Concept" />
+                                            </node>
+                                          </node>
+                                        </node>
                                       </node>
                                     </node>
                                   </node>
@@ -10755,6 +11026,14 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3NuqgR" id="7kXqzcTByJX" role="0Rg$4">
+                    <node concept="aZer4" id="7kXqzcTByJY" role="3XD1gS">
+                      <property role="TrG5h" value="Concept" />
+                    </node>
+                    <node concept="3Tqbb2" id="7kXqzcTByK5" role="3vLBG7">
+                      <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -10906,12 +11185,28 @@
                             </node>
                             <node concept="ns1u0" id="7FV1iGvVKU5" role="3AunhB">
                               <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
+                              <node concept="nsMwS" id="7kXqzcTB$Nq" role="ns1xD">
+                                <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTB$Nx" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTB$Nw" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTBzLC" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="3NuqgR" id="7kXqzcTBzLB" role="0Rg$4">
+                    <node concept="aZer4" id="7kXqzcTBzLC" role="3XD1gS">
+                      <property role="TrG5h" value="Concept" />
+                    </node>
+                    <node concept="3Tqbb2" id="7kXqzcTBzLJ" role="3vLBG7">
+                      <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -11059,6 +11354,14 @@
                                       </node>
                                       <node concept="ns1u0" id="2q9s7foGHtM" role="3AunhB">
                                         <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
+                                        <node concept="nsMwS" id="7kXqzcTB$Oa" role="ns1xD">
+                                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                                          <node concept="1nq8_$" id="7kXqzcTB$Oh" role="nsMwV">
+                                            <node concept="a7P8L" id="7kXqzcTB$Og" role="1nq8_t">
+                                              <ref role="a7OzE" node="7kXqzcTB$NG" resolve="Concept" />
+                                            </node>
+                                          </node>
+                                        </node>
                                       </node>
                                     </node>
                                   </node>
@@ -11111,6 +11414,14 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3NuqgR" id="7kXqzcTB$NF" role="0Rg$4">
+                    <node concept="aZer4" id="7kXqzcTB$NG" role="3XD1gS">
+                      <property role="TrG5h" value="Concept" />
+                    </node>
+                    <node concept="3Tqbb2" id="7kXqzcTB$NN" role="3vLBG7">
+                      <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -11258,6 +11569,14 @@
                                       </node>
                                       <node concept="ns1u0" id="2q9s7foGMOV" role="3AunhB">
                                         <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
+                                        <node concept="nsMwS" id="7kXqzcTB_R6" role="ns1xD">
+                                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                                          <node concept="1nq8_$" id="7kXqzcTB_Rd" role="nsMwV">
+                                            <node concept="a7P8L" id="7kXqzcTB_Rc" role="1nq8_t">
+                                              <ref role="a7OzE" node="7kXqzcTB$Os" resolve="Concept" />
+                                            </node>
+                                          </node>
+                                        </node>
                                       </node>
                                     </node>
                                   </node>
@@ -11310,6 +11629,14 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3NuqgR" id="7kXqzcTB$Or" role="0Rg$4">
+                    <node concept="aZer4" id="7kXqzcTB$Os" role="3XD1gS">
+                      <property role="TrG5h" value="Concept" />
+                    </node>
+                    <node concept="3Tqbb2" id="7kXqzcTB$Oz" role="3vLBG7">
+                      <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -12863,6 +13190,14 @@
               </node>
               <node concept="3Aq9E8" id="6RzTUCTmDfM" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCTmDfN" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTBgOs" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTBgOq" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTBgOB" role="3jm6SO">
+                        <ref role="a7OzE" node="6RzTUCTm_Tq" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCTmDqm" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCTmDqn" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -12873,6 +13208,14 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCTmDqq" role="3AunhB">
                         <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
+                        <node concept="nsMwS" id="7kXqzcTBi9r" role="ns1xD">
+                          <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTBi9y" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTBi9x" role="1nq8_t">
+                              <ref role="a7OzE" node="6RzTUCTm_Tq" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -13224,6 +13567,14 @@
               </node>
               <node concept="32pEOW" id="6RzTUCTmZJ7" role="3vLBG7" />
             </node>
+            <node concept="3NuqgR" id="7kXqzcTBi9F" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTBi9G" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTBi9Q" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
             <node concept="3xSepi" id="6RzTUCTmZJb" role="3xSepv">
               <node concept="3Aq9E8" id="6RzTUCTmZJc" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCTmZJd" role="3Ip0Jz">
@@ -13235,6 +13586,14 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCTmZJh" role="3AunhB">
                         <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
+                        <node concept="nsMwS" id="7kXqzcTBjvp" role="ns1xD">
+                          <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTBjvw" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTBjvv" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTBi9G" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -13257,6 +13616,14 @@
                           <node concept="1nq8_$" id="6RzTUCTmZJt" role="nsMwV">
                             <node concept="ns1u0" id="6RzTUCTmZJu" role="1nq8_t">
                               <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
+                              <node concept="nsMwS" id="7kXqzcTBkP5" role="ns1xD">
+                                <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTBkPd" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTBkPc" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTBi9G" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -13277,6 +13644,14 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCTmZJC" role="3AunhB">
                         <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
+                        <node concept="nsMwS" id="7kXqzcTBmb4" role="ns1xD">
+                          <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTBmbb" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTBmba" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTBi9G" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -13299,6 +13674,14 @@
                           <node concept="1nq8_$" id="6RzTUCTmZJO" role="nsMwV">
                             <node concept="ns1u0" id="6RzTUCTmZJP" role="1nq8_t">
                               <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
+                              <node concept="nsMwS" id="7kXqzcTBnxk" role="ns1xD">
+                                <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTBnxs" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTBnxr" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTBi9G" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -13339,6 +13722,14 @@
               </node>
               <node concept="3Aq9E8" id="6RzTUCTmZK3" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCTmZK4" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTBnxL" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTBnxJ" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTBnxZ" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTBi9G" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCTmZK5" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCTmZK6" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -13354,6 +13745,14 @@
                           <node concept="1nq8_$" id="6RzTUCTmZKb" role="nsMwV">
                             <node concept="ns1u0" id="6RzTUCTmZKc" role="1nq8_t">
                               <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
+                              <node concept="nsMwS" id="7kXqzcTBny5" role="ns1xD">
+                                <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTBnyd" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTBnyc" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTBi9G" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -13421,6 +13820,14 @@
               </node>
               <node concept="32pEOW" id="6RzTUCTn5Wz" role="3vLBG7" />
             </node>
+            <node concept="3NuqgR" id="7kXqzcTBnym" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTBnyn" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTBnyx" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
             <node concept="3xSepi" id="6RzTUCTn5W$" role="3xSepv">
               <node concept="3Aq9E8" id="6RzTUCTn5W_" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCTn5WA" role="3Ip0Jz">
@@ -13432,6 +13839,14 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCTn5WE" role="3AunhB">
                         <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
+                        <node concept="nsMwS" id="7kXqzcTBoTQ" role="ns1xD">
+                          <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTBoTX" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTBoTW" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTBnyn" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -13454,6 +13869,14 @@
                           <node concept="1nq8_$" id="6RzTUCTn5WN" role="nsMwV">
                             <node concept="ns1u0" id="6RzTUCTn5WO" role="1nq8_t">
                               <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
+                              <node concept="nsMwS" id="7kXqzcTBqhk" role="ns1xD">
+                                <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTBqhs" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTBqhr" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTBnyn" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -13474,6 +13897,14 @@
                       </node>
                       <node concept="ns1u0" id="6RzTUCTn5WV" role="3AunhB">
                         <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
+                        <node concept="nsMwS" id="7kXqzcTBrD5" role="ns1xD">
+                          <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTBrDc" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTBrDb" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTBnyn" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -13496,6 +13927,14 @@
                           <node concept="1nq8_$" id="6RzTUCTn5X4" role="nsMwV">
                             <node concept="ns1u0" id="6RzTUCTn5X5" role="1nq8_t">
                               <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
+                              <node concept="nsMwS" id="7kXqzcTBt17" role="ns1xD">
+                                <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTBt1f" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTBt1e" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTBnyn" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -13536,6 +13975,14 @@
               </node>
               <node concept="3Aq9E8" id="6RzTUCTn5Xg" role="3xSepj">
                 <node concept="3I6sU6" id="6RzTUCTn5Xh" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTBt1$" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTBt1y" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTBt1M" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTBnyn" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6RzTUCTn5Xi" role="3I6sU7">
                     <node concept="3Aqt3T" id="6RzTUCTn5Xj" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -13551,6 +13998,14 @@
                           <node concept="1nq8_$" id="6RzTUCTn5Xo" role="nsMwV">
                             <node concept="ns1u0" id="6RzTUCTn5Xp" role="1nq8_t">
                               <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
+                              <node concept="nsMwS" id="7kXqzcTBt1S" role="ns1xD">
+                                <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTBt20" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTBt1Z" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTBnyn" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -15580,6 +16035,14 @@
             <node concept="3xSepi" id="6tm4iVtQtlS" role="3xSepv">
               <node concept="3Aq9E8" id="6tm4iVtQtlT" role="3xSepj">
                 <node concept="3I6sU6" id="6tm4iVtQtlU" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7kXqzcTBtoo" role="3I6sU7">
+                    <node concept="3jm4v3" id="7kXqzcTBtom" role="3I6s78">
+                      <ref role="3jm46O" node="7kXqzcTAj1H" resolve="defaultConcept" />
+                      <node concept="a7P8L" id="7kXqzcTBtoD" role="3jm6SO">
+                        <ref role="a7OzE" node="7kXqzcTBtnm" resolve="Concept" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3I6s7M" id="6tm4iVtQtlV" role="3I6sU7">
                     <node concept="3Aqt3T" id="6tm4iVtQtlW" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -15590,12 +16053,28 @@
                       </node>
                       <node concept="ns1u0" id="6tm4iVtQtq7" role="3AunhB">
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="7kXqzcTBuA5" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="7kXqzcTBuAc" role="nsMwV">
+                            <node concept="a7P8L" id="7kXqzcTBuAb" role="1nq8_t">
+                              <ref role="a7OzE" node="7kXqzcTBtnm" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTBtnl" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTBtnm" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTBtnt" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -19586,6 +20065,28 @@
     <node concept="1nLNMY" id="3lXUvG09L9h" role="1nK1Vg">
       <property role="TrG5h" value="conceptNode_convertsTo_node" />
       <node concept="3clFbS" id="3lXUvG09L9i" role="1nLNMH">
+        <node concept="3SKdUt" id="32iFMN7seyn" role="3cqZAp">
+          <node concept="1PaTwC" id="32iFMN7seyo" role="1aUNEU">
+            <node concept="3oM_SD" id="32iFMN7sezU" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="32iFMN7sezW" role="1PaTwD">
+              <property role="3oM_SC" value="use" />
+            </node>
+            <node concept="3oM_SD" id="32iFMN7sezZ" role="1PaTwD">
+              <property role="3oM_SC" value="different" />
+            </node>
+            <node concept="3oM_SD" id="32iFMN7se$3" role="1PaTwD">
+              <property role="3oM_SC" value="flag" />
+            </node>
+            <node concept="3oM_SD" id="32iFMN7se$8" role="1PaTwD">
+              <property role="3oM_SC" value="than" />
+            </node>
+            <node concept="3oM_SD" id="32iFMN7se$e" role="1PaTwD">
+              <property role="3oM_SC" value="boxing" />
+            </node>
+          </node>
+        </node>
         <node concept="1nLNNL" id="3lXUvG09LRO" role="3cqZAp">
           <node concept="1nLNMm" id="3lXUvG09LRP" role="1nLNNK">
             <node concept="3Aq93q" id="3lXUvG09LTN" role="1nLNMb">
@@ -19689,6 +20190,123 @@
                 <property role="TrG5h" value="Options" />
               </node>
             </node>
+            <node concept="3Aq9_M" id="32iFMN7scs_" role="1nLNMa">
+              <node concept="3I6sU6" id="32iFMN7scsA" role="3Ip0Jz">
+                <node concept="3I6s7M" id="32iFMN7scsE" role="3I6sU7">
+                  <node concept="3wWvb2" id="32iFMN7scsD" role="3I6s78">
+                    <node concept="2OqwBi" id="32iFMN7scAH" role="3wWo3s">
+                      <node concept="1Ft4W6" id="32iFMN7scsI" role="2Oq$k0">
+                        <node concept="a7P8L" id="32iFMN7scsH" role="1FtiSR">
+                          <ref role="a7OzE" node="3OUB6BCUA9k" resolve="Options" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="32iFMN7sdOH" role="2OqNvi">
+                        <ref role="37wK5l" to="kqnc:1j7WR6S895X" resolve="isBoxingAllowed" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="32iFMN7sdUW" role="3cqZAp" />
+        <node concept="1nLNNL" id="32iFMN7sdRr" role="3cqZAp">
+          <node concept="1nLNMm" id="32iFMN7sdRs" role="1nLNNK">
+            <node concept="3Aq93q" id="32iFMN7sdRt" role="1nLNMb">
+              <node concept="3I6sU6" id="32iFMN7sdRu" role="3Ip0Jz">
+                <node concept="3I6s7M" id="32iFMN7sdRv" role="3I6sU7">
+                  <node concept="3Aqt3T" id="32iFMN7sdRw" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                    <node concept="1HFMs5" id="32iFMN7sdRx" role="3AunhB">
+                      <node concept="a7P8L" id="32iFMN7sdRy" role="1uarlU">
+                        <ref role="a7OzE" node="32iFMN7sdRG" resolve="Type" />
+                      </node>
+                      <node concept="ns1u0" id="32iFMN7sdRz" role="1uarlW">
+                        <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
+                        <node concept="nsMwS" id="32iFMN7sdR$" role="ns1xD">
+                          <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                          <node concept="1nq8_$" id="32iFMN7sdR_" role="nsMwV">
+                            <node concept="a7P8L" id="32iFMN7sdRA" role="1nq8_t">
+                              <ref role="a7OzE" node="32iFMN7sdRK" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="32iFMN7sdRB" role="3AunhB">
+                      <node concept="a7P8L" id="32iFMN7sdRC" role="1uarlU">
+                        <ref role="a7OzE" node="32iFMN7sdRH" resolve="SType" />
+                      </node>
+                      <node concept="ns1u0" id="32iFMN7sdRD" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="32iFMN7sdRE" role="3AunhB">
+                      <ref role="a7OzE" node="32iFMN7sdS4" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="32iFMN7sdRF" role="0Rg$4">
+              <node concept="aZer4" id="32iFMN7sdRG" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="aZer4" id="32iFMN7sdRH" role="3XD1gS">
+                <property role="TrG5h" value="SType" />
+              </node>
+              <node concept="32pEOW" id="32iFMN7sdRI" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="32iFMN7sdRJ" role="0Rg$4">
+              <node concept="aZer4" id="32iFMN7sdRK" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="aZer4" id="32iFMN7sdRL" role="3XD1gS">
+                <property role="TrG5h" value="CDecl" />
+              </node>
+              <node concept="3Tqbb2" id="32iFMN7sdRM" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="32iFMN7sdRN" role="3xSepv">
+              <node concept="3Aq9E8" id="32iFMN7sdWL" role="3xSepj">
+                <node concept="3I6sU6" id="32iFMN7sdWM" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="32iFMN7sdWR" role="3I6sU7">
+                    <node concept="1lpGmL" id="32iFMN7sdWP" role="3I6s78">
+                      <node concept="3cpWs3" id="32iFMN7seuh" role="1lp$hM">
+                        <node concept="1Ft4W6" id="32iFMN7sevf" role="3uHU7w">
+                          <node concept="a7P8L" id="32iFMN7seve" role="1FtiSR">
+                            <ref role="a7OzE" node="32iFMN7sdRH" resolve="SType" />
+                          </node>
+                        </node>
+                        <node concept="3cpWs3" id="32iFMN7sesb" role="3uHU7B">
+                          <node concept="3cpWs3" id="32iFMN7se8B" role="3uHU7B">
+                            <node concept="Xl_RD" id="32iFMN7sdWW" role="3uHU7B">
+                              <property role="Xl_RC" value="can't convert " />
+                            </node>
+                            <node concept="1Ft4W6" id="32iFMN7se8N" role="3uHU7w">
+                              <node concept="a7P8L" id="32iFMN7se8M" role="1FtiSR">
+                                <ref role="a7OzE" node="32iFMN7sdRG" resolve="Type" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="32iFMN7ses$" role="3uHU7w">
+                            <property role="Xl_RC" value=" to " />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="32iFMN7sdS2" role="0Rg$4">
+              <node concept="3uibUv" id="32iFMN7sdS3" role="3vLBG7">
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+              <node concept="aZer4" id="32iFMN7sdS4" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -19793,6 +20411,123 @@
                 <property role="TrG5h" value="Options" />
               </node>
             </node>
+            <node concept="3Aq9_M" id="32iFMN7seCs" role="1nLNMa">
+              <node concept="3I6sU6" id="32iFMN7seCt" role="3Ip0Jz">
+                <node concept="3I6s7M" id="32iFMN7seCx" role="3I6sU7">
+                  <node concept="3wWvb2" id="32iFMN7seCw" role="3I6s78">
+                    <node concept="2OqwBi" id="32iFMN7seCT" role="3wWo3s">
+                      <node concept="1Ft4W6" id="32iFMN7seC_" role="2Oq$k0">
+                        <node concept="a7P8L" id="32iFMN7seC$" role="1FtiSR">
+                          <ref role="a7OzE" node="32iFMN7agaC" resolve="Options" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="32iFMN7sffD" role="2OqNvi">
+                        <ref role="37wK5l" to="kqnc:1j7WR6S895X" resolve="isBoxingAllowed" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="32iFMN7seB8" role="3cqZAp" />
+        <node concept="1nLNNL" id="32iFMN7se$l" role="3cqZAp">
+          <node concept="1nLNMm" id="32iFMN7se$m" role="1nLNNK">
+            <node concept="3Aq93q" id="32iFMN7se$n" role="1nLNMb">
+              <node concept="3I6sU6" id="32iFMN7se$o" role="3Ip0Jz">
+                <node concept="3I6s7M" id="32iFMN7se$p" role="3I6sU7">
+                  <node concept="3Aqt3T" id="32iFMN7se$q" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                    <node concept="1HFMs5" id="32iFMN7se$r" role="3AunhB">
+                      <node concept="a7P8L" id="32iFMN7se$s" role="1uarlU">
+                        <ref role="a7OzE" node="32iFMN7se$A" resolve="Type" />
+                      </node>
+                      <node concept="ns1u0" id="32iFMN7se$t" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="32iFMN7se$u" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="1nq8_$" id="32iFMN7se$v" role="nsMwV">
+                            <node concept="a7P8L" id="32iFMN7se$w" role="1nq8_t">
+                              <ref role="a7OzE" node="32iFMN7se$E" resolve="Concept" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="32iFMN7se$x" role="3AunhB">
+                      <node concept="a7P8L" id="32iFMN7se$y" role="1uarlU">
+                        <ref role="a7OzE" node="32iFMN7se$B" resolve="SType" />
+                      </node>
+                      <node concept="ns1u0" id="32iFMN7se$z" role="1uarlW">
+                        <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="32iFMN7se$$" role="3AunhB">
+                      <ref role="a7OzE" node="32iFMN7se$W" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="32iFMN7se$_" role="0Rg$4">
+              <node concept="aZer4" id="32iFMN7se$A" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="aZer4" id="32iFMN7se$B" role="3XD1gS">
+                <property role="TrG5h" value="SType" />
+              </node>
+              <node concept="32pEOW" id="32iFMN7se$C" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="32iFMN7se$D" role="0Rg$4">
+              <node concept="aZer4" id="32iFMN7se$E" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="aZer4" id="32iFMN7se$F" role="3XD1gS">
+                <property role="TrG5h" value="CDecl" />
+              </node>
+              <node concept="3Tqbb2" id="32iFMN7se$G" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="32iFMN7se$H" role="3xSepv">
+              <node concept="3Aq9E8" id="32iFMN7se$I" role="3xSepj">
+                <node concept="3I6sU6" id="32iFMN7se$J" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="32iFMN7sffV" role="3I6sU7">
+                    <node concept="1lpGmL" id="32iFMN7sffW" role="3I6s78">
+                      <node concept="3cpWs3" id="32iFMN7sffX" role="1lp$hM">
+                        <node concept="1Ft4W6" id="32iFMN7sffY" role="3uHU7w">
+                          <node concept="a7P8L" id="32iFMN7sffZ" role="1FtiSR">
+                            <ref role="a7OzE" node="32iFMN7se$B" resolve="SType" />
+                          </node>
+                        </node>
+                        <node concept="3cpWs3" id="32iFMN7sfg0" role="3uHU7B">
+                          <node concept="3cpWs3" id="32iFMN7sfg1" role="3uHU7B">
+                            <node concept="Xl_RD" id="32iFMN7sfg2" role="3uHU7B">
+                              <property role="Xl_RC" value="can't convert " />
+                            </node>
+                            <node concept="1Ft4W6" id="32iFMN7sfg3" role="3uHU7w">
+                              <node concept="a7P8L" id="32iFMN7sfg4" role="1FtiSR">
+                                <ref role="a7OzE" node="32iFMN7se$A" resolve="Type" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="32iFMN7sfg5" role="3uHU7w">
+                            <property role="Xl_RC" value=" to " />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="32iFMN7se$U" role="0Rg$4">
+              <node concept="3uibUv" id="32iFMN7se$V" role="3vLBG7">
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+              <node concept="aZer4" id="32iFMN7se$W" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -19928,8 +20663,8 @@
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
                           <node concept="2OqwBi" id="5cBWTAdM$Qm" role="nsMwV">
                             <node concept="2c44tf" id="5cBWTAdM$Qn" role="2Oq$k0">
-                              <node concept="3uibUv" id="5cBWTAdM$Qo" role="2c44tc">
-                                <ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
+                              <node concept="3uibUv" id="32iFMN7k1yj" role="2c44tc">
+                                <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                               </node>
                             </node>
                             <node concept="3TrEf2" id="5cBWTAdM$Qp" role="2OqNvi">
@@ -20020,8 +20755,8 @@
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
                           <node concept="2OqwBi" id="2hQbw6I4E4$" role="nsMwV">
                             <node concept="2c44tf" id="2hQbw6I4E4_" role="2Oq$k0">
-                              <node concept="3uibUv" id="2hQbw6I4E4A" role="2c44tc">
-                                <ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
+                              <node concept="3uibUv" id="32iFMN7k1y6" role="2c44tc">
+                                <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                               </node>
                             </node>
                             <node concept="3TrEf2" id="2hQbw6I4E4B" role="2OqNvi">
@@ -21127,18 +21862,52 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3Aqczg" id="3GLv42Mz7jH" role="3cqZAp">
-                        <node concept="3Aqt3T" id="3GLv42Mz7jF" role="3Aqpz8">
-                          <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
-                          <node concept="a7P8L" id="3GLv42Mz7jO" role="3AunhB">
-                            <ref role="a7OzE" node="3GLv42MyHti" resolve="OpndType" />
+                      <node concept="3clFbJ" id="32iFMN7jv2Z" role="3cqZAp">
+                        <node concept="3clFbS" id="32iFMN7jv31" role="3clFbx">
+                          <node concept="3Aqczg" id="32iFMN7jvQM" role="3cqZAp">
+                            <node concept="3Aqt3T" id="32iFMN7jvQN" role="3Aqpz8">
+                              <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                              <node concept="a7P8L" id="32iFMN7jvQO" role="3AunhB">
+                                <ref role="a7OzE" node="3GLv42MyHti" resolve="OpndType" />
+                              </node>
+                              <node concept="ns1u0" id="32iFMN7jvQP" role="3AunhB">
+                                <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
+                                <node concept="nsMwS" id="32iFMN7jvQQ" role="ns1xD">
+                                  <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
+                                  <node concept="37vLTw" id="32iFMN7jvQR" role="nsMwV">
+                                    <ref role="3cqZAo" node="3GLv42Mz96R" resolve="cc" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
                           </node>
-                          <node concept="ns1u0" id="3GLv42Mz7jT" role="3AunhB">
-                            <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
-                            <node concept="nsMwS" id="3GLv42Mz7jW" role="ns1xD">
-                              <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                              <node concept="37vLTw" id="3GLv42Mz9bC" role="nsMwV">
-                                <ref role="3cqZAo" node="3GLv42Mz96R" resolve="cc" />
+                          <node concept="3clFbH" id="32iFMN7jv30" role="3cqZAp" />
+                        </node>
+                        <node concept="2OqwBi" id="32iFMN7jvdb" role="3clFbw">
+                          <node concept="37vLTw" id="32iFMN7jv3B" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3GLv42MyEnz" resolve="mdecl" />
+                          </node>
+                          <node concept="3TrcHB" id="32iFMN7jvQx" role="2OqNvi">
+                            <ref role="3TsBF5" to="1i04:55xfRZxar9d" resolve="isStatic" />
+                          </node>
+                        </node>
+                        <node concept="9aQIb" id="32iFMN7jvQI" role="9aQIa">
+                          <node concept="3clFbS" id="32iFMN7jvQJ" role="9aQI4">
+                            <node concept="3Aqczg" id="3GLv42Mz7jH" role="3cqZAp">
+                              <node concept="3Aqt3T" id="3GLv42Mz7jF" role="3Aqpz8">
+                                <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                                <node concept="a7P8L" id="3GLv42Mz7jO" role="3AunhB">
+                                  <ref role="a7OzE" node="3GLv42MyHti" resolve="OpndType" />
+                                </node>
+                                <node concept="ns1u0" id="3GLv42Mz7jT" role="3AunhB">
+                                  <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                                  <node concept="nsMwS" id="3GLv42Mz7jW" role="ns1xD">
+                                    <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                                    <node concept="37vLTw" id="3GLv42Mz9bC" role="nsMwV">
+                                      <ref role="3cqZAo" node="3GLv42Mz96R" resolve="cc" />
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
index caa37c3a..8378978c 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
@@ -4155,6 +4155,14 @@
                           <node concept="1nq8_$" id="5zhVuyL9tJu" role="nsMwV">
                             <node concept="ns1u0" id="5zhVuyL9tJt" role="1nq8_t">
                               <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
+                              <node concept="nsMwS" id="7kXqzcTBGBA" role="ns1xD">
+                                <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
+                                <node concept="1nq8_$" id="7kXqzcTBGBI" role="nsMwV">
+                                  <node concept="a7P8L" id="7kXqzcTBGBH" role="1nq8_t">
+                                    <ref role="a7OzE" node="7kXqzcTBFOa" resolve="Concept" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -4164,6 +4172,14 @@
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="7kXqzcTBFO9" role="0Rg$4">
+              <node concept="aZer4" id="7kXqzcTBFOa" role="3XD1gS">
+                <property role="TrG5h" value="Concept" />
+              </node>
+              <node concept="3Tqbb2" id="7kXqzcTBFOh" role="3vLBG7">
+                <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+              </node>
+            </node>
           </node>
         </node>
       </node>