diff --git a/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps b/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
index 4cfda34246fbfc78af15a55426fe2a77701f148b..04d3e2f1c7594145a9a8e0c1fa57c9aab1f957b9 100644
--- a/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
+++ b/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
@@ -124,6 +124,9 @@
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -347,6 +350,7 @@
       </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
+      <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -5411,5 +5415,1000 @@
     </node>
     <node concept="3Tm1VV" id="7DdCaEOHNmi" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="32CDcOyEa0d">
+    <property role="TrG5h" value="ProjectContext" />
+    <node concept="312cEg" id="32CDcOyElA0" role="jymVt">
+      <property role="TrG5h" value="model" />
+      <node concept="3Tm6S6" id="32CDcOyEl_x" role="1B3o_S" />
+      <node concept="H_c77" id="32CDcOyEl_S" role="1tU5fm" />
+      <node concept="10Nm6u" id="32CDcOyElAK" role="33vP2m" />
+    </node>
+    <node concept="3clFbW" id="32CDcOyElBr" role="jymVt">
+      <node concept="3cqZAl" id="32CDcOyElBt" role="3clF45" />
+      <node concept="3Tm1VV" id="32CDcOyElBu" role="1B3o_S" />
+      <node concept="3clFbS" id="32CDcOyElBv" role="3clF47">
+        <node concept="3clFbF" id="32CDcOyElCJ" role="3cqZAp">
+          <node concept="37vLTI" id="32CDcOyEmaf" role="3clFbG">
+            <node concept="37vLTw" id="32CDcOyEmdq" role="37vLTx">
+              <ref role="3cqZAo" node="32CDcOyElC8" resolve="model" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOyElIb" role="37vLTJ">
+              <node concept="Xjq3P" id="32CDcOyElCI" role="2Oq$k0" />
+              <node concept="2OwXpG" id="32CDcOyElUU" role="2OqNvi">
+                <ref role="2Oxat5" node="32CDcOyElA0" resolve="model" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="32CDcOyElC8" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="32CDcOyElC7" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="32CDcOyTSWJ" role="jymVt" />
+    <node concept="3clFb_" id="32CDcOyUlT4" role="jymVt">
+      <property role="TrG5h" value="hasLookupDeclaration" />
+      <node concept="3clFbS" id="32CDcOyUlT7" role="3clF47">
+        <node concept="3cpWs6" id="32CDcOyUmH6" role="3cqZAp">
+          <node concept="3y3z36" id="32CDcOyUnsD" role="3cqZAk">
+            <node concept="10Nm6u" id="32CDcOyUnJa" role="3uHU7w" />
+            <node concept="1rXfSq" id="32CDcOyUmZm" role="3uHU7B">
+              <ref role="37wK5l" node="32CDcOyTUll" resolve="getLookupDeclaration" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyUlwx" role="1B3o_S" />
+      <node concept="10P_77" id="32CDcOyUlSm" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="32CDcOyUo1j" role="jymVt" />
+    <node concept="3clFb_" id="32CDcOyTUll" role="jymVt">
+      <property role="TrG5h" value="getLookupDeclaration" />
+      <node concept="3clFbS" id="32CDcOyTUlo" role="3clF47">
+        <node concept="3cpWs6" id="32CDcOyUkBC" role="3cqZAp">
+          <node concept="2OqwBi" id="32CDcOyUkBD" role="3cqZAk">
+            <node concept="2OqwBi" id="32CDcOyUkBE" role="2Oq$k0">
+              <node concept="37vLTw" id="32CDcOyUkBF" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyElA0" resolve="model" />
+              </node>
+              <node concept="2SmgA7" id="32CDcOyUkBG" role="2OqNvi">
+                <node concept="chp4Y" id="32CDcOyUkBH" role="1dBWTz">
+                  <ref role="cht4Q" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+                </node>
+              </node>
+            </node>
+            <node concept="1z4cxt" id="32CDcOyUkBI" role="2OqNvi">
+              <node concept="1bVj0M" id="32CDcOyUkBJ" role="23t8la">
+                <node concept="3clFbS" id="32CDcOyUkBK" role="1bW5cS">
+                  <node concept="3clFbF" id="32CDcOyUkBL" role="3cqZAp">
+                    <node concept="2OqwBi" id="32CDcOyUkBM" role="3clFbG">
+                      <node concept="2OqwBi" id="32CDcOyUkBN" role="2Oq$k0">
+                        <node concept="37vLTw" id="32CDcOyUkBO" role="2Oq$k0">
+                          <ref role="3cqZAo" node="32CDcOyUkBS" resolve="it" />
+                        </node>
+                        <node concept="3TrcHB" id="32CDcOyUkBP" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="32CDcOyUkBQ" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                        <node concept="Xl_RD" id="32CDcOyUkBR" role="37wK5m">
+                          <property role="Xl_RC" value="lookup" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="32CDcOyUkBS" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="32CDcOyUkBT" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyTTZb" role="1B3o_S" />
+      <node concept="3Tqbb2" id="32CDcOyTUjh" role="3clF45">
+        <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="32CDcOyUkL1" role="jymVt" />
+    <node concept="3clFb_" id="32CDcOyElzM" role="jymVt">
+      <property role="TrG5h" value="getDeclarationsWithContextInput" />
+      <node concept="3clFbS" id="32CDcOyElzP" role="3clF47">
+        <node concept="3cpWs8" id="7DdCaEODx8a" role="3cqZAp">
+          <node concept="3cpWsn" id="7DdCaEODx8d" role="3cpWs9">
+            <property role="TrG5h" value="decls" />
+            <node concept="2I9FWS" id="7DdCaEODx89" role="1tU5fm">
+              <ref role="2I9WkF" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="7DdCaEODxhm" role="33vP2m">
+              <node concept="37vLTw" id="32CDcOyEmAA" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyElA0" resolve="model" />
+              </node>
+              <node concept="2SmgA7" id="7DdCaEODxx3" role="2OqNvi">
+                <node concept="chp4Y" id="7DdCaEODxG6" role="1dBWTz">
+                  <ref role="cht4Q" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7DdCaEOEkrM" role="3cqZAp">
+          <node concept="3cpWsn" id="7DdCaEOEkrN" role="3cpWs9">
+            <property role="TrG5h" value="declsWithContext" />
+            <node concept="2OqwBi" id="7DdCaEOEkXf" role="33vP2m">
+              <node concept="2OqwBi" id="7DdCaEOEkrO" role="2Oq$k0">
+                <node concept="37vLTw" id="7DdCaEOEkrP" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7DdCaEODx8d" resolve="decls" />
+                </node>
+                <node concept="3zZkjj" id="7DdCaEOEkrQ" role="2OqNvi">
+                  <node concept="1bVj0M" id="7DdCaEOEkrR" role="23t8la">
+                    <node concept="3clFbS" id="7DdCaEOEkrS" role="1bW5cS">
+                      <node concept="3clFbF" id="7DdCaEOEkrT" role="3cqZAp">
+                        <node concept="3y3z36" id="7DdCaEOEkrV" role="3clFbG">
+                          <node concept="10Nm6u" id="7DdCaEOEkrW" role="3uHU7w" />
+                          <node concept="2OqwBi" id="7DdCaEOEkrX" role="3uHU7B">
+                            <node concept="37vLTw" id="7DdCaEOEkrY" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7DdCaEOEks8" resolve="it" />
+                            </node>
+                            <node concept="2qgKlT" id="7DdCaEOEkrZ" role="2OqNvi">
+                              <ref role="37wK5l" to="pgas:7DdCaEODOqJ" resolve="getInfiniteInputSortByName" />
+                              <node concept="Xl_RD" id="7DdCaEOEks0" role="37wK5m">
+                                <property role="Xl_RC" value="Context" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="7DdCaEOEks8" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="7DdCaEOEks9" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="ANE8D" id="7DdCaEOElh$" role="2OqNvi" />
+            </node>
+            <node concept="2I9FWS" id="7DdCaEOEkH3" role="1tU5fm">
+              <ref role="2I9WkF" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="32CDcOyEmWm" role="3cqZAp">
+          <node concept="37vLTw" id="32CDcOyEni_" role="3cqZAk">
+            <ref role="3cqZAo" node="7DdCaEOEkrN" resolve="declsWithContext" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyElzn" role="1B3o_S" />
+      <node concept="2I9FWS" id="32CDcOyElz_" role="3clF45">
+        <ref role="2I9WkF" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="32CDcOyEonu" role="jymVt" />
+    <node concept="3clFb_" id="32CDcOyEp1G" role="jymVt">
+      <property role="TrG5h" value="getDeclarationsWithContextInputNoLookup" />
+      <node concept="3clFbS" id="32CDcOyEp1J" role="3clF47">
+        <node concept="3cpWs6" id="32CDcOyE$8U" role="3cqZAp">
+          <node concept="2OqwBi" id="32CDcOyE$Ix" role="3cqZAk">
+            <node concept="2OqwBi" id="32CDcOyEqKu" role="2Oq$k0">
+              <node concept="1rXfSq" id="32CDcOyEpd7" role="2Oq$k0">
+                <ref role="37wK5l" node="32CDcOyElzM" resolve="getDeclarationsWithContextInput" />
+              </node>
+              <node concept="3zZkjj" id="32CDcOyEukz" role="2OqNvi">
+                <node concept="1bVj0M" id="32CDcOyEuk_" role="23t8la">
+                  <node concept="3clFbS" id="32CDcOyEukA" role="1bW5cS">
+                    <node concept="3clFbF" id="32CDcOyEur8" role="3cqZAp">
+                      <node concept="3fqX7Q" id="32CDcOyEzVg" role="3clFbG">
+                        <node concept="2OqwBi" id="32CDcOyEzVi" role="3fr31v">
+                          <node concept="2OqwBi" id="32CDcOyEzVj" role="2Oq$k0">
+                            <node concept="37vLTw" id="32CDcOyEzVk" role="2Oq$k0">
+                              <ref role="3cqZAo" node="32CDcOyEukB" resolve="it" />
+                            </node>
+                            <node concept="3TrcHB" id="32CDcOyEzVl" role="2OqNvi">
+                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="32CDcOyEzVm" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                            <node concept="Xl_RD" id="32CDcOyEzVn" role="37wK5m">
+                              <property role="Xl_RC" value="lookup" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="32CDcOyEukB" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="32CDcOyEukC" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="32CDcOyEJwe" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyEoHe" role="1B3o_S" />
+      <node concept="2I9FWS" id="32CDcOyEoSb" role="3clF45">
+        <ref role="2I9WkF" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="32CDcOyEJId" role="jymVt" />
+    <node concept="3clFb_" id="32CDcOyEKvA" role="jymVt">
+      <property role="TrG5h" value="eliminateContextInput" />
+      <node concept="3clFbS" id="32CDcOyEKvD" role="3clF47">
+        <node concept="3cpWs8" id="32CDcOyEN4v" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyEN4w" role="3cpWs9">
+            <property role="TrG5h" value="contextSort" />
+            <node concept="3Tqbb2" id="32CDcOyEN4s" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOyEN4x" role="33vP2m">
+              <node concept="37vLTw" id="32CDcOyEN4y" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyEM4j" resolve="declaration" />
+              </node>
+              <node concept="2qgKlT" id="32CDcOyEN4z" role="2OqNvi">
+                <ref role="37wK5l" to="pgas:7DdCaEODOqJ" resolve="getInfiniteInputSortByName" />
+                <node concept="Xl_RD" id="32CDcOyEN4$" role="37wK5m">
+                  <property role="Xl_RC" value="Context" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOyER86" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyER87" role="3cpWs9">
+            <property role="TrG5h" value="contexIndex" />
+            <node concept="10Oyi0" id="32CDcOyER82" role="1tU5fm" />
+            <node concept="2OqwBi" id="32CDcOyER88" role="33vP2m">
+              <node concept="2OqwBi" id="32CDcOyER89" role="2Oq$k0">
+                <node concept="37vLTw" id="32CDcOyER8a" role="2Oq$k0">
+                  <ref role="3cqZAo" node="32CDcOyEM4j" resolve="declaration" />
+                </node>
+                <node concept="2qgKlT" id="32CDcOyER8b" role="2OqNvi">
+                  <ref role="37wK5l" to="pgas:4XA4NEmGQRd" resolve="getSorts" />
+                </node>
+              </node>
+              <node concept="2WmjW8" id="32CDcOyER8c" role="2OqNvi">
+                <node concept="37vLTw" id="32CDcOyER8d" role="25WWJ7">
+                  <ref role="3cqZAo" node="32CDcOyEN4w" resolve="contextSort" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOyETCb" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyETCc" role="3cpWs9">
+            <property role="TrG5h" value="lookupNoContextDeclaration" />
+            <node concept="3Tqbb2" id="32CDcOyETC7" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOyEY4t" role="33vP2m">
+              <node concept="2OqwBi" id="32CDcOyETCd" role="2Oq$k0">
+                <node concept="37vLTw" id="32CDcOyETCe" role="2Oq$k0">
+                  <ref role="3cqZAo" node="32CDcOyEM4j" resolve="declaration" />
+                </node>
+                <node concept="2qgKlT" id="32CDcOyETCf" role="2OqNvi">
+                  <ref role="37wK5l" to="pgas:4XA4NEmJ4Wv" resolve="removeSort" />
+                  <node concept="37vLTw" id="32CDcOyEUnr" role="37wK5m">
+                    <ref role="3cqZAo" node="32CDcOyER87" resolve="contexIndex" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1$rogu" id="32CDcOyF18K" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="32CDcOyES2n" role="3cqZAp">
+          <node concept="37vLTI" id="32CDcOyF59s" role="3clFbG">
+            <node concept="2OqwBi" id="32CDcOyF5Eq" role="37vLTx">
+              <node concept="37vLTw" id="32CDcOyF5mm" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyEM4j" resolve="declaration" />
+              </node>
+              <node concept="3TrcHB" id="32CDcOyF63z" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="32CDcOyEUB6" role="37vLTJ">
+              <node concept="37vLTw" id="32CDcOyETCg" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyETCc" resolve="lookupNoContextDeclaration" />
+              </node>
+              <node concept="3TrcHB" id="32CDcOyEXKt" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="32CDcOyF9oy" role="3cqZAp">
+          <node concept="37vLTw" id="32CDcOyF9_h" role="3cqZAk">
+            <ref role="3cqZAo" node="32CDcOyETCc" resolve="lookupNoContextDeclaration" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyEKeJ" role="1B3o_S" />
+      <node concept="3Tqbb2" id="32CDcOyEKv5" role="3clF45">
+        <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+      </node>
+      <node concept="37vLTG" id="32CDcOyEM4j" role="3clF46">
+        <property role="TrG5h" value="declaration" />
+        <node concept="3Tqbb2" id="32CDcOyEM4i" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="32CDcOyF9Ua" role="jymVt" />
+    <node concept="3clFb_" id="32CDcOyFaKP" role="jymVt">
+      <property role="TrG5h" value="createContextProjectionDeclaration" />
+      <node concept="3clFbS" id="32CDcOyFaKS" role="3clF47">
+        <node concept="3clFbH" id="32CDcOyFdhj" role="3cqZAp" />
+        <node concept="3cpWs8" id="32CDcOyFga6" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyFga7" role="3cpWs9">
+            <property role="TrG5h" value="contextSort" />
+            <node concept="3Tqbb2" id="32CDcOyFga3" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOyFiNe" role="33vP2m">
+              <node concept="2OqwBi" id="32CDcOyFga8" role="2Oq$k0">
+                <node concept="37vLTw" id="32CDcOyFga9" role="2Oq$k0">
+                  <ref role="3cqZAo" node="32CDcOyFcxx" resolve="declarationWithContext" />
+                </node>
+                <node concept="2qgKlT" id="32CDcOyFgaa" role="2OqNvi">
+                  <ref role="37wK5l" to="pgas:32CDcOyZDFP" resolve="getSortByName" />
+                  <node concept="Xl_RD" id="32CDcOyFgab" role="37wK5m">
+                    <property role="Xl_RC" value="Context" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1$rogu" id="32CDcOyFjC9" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="32CDcOyFkxl" role="3cqZAp">
+          <node concept="37vLTI" id="32CDcOyFnP4" role="3clFbG">
+            <node concept="2pJPEk" id="32CDcOyFnY4" role="37vLTx">
+              <node concept="2pJPED" id="32CDcOyFo3F" role="2pJPEn">
+                <ref role="2pJxaS" to="b83y:2_58u12cYDp" resolve="SortOutputMode" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="32CDcOyFkMU" role="37vLTJ">
+              <node concept="37vLTw" id="32CDcOyFkxj" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyFga7" resolve="contextSort" />
+              </node>
+              <node concept="3TrEf2" id="32CDcOyFmjT" role="2OqNvi">
+                <ref role="3Tt5mk" to="b83y:2_58u12cYDi" resolve="mode" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOyFgLS" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyFgLT" role="3cpWs9">
+            <property role="TrG5h" value="termSort" />
+            <node concept="3Tqbb2" id="32CDcOyFgLP" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOyFhJX" role="33vP2m">
+              <node concept="2OqwBi" id="32CDcOyFgLU" role="2Oq$k0">
+                <node concept="37vLTw" id="32CDcOyFgLV" role="2Oq$k0">
+                  <ref role="3cqZAo" node="32CDcOyFcxx" resolve="declarationWithContext" />
+                </node>
+                <node concept="2qgKlT" id="32CDcOyFgLW" role="2OqNvi">
+                  <ref role="37wK5l" to="pgas:32CDcOyZDFP" resolve="getSortByName" />
+                  <node concept="Xl_RD" id="32CDcOyFgLX" role="37wK5m">
+                    <property role="Xl_RC" value="Term" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1$rogu" id="32CDcOyFi$S" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOyFb3z" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyFb3A" role="3cpWs9">
+            <property role="TrG5h" value="contextProjectionDeclaration" />
+            <node concept="3Tqbb2" id="32CDcOyFb5K" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            </node>
+            <node concept="2pJPEk" id="32CDcOyFb75" role="33vP2m">
+              <node concept="2pJPED" id="32CDcOyFb93" role="2pJPEn">
+                <ref role="2pJxaS" to="b83y:2_58u12eLE0" resolve="JudgmentDeclaration2" />
+                <node concept="2pJxcG" id="32CDcOyFbd1" role="2pJxcM">
+                  <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
+                  <node concept="Xl_RD" id="32CDcOyFbfh" role="2pJxcZ">
+                    <property role="Xl_RC" value="context" />
+                  </node>
+                </node>
+                <node concept="2pIpSj" id="32CDcOyFbfK" role="2pJxcM">
+                  <ref role="2pIpSl" to="b83y:2_58u12eLE1" resolve="pre" />
+                  <node concept="2pJPED" id="32CDcOyFbhf" role="2pJxcZ">
+                    <ref role="2pJxaS" to="b83y:2_58u12cYDt" resolve="Delimiter" />
+                    <node concept="2pJxcG" id="32CDcOyFbhu" role="2pJxcM">
+                      <ref role="2pJxcJ" to="b83y:2_58u12cYDu" resolve="text" />
+                      <node concept="Xl_RD" id="32CDcOyFbhX" role="2pJxcZ">
+                        <property role="Xl_RC" value="context" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2pIpSj" id="32CDcOyFbka" role="2pJxcM">
+                  <ref role="2pIpSl" to="b83y:2_58u12eLZs" resolve="delimiter1" />
+                  <node concept="2pJPED" id="32CDcOyFblL" role="2pJxcZ">
+                    <ref role="2pJxaS" to="b83y:2_58u12cYDt" resolve="Delimiter" />
+                    <node concept="2pJxcG" id="32CDcOyFbm0" role="2pJxcM">
+                      <ref role="2pJxcJ" to="b83y:2_58u12cYDu" resolve="text" />
+                      <node concept="Xl_RD" id="32CDcOyFbmv" role="2pJxcZ">
+                        <property role="Xl_RC" value="=&gt;" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2pIpSj" id="32CDcOyFboo" role="2pJxcM">
+                  <ref role="2pIpSl" to="b83y:2_58u12eLE2" resolve="sort1" />
+                  <node concept="36biLy" id="32CDcOyFo6R" role="2pJxcZ">
+                    <node concept="37vLTw" id="32CDcOyFo7E" role="36biLW">
+                      <ref role="3cqZAo" node="32CDcOyFgLT" resolve="termSort" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2pIpSj" id="32CDcOyFbrN" role="2pJxcM">
+                  <ref role="2pIpSl" to="b83y:2_58u12eLZ_" resolve="delimiter2" />
+                  <node concept="2pJPED" id="32CDcOyFbtA" role="2pJxcZ">
+                    <ref role="2pJxaS" to="b83y:2_58u12cYDt" resolve="Delimiter" />
+                    <node concept="2pJxcG" id="32CDcOyFbtP" role="2pJxcM">
+                      <ref role="2pJxcJ" to="b83y:2_58u12cYDu" resolve="text" />
+                      <node concept="Xl_RD" id="32CDcOyFbv3" role="2pJxcZ" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2pIpSj" id="32CDcOyFbxm" role="2pJxcM">
+                  <ref role="2pIpSl" to="b83y:2_58u12eLE4" resolve="sort2" />
+                  <node concept="36biLy" id="32CDcOyFo87" role="2pJxcZ">
+                    <node concept="37vLTw" id="32CDcOyFo8G" role="36biLW">
+                      <ref role="3cqZAo" node="32CDcOyFga7" resolve="contextSort" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="32CDcOyFb$o" role="3cqZAp">
+          <node concept="37vLTw" id="32CDcOyFbOj" role="3cqZAk">
+            <ref role="3cqZAo" node="32CDcOyFb3A" resolve="contextProjectionDeclaration" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyFatW" role="1B3o_S" />
+      <node concept="3Tqbb2" id="32CDcOyFaJU" role="3clF45">
+        <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+      </node>
+      <node concept="37vLTG" id="32CDcOyFcxx" role="3clF46">
+        <property role="TrG5h" value="declarationWithContext" />
+        <node concept="3Tqbb2" id="32CDcOyFcxw" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="32CDcOyEntq" role="jymVt" />
+    <node concept="3clFb_" id="32CDcOz3Fzl" role="jymVt">
+      <property role="TrG5h" value="createLookupNoContextDeclaration" />
+      <node concept="3clFbS" id="32CDcOz3Fzo" role="3clF47">
+        <node concept="3cpWs8" id="32CDcOz3GbD" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOz3GbE" role="3cpWs9">
+            <property role="TrG5h" value="lookupDeclaration" />
+            <node concept="3Tqbb2" id="32CDcOz3GbC" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12eLEb" resolve="JudgmentDeclaration3" />
+            </node>
+            <node concept="1PxgMI" id="32CDcOz3Kx_" role="33vP2m">
+              <node concept="chp4Y" id="32CDcOz3KEU" role="3oSUPX">
+                <ref role="cht4Q" to="b83y:2_58u12eLEb" resolve="JudgmentDeclaration3" />
+              </node>
+              <node concept="1rXfSq" id="32CDcOz3GbF" role="1m5AlR">
+                <ref role="37wK5l" node="32CDcOyTUll" resolve="getLookupDeclaration" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOz4ecA" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOz4ecB" role="3cpWs9">
+            <property role="TrG5h" value="contexIndex" />
+            <node concept="10Oyi0" id="32CDcOz4ecx" role="1tU5fm" />
+            <node concept="2OqwBi" id="32CDcOz4ecC" role="33vP2m">
+              <node concept="37vLTw" id="32CDcOz4ecD" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOz3GbE" resolve="lookupDeclaration" />
+              </node>
+              <node concept="2qgKlT" id="32CDcOz4ecE" role="2OqNvi">
+                <ref role="37wK5l" to="pgas:32CDcOz44ei" resolve="getIndexOfSortByName" />
+                <node concept="Xl_RD" id="32CDcOz4ecF" role="37wK5m">
+                  <property role="Xl_RC" value="Context" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOz4fBn" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOz4fBo" role="3cpWs9">
+            <property role="TrG5h" value="lookupNoContextDeclaration" />
+            <node concept="3Tqbb2" id="32CDcOz4fBh" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOz4fBp" role="33vP2m">
+              <node concept="37vLTw" id="32CDcOz4fBq" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOz3GbE" resolve="lookupDeclaration" />
+              </node>
+              <node concept="2qgKlT" id="32CDcOz4fBr" role="2OqNvi">
+                <ref role="37wK5l" to="pgas:4XA4NEmJ4Wv" resolve="removeSort" />
+                <node concept="37vLTw" id="32CDcOz4hUj" role="37wK5m">
+                  <ref role="3cqZAo" node="32CDcOz4ecB" resolve="contexIndex" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="32CDcOz5JUS" role="3cqZAp">
+          <node concept="37vLTI" id="32CDcOz5Sk4" role="3clFbG">
+            <node concept="3cpWs3" id="32CDcOz5XJn" role="37vLTx">
+              <node concept="Xl_RD" id="32CDcOz5XOO" role="3uHU7w">
+                <property role="Xl_RC" value="_noctx" />
+              </node>
+              <node concept="2OqwBi" id="32CDcOz5SXz" role="3uHU7B">
+                <node concept="37vLTw" id="32CDcOz5SJh" role="2Oq$k0">
+                  <ref role="3cqZAo" node="32CDcOz3GbE" resolve="lookupDeclaration" />
+                </node>
+                <node concept="3TrcHB" id="32CDcOz5Vb_" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="32CDcOz5Kgp" role="37vLTJ">
+              <node concept="37vLTw" id="32CDcOz5JUQ" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOz4fBo" resolve="lookupNoContextDeclaration" />
+              </node>
+              <node concept="3TrcHB" id="32CDcOz5OjQ" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="32CDcOz3OPP" role="3cqZAp">
+          <node concept="37vLTw" id="32CDcOz4h7P" role="3cqZAk">
+            <ref role="3cqZAo" node="32CDcOz4fBo" resolve="lookupNoContextDeclaration" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOz3F96" role="1B3o_S" />
+      <node concept="3Tqbb2" id="32CDcOz3FxK" role="3clF45">
+        <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="32CDcOyEa0e" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="32CDcOyGKwu">
+    <property role="TrG5h" value="TypeLangModelQuerier" />
+    <node concept="3Tm1VV" id="32CDcOyGKwv" role="1B3o_S" />
+    <node concept="2YIFZL" id="32CDcOyHqJ8" role="jymVt">
+      <property role="TrG5h" value="getInstancesOfDeclaration" />
+      <node concept="3clFbS" id="32CDcOyHqJa" role="3clF47">
+        <node concept="3cpWs6" id="32CDcOyHqJb" role="3cqZAp">
+          <node concept="2OqwBi" id="32CDcOyHqJc" role="3cqZAk">
+            <node concept="2OqwBi" id="32CDcOyHqJd" role="2Oq$k0">
+              <node concept="2OqwBi" id="32CDcOyHqJe" role="2Oq$k0">
+                <node concept="37vLTw" id="32CDcOyHrnn" role="2Oq$k0">
+                  <ref role="3cqZAo" node="32CDcOyHrb2" resolve="model" />
+                </node>
+                <node concept="2SmgA7" id="32CDcOyHqJg" role="2OqNvi">
+                  <node concept="chp4Y" id="32CDcOyHqJh" role="1dBWTz">
+                    <ref role="cht4Q" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3zZkjj" id="32CDcOyHqJi" role="2OqNvi">
+                <node concept="1bVj0M" id="32CDcOyHqJj" role="23t8la">
+                  <node concept="3clFbS" id="32CDcOyHqJk" role="1bW5cS">
+                    <node concept="3clFbF" id="32CDcOyHqJl" role="3cqZAp">
+                      <node concept="3clFbC" id="32CDcOyHqJm" role="3clFbG">
+                        <node concept="37vLTw" id="32CDcOyHqJn" role="3uHU7w">
+                          <ref role="3cqZAo" node="32CDcOyHqJw" resolve="declaration" />
+                        </node>
+                        <node concept="2OqwBi" id="32CDcOyHqJo" role="3uHU7B">
+                          <node concept="37vLTw" id="32CDcOyHqJp" role="2Oq$k0">
+                            <ref role="3cqZAo" node="32CDcOyHqJr" resolve="it" />
+                          </node>
+                          <node concept="2qgKlT" id="32CDcOyHqJq" role="2OqNvi">
+                            <ref role="37wK5l" to="pgas:iMPJyMM1Nb" resolve="getJudgment" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="32CDcOyHqJr" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="32CDcOyHqJs" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="32CDcOyHqJt" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="2I9FWS" id="32CDcOyHqJv" role="3clF45">
+        <ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
+      </node>
+      <node concept="37vLTG" id="32CDcOyHrb2" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="32CDcOyHrm$" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="32CDcOyHqJw" role="3clF46">
+        <property role="TrG5h" value="declaration" />
+        <node concept="3Tqbb2" id="32CDcOyHqJx" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyHqJu" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="32CDcOyI4Xk" role="jymVt" />
+    <node concept="2YIFZL" id="32CDcOyXAwO" role="jymVt">
+      <property role="TrG5h" value="getDeclarationWithTermAndContext" />
+      <node concept="3clFbS" id="32CDcOyXAwR" role="3clF47">
+        <node concept="3clFbF" id="32CDcOyXAKg" role="3cqZAp">
+          <node concept="2OqwBi" id="32CDcOyXJl2" role="3clFbG">
+            <node concept="2OqwBi" id="32CDcOz7u5E" role="2Oq$k0">
+              <node concept="2OqwBi" id="32CDcOyXDuK" role="2Oq$k0">
+                <node concept="2OqwBi" id="32CDcOyXAT2" role="2Oq$k0">
+                  <node concept="37vLTw" id="32CDcOyXAKf" role="2Oq$k0">
+                    <ref role="3cqZAo" node="32CDcOyXADo" resolve="model" />
+                  </node>
+                  <node concept="2SmgA7" id="32CDcOyXAZQ" role="2OqNvi">
+                    <node concept="chp4Y" id="32CDcOyXBlr" role="1dBWTz">
+                      <ref role="cht4Q" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3zZkjj" id="32CDcOyXG7Y" role="2OqNvi">
+                  <node concept="1bVj0M" id="32CDcOyXG80" role="23t8la">
+                    <node concept="3clFbS" id="32CDcOyXG81" role="1bW5cS">
+                      <node concept="3clFbF" id="32CDcOyXGft" role="3cqZAp">
+                        <node concept="1Wc70l" id="32CDcOyXH$z" role="3clFbG">
+                          <node concept="3y3z36" id="32CDcOyXYEX" role="3uHU7w">
+                            <node concept="10Nm6u" id="32CDcOyXYPl" role="3uHU7w" />
+                            <node concept="2OqwBi" id="32CDcOyXI3X" role="3uHU7B">
+                              <node concept="37vLTw" id="32CDcOyXHMa" role="2Oq$k0">
+                                <ref role="3cqZAo" node="32CDcOyXG82" resolve="it" />
+                              </node>
+                              <node concept="2qgKlT" id="32CDcOyXIsM" role="2OqNvi">
+                                <ref role="37wK5l" to="pgas:32CDcOyZDFP" resolve="getSortByName" />
+                                <node concept="Xl_RD" id="32CDcOyXIEf" role="37wK5m">
+                                  <property role="Xl_RC" value="Context" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3y3z36" id="32CDcOyXYdU" role="3uHU7B">
+                            <node concept="10Nm6u" id="32CDcOyXYpR" role="3uHU7w" />
+                            <node concept="2OqwBi" id="32CDcOyXGxq" role="3uHU7B">
+                              <node concept="37vLTw" id="32CDcOyXGfs" role="2Oq$k0">
+                                <ref role="3cqZAo" node="32CDcOyXG82" resolve="it" />
+                              </node>
+                              <node concept="2qgKlT" id="32CDcOyXGNc" role="2OqNvi">
+                                <ref role="37wK5l" to="pgas:32CDcOyZDFP" resolve="getSortByName" />
+                                <node concept="Xl_RD" id="32CDcOyXH1z" role="37wK5m">
+                                  <property role="Xl_RC" value="Term" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="32CDcOyXG82" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="32CDcOyXG83" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="ANE8D" id="32CDcOz7BX0" role="2OqNvi" />
+            </node>
+            <node concept="1yVyf7" id="32CDcOyYkoL" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyXAkz" role="1B3o_S" />
+      <node concept="3Tqbb2" id="32CDcOyXAt7" role="3clF45">
+        <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+      </node>
+      <node concept="37vLTG" id="32CDcOyXADo" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="32CDcOyXADn" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="32CDcOyZBoZ" role="jymVt" />
+    <node concept="2YIFZL" id="32CDcOyHSfC" role="jymVt">
+      <property role="TrG5h" value="replaceInstancesOfDeclaration" />
+      <node concept="3clFbS" id="32CDcOyHSfF" role="3clF47">
+        <node concept="3cpWs8" id="32CDcOyHWw$" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyHWw_" role="3cpWs9">
+            <property role="TrG5h" value="instancesOfDeclaration" />
+            <node concept="2I9FWS" id="32CDcOyHWwz" role="1tU5fm">
+              <ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
+            </node>
+            <node concept="1rXfSq" id="32CDcOyHWwA" role="33vP2m">
+              <ref role="37wK5l" node="32CDcOyHqJ8" resolve="getInstancesOfDeclaration" />
+              <node concept="37vLTw" id="32CDcOyHWwB" role="37wK5m">
+                <ref role="3cqZAo" node="32CDcOyHTUd" resolve="model" />
+              </node>
+              <node concept="37vLTw" id="32CDcOyHWwC" role="37wK5m">
+                <ref role="3cqZAo" node="32CDcOyHU2c" resolve="oldDecl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="32CDcOyI7HG" role="3cqZAp">
+          <node concept="2OqwBi" id="32CDcOyI9bN" role="3clFbG">
+            <node concept="37vLTw" id="32CDcOyI7HE" role="2Oq$k0">
+              <ref role="3cqZAo" node="32CDcOyHU2c" resolve="oldDecl" />
+            </node>
+            <node concept="1P9Npp" id="32CDcOyI9Pv" role="2OqNvi">
+              <node concept="37vLTw" id="32CDcOyI9QI" role="1P9ThW">
+                <ref role="3cqZAo" node="32CDcOyHVQo" resolve="newDecl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="iMPJyMQRVw" role="3cqZAp">
+          <node concept="3clFbS" id="iMPJyMQRVx" role="2LFqv$">
+            <node concept="3cpWs8" id="32CDcOyI34Z" role="3cqZAp">
+              <node concept="3cpWsn" id="32CDcOyI350" role="3cpWs9">
+                <property role="TrG5h" value="index" />
+                <node concept="10Oyi0" id="32CDcOyI34V" role="1tU5fm" />
+                <node concept="1rXfSq" id="32CDcOyI351" role="33vP2m">
+                  <ref role="37wK5l" node="32CDcOyI1d1" resolve="getIndexOfDifferenceOfDeclarationSorts" />
+                  <node concept="37vLTw" id="32CDcOyI352" role="37wK5m">
+                    <ref role="3cqZAo" node="32CDcOyHU2c" resolve="oldDecl" />
+                  </node>
+                  <node concept="37vLTw" id="32CDcOyI353" role="37wK5m">
+                    <ref role="3cqZAo" node="32CDcOyHVQo" resolve="newDecl" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="iMPJyMQRVy" role="3cqZAp">
+              <node concept="3cpWsn" id="iMPJyMQRVz" role="3cpWs9">
+                <property role="TrG5h" value="newInstance" />
+                <node concept="3Tqbb2" id="iMPJyMQRV$" role="1tU5fm">
+                  <ref role="ehGHo" to="b83y:2_58u12fwJB" resolve="JudgmentInstance" />
+                </node>
+                <node concept="2OqwBi" id="iMPJyMQRV_" role="33vP2m">
+                  <node concept="37vLTw" id="iMPJyMQRVA" role="2Oq$k0">
+                    <ref role="3cqZAo" node="iMPJyMQRVK" resolve="instanceWithDeclaration" />
+                  </node>
+                  <node concept="2qgKlT" id="iMPJyMQRVB" role="2OqNvi">
+                    <ref role="37wK5l" to="pgas:2loaFuj7QjI" resolve="removeSort" />
+                    <node concept="37vLTw" id="32CDcOyI3n$" role="37wK5m">
+                      <ref role="3cqZAo" node="32CDcOyI350" resolve="index" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2BsPEhwiY$M" role="3cqZAp">
+              <node concept="2OqwBi" id="2BsPEhwiYGH" role="3clFbG">
+                <node concept="37vLTw" id="2BsPEhwiY$K" role="2Oq$k0">
+                  <ref role="3cqZAo" node="iMPJyMQRVK" resolve="instanceWithDeclaration" />
+                </node>
+                <node concept="1P9Npp" id="2BsPEhwiZbh" role="2OqNvi">
+                  <node concept="37vLTw" id="2BsPEhwiZbR" role="1P9ThW">
+                    <ref role="3cqZAo" node="iMPJyMQRVz" resolve="newInstance" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2BsPEhwiYbm" role="3cqZAp">
+              <node concept="2OqwBi" id="2BsPEhwiYbn" role="3clFbG">
+                <node concept="1PxgMI" id="2BsPEhwiYbo" role="2Oq$k0">
+                  <node concept="chp4Y" id="677Mj2_FCQq" role="3oSUPX">
+                    <ref role="cht4Q" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
+                  </node>
+                  <node concept="37vLTw" id="2BsPEhwiZdb" role="1m5AlR">
+                    <ref role="3cqZAo" node="iMPJyMQRVz" resolve="newInstance" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="2BsPEhwiYbt" role="2OqNvi">
+                  <ref role="37wK5l" to="pgas:iMPJyMLTZV" resolve="setJudgment" />
+                  <node concept="37vLTw" id="32CDcOyI3xb" role="37wK5m">
+                    <ref role="3cqZAo" node="32CDcOyHVQo" resolve="newDecl" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="iMPJyMQRVK" role="1Duv9x">
+            <property role="TrG5h" value="instanceWithDeclaration" />
+            <node concept="3Tqbb2" id="iMPJyMQRVL" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="32CDcOyHWNW" role="1DdaDG">
+            <ref role="3cqZAo" node="32CDcOyHWw_" resolve="instancesOfDeclaration" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyHS2Z" role="1B3o_S" />
+      <node concept="3cqZAl" id="32CDcOyHSft" role="3clF45" />
+      <node concept="37vLTG" id="32CDcOyHTUd" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="32CDcOyHTUc" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="32CDcOyHU2c" role="3clF46">
+        <property role="TrG5h" value="oldDecl" />
+        <node concept="3Tqbb2" id="32CDcOyHU9D" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="32CDcOyHVQo" role="3clF46">
+        <property role="TrG5h" value="newDecl" />
+        <node concept="3Tqbb2" id="32CDcOyHVXZ" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="32CDcOyHYkX" role="jymVt" />
+    <node concept="2YIFZL" id="32CDcOyI1d1" role="jymVt">
+      <property role="TrG5h" value="getIndexOfDifferenceOfDeclarationSorts" />
+      <node concept="3clFbS" id="32CDcOyI1d4" role="3clF47">
+        <node concept="3cpWs8" id="32CDcOyIcZ4" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyIcZ5" role="3cpWs9">
+            <property role="TrG5h" value="oldSorts" />
+            <node concept="2I9FWS" id="32CDcOyIcZ1" role="1tU5fm">
+              <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOyIcZ6" role="33vP2m">
+              <node concept="37vLTw" id="32CDcOyIcZ7" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyI2Bp" resolve="oldDecl" />
+              </node>
+              <node concept="2qgKlT" id="32CDcOyIcZ8" role="2OqNvi">
+                <ref role="37wK5l" to="pgas:4XA4NEmGQRd" resolve="getSorts" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOyIg28" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyIg29" role="3cpWs9">
+            <property role="TrG5h" value="newSorts" />
+            <node concept="2I9FWS" id="32CDcOyIg26" role="1tU5fm">
+              <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOyIg2a" role="33vP2m">
+              <node concept="37vLTw" id="32CDcOyIg2b" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyI2Es" resolve="newDecl" />
+              </node>
+              <node concept="2qgKlT" id="32CDcOyIg2c" role="2OqNvi">
+                <ref role="37wK5l" to="pgas:4XA4NEmGQRd" resolve="getSorts" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="32CDcOyIpBq" role="3cqZAp" />
+        <node concept="1Dw8fO" id="32CDcOyIq3i" role="3cqZAp">
+          <node concept="3clFbS" id="32CDcOyIq3k" role="2LFqv$">
+            <node concept="3clFbJ" id="32CDcOyJckK" role="3cqZAp">
+              <node concept="3clFbS" id="32CDcOyJckM" role="3clFbx">
+                <node concept="3cpWs6" id="32CDcOyJcXh" role="3cqZAp">
+                  <node concept="37vLTw" id="32CDcOyJdkX" role="3cqZAk">
+                    <ref role="3cqZAo" node="32CDcOyIq3l" resolve="i" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3fqX7Q" id="32CDcOyJcNK" role="3clFbw">
+                <node concept="2OqwBi" id="32CDcOyJcNM" role="3fr31v">
+                  <node concept="2OqwBi" id="32CDcOyJcNN" role="2Oq$k0">
+                    <node concept="2OqwBi" id="32CDcOyJcNO" role="2Oq$k0">
+                      <node concept="1PxgMI" id="32CDcOyJcNP" role="2Oq$k0">
+                        <node concept="chp4Y" id="32CDcOyJcNQ" role="3oSUPX">
+                          <ref role="cht4Q" to="b83y:2_58u12cYwo" resolve="SortConcept" />
+                        </node>
+                        <node concept="2OqwBi" id="32CDcOyJcNR" role="1m5AlR">
+                          <node concept="37vLTw" id="32CDcOyJcNS" role="2Oq$k0">
+                            <ref role="3cqZAo" node="32CDcOyIg29" resolve="newSorts" />
+                          </node>
+                          <node concept="34jXtK" id="32CDcOyJcNT" role="2OqNvi">
+                            <node concept="37vLTw" id="32CDcOyJcNU" role="25WWJ7">
+                              <ref role="3cqZAo" node="32CDcOyIq3l" resolve="i" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="32CDcOyJcNV" role="2OqNvi">
+                        <ref role="3Tt5mk" to="b83y:2_58u12cYws" resolve="sort" />
+                      </node>
+                    </node>
+                    <node concept="3TrcHB" id="32CDcOyJcNW" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="32CDcOyJcNX" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                    <node concept="2OqwBi" id="32CDcOyJcNY" role="37wK5m">
+                      <node concept="2OqwBi" id="32CDcOyJcNZ" role="2Oq$k0">
+                        <node concept="1PxgMI" id="32CDcOyJcO0" role="2Oq$k0">
+                          <node concept="chp4Y" id="32CDcOyJcO1" role="3oSUPX">
+                            <ref role="cht4Q" to="b83y:2_58u12cYwo" resolve="SortConcept" />
+                          </node>
+                          <node concept="2OqwBi" id="32CDcOyJcO2" role="1m5AlR">
+                            <node concept="37vLTw" id="32CDcOyJcO3" role="2Oq$k0">
+                              <ref role="3cqZAo" node="32CDcOyIcZ5" resolve="oldSorts" />
+                            </node>
+                            <node concept="34jXtK" id="32CDcOyJcO4" role="2OqNvi">
+                              <node concept="37vLTw" id="32CDcOyJcO5" role="25WWJ7">
+                                <ref role="3cqZAo" node="32CDcOyIq3l" resolve="i" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3TrEf2" id="32CDcOyJcO6" role="2OqNvi">
+                          <ref role="3Tt5mk" to="b83y:2_58u12cYws" resolve="sort" />
+                        </node>
+                      </node>
+                      <node concept="3TrcHB" id="32CDcOyJcO7" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="32CDcOyIq3l" role="1Duv9x">
+            <property role="TrG5h" value="i" />
+            <node concept="10Oyi0" id="32CDcOyIqh3" role="1tU5fm" />
+            <node concept="3cmrfG" id="32CDcOyIqiJ" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+          <node concept="3eOVzh" id="32CDcOyIrRL" role="1Dwp0S">
+            <node concept="2OqwBi" id="32CDcOyItGM" role="3uHU7w">
+              <node concept="37vLTw" id="32CDcOyIrYK" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyIcZ5" resolve="oldSorts" />
+              </node>
+              <node concept="34oBXx" id="32CDcOyIuLu" role="2OqNvi" />
+            </node>
+            <node concept="37vLTw" id="32CDcOyIqjJ" role="3uHU7B">
+              <ref role="3cqZAo" node="32CDcOyIq3l" resolve="i" />
+            </node>
+          </node>
+          <node concept="3uNrnE" id="32CDcOyIvBZ" role="1Dwrff">
+            <node concept="37vLTw" id="32CDcOyIvC1" role="2$L3a6">
+              <ref role="3cqZAo" node="32CDcOyIq3l" resolve="i" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="32CDcOyJe4f" role="3cqZAp">
+          <node concept="3cmrfG" id="32CDcOyJesH" role="3cqZAk">
+            <property role="3cmrfH" value="-1" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="32CDcOyHZLg" role="1B3o_S" />
+      <node concept="10Oyi0" id="32CDcOyI1cc" role="3clF45" />
+      <node concept="37vLTG" id="32CDcOyI2Bp" role="3clF46">
+        <property role="TrG5h" value="oldDecl" />
+        <node concept="3Tqbb2" id="32CDcOyI2Bo" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="32CDcOyI2Es" role="3clF46">
+        <property role="TrG5h" value="newDecl" />
+        <node concept="3Tqbb2" id="32CDcOyI2FD" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/inca-translation/languages/TypeLang/generator/template/main@generator.mps b/inca-translation/languages/TypeLang/generator/template/main@generator.mps
index d069e85d999c0634513ddf317b355d22a0d707a7..efb21930a687854bb01583bbddcaa3183cd64044 100644
--- a/inca-translation/languages/TypeLang/generator/template/main@generator.mps
+++ b/inca-translation/languages/TypeLang/generator/template/main@generator.mps
@@ -51,7 +51,9 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -63,7 +65,6 @@
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -78,6 +79,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -98,7 +100,6 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
         <child id="1144226360166" name="iterable" index="1DdaDG" />
       </concept>
@@ -112,7 +113,6 @@
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
       </concept>
-      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
@@ -215,13 +215,11 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
-      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
@@ -234,6 +232,9 @@
     <node concept="1puMqW" id="4XA4NEmIqyV" role="1puA0r">
       <ref role="1puQsG" node="4XA4NEmGx5U" resolve="eliminateRecursiveInputFromJudgment" />
     </node>
+    <node concept="1puMqW" id="32CDcOyE9Ot" role="1puA0r">
+      <ref role="1puQsG" node="7DdCaEODx6h" resolve="eliminateContextByProjection" />
+    </node>
   </node>
   <node concept="1pmfR0" id="4XA4NEmGx5U">
     <property role="TrG5h" value="eliminateRecursiveInputFromJudgment" />
@@ -344,50 +345,20 @@
                 <property role="3SKdUp" value="remove the arguments in judgment instances of the previously transformed judgements" />
               </node>
             </node>
-            <node concept="3cpWs8" id="4XA4NEmJ2LZ" role="3cqZAp">
-              <node concept="3cpWsn" id="4XA4NEmJ2M0" role="3cpWs9">
+            <node concept="3cpWs8" id="32CDcOyHxoT" role="3cqZAp">
+              <node concept="3cpWsn" id="32CDcOyHxoU" role="3cpWs9">
                 <property role="TrG5h" value="instances" />
-                <node concept="2OqwBi" id="677Mj2_E_YB" role="33vP2m">
-                  <node concept="2OqwBi" id="2BsPEhwlyB0" role="2Oq$k0">
-                    <node concept="2OqwBi" id="4XA4NEmJ2M2" role="2Oq$k0">
-                      <node concept="1Q6Npb" id="4XA4NEmJ2M3" role="2Oq$k0" />
-                      <node concept="2SmgA7" id="4XA4NEmJ2M4" role="2OqNvi">
-                        <node concept="chp4Y" id="677Mj2_EM3S" role="1dBWTz">
-                          <ref role="cht4Q" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3zZkjj" id="2BsPEhwlzS8" role="2OqNvi">
-                      <node concept="1bVj0M" id="2BsPEhwlzSa" role="23t8la">
-                        <node concept="3clFbS" id="2BsPEhwlzSb" role="1bW5cS">
-                          <node concept="3clFbF" id="677Mj2_EMPV" role="3cqZAp">
-                            <node concept="3clFbC" id="677Mj2_EObJ" role="3clFbG">
-                              <node concept="37vLTw" id="677Mj2_EOwY" role="3uHU7w">
-                                <ref role="3cqZAo" node="4XA4NEmHp$S" resolve="decl" />
-                              </node>
-                              <node concept="2OqwBi" id="677Mj2_ENbS" role="3uHU7B">
-                                <node concept="37vLTw" id="677Mj2_EMPU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2BsPEhwlzSc" resolve="it" />
-                                </node>
-                                <node concept="2qgKlT" id="677Mj2_ENEs" role="2OqNvi">
-                                  <ref role="37wK5l" to="pgas:iMPJyMM1Nb" resolve="getJudgment" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="2BsPEhwlzSc" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2BsPEhwlzSd" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="ANE8D" id="677Mj2_EIBG" role="2OqNvi" />
-                </node>
-                <node concept="2I9FWS" id="7DdCaEOTQFS" role="1tU5fm">
+                <node concept="2I9FWS" id="32CDcOyHxoP" role="1tU5fm">
                   <ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
                 </node>
+                <node concept="2YIFZM" id="32CDcOyHxoV" role="33vP2m">
+                  <ref role="37wK5l" to="5tos:32CDcOyHqJ8" resolve="getInstancesOfDeclaration" />
+                  <ref role="1Pybhc" to="5tos:32CDcOyGKwu" resolve="TypeLangModelQuerier" />
+                  <node concept="1Q6Npb" id="32CDcOyHxoW" role="37wK5m" />
+                  <node concept="37vLTw" id="32CDcOyHxoX" role="37wK5m">
+                    <ref role="3cqZAo" node="4XA4NEmHp$S" resolve="decl" />
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="3clFbH" id="7DdCaEOL_2n" role="3cqZAp" />
@@ -419,6 +390,7 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbH" id="32CDcOzb$zn" role="3cqZAp" />
             <node concept="3clFbH" id="677Mj2_GXf4" role="3cqZAp" />
             <node concept="3SKdUt" id="677Mj2_G_mg" role="3cqZAp">
               <node concept="3SKdUq" id="677Mj2_G_mi" role="3SKWNk">
@@ -696,8 +668,8 @@
                   <ref role="ehGHo" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
                 </node>
               </node>
-              <node concept="37vLTw" id="5bZNdPkhi5w" role="1DdaDG">
-                <ref role="3cqZAo" node="4XA4NEmJ2M0" resolve="instances" />
+              <node concept="37vLTw" id="32CDcOyHMkq" role="1DdaDG">
+                <ref role="3cqZAo" node="32CDcOyHxoU" resolve="instances" />
               </node>
             </node>
           </node>
@@ -1076,86 +1048,206 @@
   </node>
   <node concept="1pmfR0" id="7DdCaEODx6h">
     <property role="TrG5h" value="eliminateContextByProjection" />
+    <property role="1v3f2W" value="pre_processing" />
+    <property role="1v3jST" value="true" />
     <node concept="1pplIY" id="7DdCaEODx6i" role="1pqMTA">
       <node concept="3clFbS" id="7DdCaEODx6j" role="2VODD2">
-        <node concept="3cpWs8" id="7DdCaEODx8a" role="3cqZAp">
-          <node concept="3cpWsn" id="7DdCaEODx8d" role="3cpWs9">
-            <property role="TrG5h" value="decls" />
-            <node concept="2I9FWS" id="7DdCaEODx89" role="1tU5fm">
+        <node concept="3clFbH" id="32CDcOyTNbK" role="3cqZAp" />
+        <node concept="3cpWs8" id="32CDcOyFphR" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyFphS" role="3cpWs9">
+            <property role="TrG5h" value="projectContext" />
+            <node concept="3uibUv" id="32CDcOyFphP" role="1tU5fm">
+              <ref role="3uigEE" to="5tos:32CDcOyEa0d" resolve="ProjectContext" />
+            </node>
+            <node concept="2ShNRf" id="32CDcOyFphT" role="33vP2m">
+              <node concept="1pGfFk" id="32CDcOyFphU" role="2ShVmc">
+                <ref role="37wK5l" to="5tos:32CDcOyElBr" resolve="ProjectContext" />
+                <node concept="1Q6Npb" id="32CDcOyFphV" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="32CDcOyUpM7" role="3cqZAp" />
+        <node concept="3clFbJ" id="32CDcOyUrdg" role="3cqZAp">
+          <node concept="3clFbS" id="32CDcOyUrdi" role="3clFbx">
+            <node concept="3cpWs6" id="32CDcOyUtBN" role="3cqZAp" />
+          </node>
+          <node concept="3fqX7Q" id="32CDcOyUtAh" role="3clFbw">
+            <node concept="2OqwBi" id="32CDcOyUtAj" role="3fr31v">
+              <node concept="37vLTw" id="32CDcOyUtAk" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
+              </node>
+              <node concept="liA8E" id="32CDcOyUtAl" role="2OqNvi">
+                <ref role="37wK5l" to="5tos:32CDcOyUlT4" resolve="hasLookupDeclaration" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="32CDcOyUtC0" role="3cqZAp" />
+        <node concept="3clFbH" id="32CDcOyUv1L" role="3cqZAp" />
+        <node concept="3SKdUt" id="32CDcOyTbXq" role="3cqZAp">
+          <node concept="3SKdUq" id="32CDcOyTbXs" role="3SKWNk">
+            <property role="3SKdUp" value="TODO why are there 6 decls? infer and check twice" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOyFp__" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyFp_A" role="3cpWs9">
+            <property role="TrG5h" value="declsWithContext" />
+            <node concept="2I9FWS" id="32CDcOyFp_x" role="1tU5fm">
               <ref role="2I9WkF" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
             </node>
-            <node concept="2OqwBi" id="7DdCaEODxhm" role="33vP2m">
-              <node concept="1Q6Npb" id="7DdCaEODx99" role="2Oq$k0" />
-              <node concept="2SmgA7" id="7DdCaEODxx3" role="2OqNvi">
-                <node concept="chp4Y" id="7DdCaEODxG6" role="1dBWTz">
-                  <ref role="cht4Q" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            <node concept="2OqwBi" id="32CDcOyFp_B" role="33vP2m">
+              <node concept="37vLTw" id="32CDcOyFp_C" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
+              </node>
+              <node concept="liA8E" id="32CDcOyFp_D" role="2OqNvi">
+                <ref role="37wK5l" to="5tos:32CDcOyEp1G" resolve="getDeclarationsWithContextInputNoLookup" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="32CDcOyOXA8" role="3cqZAp" />
+        <node concept="3SKdUt" id="32CDcOyNkBl" role="3cqZAp">
+          <node concept="3SKdUq" id="32CDcOyNkBn" role="3SKWNk">
+            <property role="3SKdUp" value="create context judgment" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOyY7qv" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyY7qw" role="3cpWs9">
+            <property role="TrG5h" value="declarationWithTermAndContext" />
+            <node concept="3Tqbb2" id="32CDcOyY7qt" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            </node>
+            <node concept="2YIFZM" id="32CDcOyY7qx" role="33vP2m">
+              <ref role="37wK5l" to="5tos:32CDcOyXAwO" resolve="getDeclarationWithTermAndContext" />
+              <ref role="1Pybhc" to="5tos:32CDcOyGKwu" resolve="TypeLangModelQuerier" />
+              <node concept="1Q6Npb" id="32CDcOyY7qy" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOyOAkq" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOyOAkr" role="3cpWs9">
+            <property role="TrG5h" value="contextProjectionDeclaration" />
+            <node concept="3Tqbb2" id="32CDcOyOAkd" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOyOAks" role="33vP2m">
+              <node concept="37vLTw" id="32CDcOyOAkt" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
+              </node>
+              <node concept="liA8E" id="32CDcOyOAku" role="2OqNvi">
+                <ref role="37wK5l" to="5tos:32CDcOyFaKP" resolve="createContextProjectionDeclaration" />
+                <node concept="37vLTw" id="32CDcOyY7q$" role="37wK5m">
+                  <ref role="3cqZAo" node="32CDcOyY7qw" resolve="declarationWithTermAndContext" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="7DdCaEOEkrM" role="3cqZAp">
-          <node concept="3cpWsn" id="7DdCaEOEkrN" role="3cpWs9">
-            <property role="TrG5h" value="declsWithContext" />
-            <node concept="2OqwBi" id="7DdCaEOEkXf" role="33vP2m">
-              <node concept="2OqwBi" id="7DdCaEOEkrO" role="2Oq$k0">
-                <node concept="37vLTw" id="7DdCaEOEkrP" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7DdCaEODx8d" resolve="decls" />
+        <node concept="3clFbF" id="32CDcOyO$IW" role="3cqZAp">
+          <node concept="2OqwBi" id="32CDcOyOO22" role="3clFbG">
+            <node concept="37vLTw" id="32CDcOyYana" role="2Oq$k0">
+              <ref role="3cqZAo" node="32CDcOyY7qw" resolve="declarationWithTermAndContext" />
+            </node>
+            <node concept="HtI8k" id="32CDcOyOQzp" role="2OqNvi">
+              <node concept="37vLTw" id="32CDcOyOQ$5" role="HtI8F">
+                <ref role="3cqZAo" node="32CDcOyOAkr" resolve="contextProjectionDeclaration" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="32CDcOyOQ_0" role="3cqZAp" />
+        <node concept="3clFbH" id="32CDcOyNSCn" role="3cqZAp" />
+        <node concept="3SKdUt" id="32CDcOyNsQ7" role="3cqZAp">
+          <node concept="3SKdUq" id="32CDcOyNsQ9" role="3SKWNk">
+            <property role="3SKdUp" value="TODO generate context rules" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="32CDcOyO7vy" role="3cqZAp" />
+        <node concept="3SKdUt" id="32CDcOyNnkh" role="3cqZAp">
+          <node concept="3SKdUq" id="32CDcOyNnkj" role="3SKWNk">
+            <property role="3SKdUp" value="TODO generate lookup no context judgment" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="32CDcOz4ljQ" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOz4ljR" role="3cpWs9">
+            <property role="TrG5h" value="lookupNoContextDeclaration" />
+            <node concept="3Tqbb2" id="32CDcOz4ljP" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="32CDcOz4ljS" role="33vP2m">
+              <node concept="37vLTw" id="32CDcOz4ljT" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
+              </node>
+              <node concept="liA8E" id="32CDcOz4ljU" role="2OqNvi">
+                <ref role="37wK5l" to="5tos:32CDcOz3Fzl" resolve="createLookupNoContextDeclaration" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="32CDcOz4pDE" role="3cqZAp">
+          <node concept="2OqwBi" id="32CDcOz4rpa" role="3clFbG">
+            <node concept="2OqwBi" id="32CDcOz4r0v" role="2Oq$k0">
+              <node concept="37vLTw" id="32CDcOz4pDC" role="2Oq$k0">
+                <ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
+              </node>
+              <node concept="liA8E" id="32CDcOz4rfn" role="2OqNvi">
+                <ref role="37wK5l" to="5tos:32CDcOyTUll" resolve="getLookupDeclaration" />
+              </node>
+            </node>
+            <node concept="HtI8k" id="32CDcOz4sPc" role="2OqNvi">
+              <node concept="37vLTw" id="32CDcOz4sQ7" role="HtI8F">
+                <ref role="3cqZAo" node="32CDcOz4ljR" resolve="lookupNoContextDeclaration" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="32CDcOyFqUz" role="3cqZAp">
+          <node concept="3clFbS" id="32CDcOyFqU_" role="2LFqv$">
+            <node concept="3cpWs8" id="32CDcOyFunL" role="3cqZAp">
+              <node concept="3cpWsn" id="32CDcOyFunM" role="3cpWs9">
+                <property role="TrG5h" value="newDeclaration" />
+                <node concept="3Tqbb2" id="32CDcOyFunI" role="1tU5fm">
+                  <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
                 </node>
-                <node concept="3zZkjj" id="7DdCaEOEkrQ" role="2OqNvi">
-                  <node concept="1bVj0M" id="7DdCaEOEkrR" role="23t8la">
-                    <node concept="3clFbS" id="7DdCaEOEkrS" role="1bW5cS">
-                      <node concept="3clFbF" id="7DdCaEOEkrT" role="3cqZAp">
-                        <node concept="1Wc70l" id="7DdCaEOEkrU" role="3clFbG">
-                          <node concept="3y3z36" id="7DdCaEOEkrV" role="3uHU7w">
-                            <node concept="10Nm6u" id="7DdCaEOEkrW" role="3uHU7w" />
-                            <node concept="2OqwBi" id="7DdCaEOEkrX" role="3uHU7B">
-                              <node concept="37vLTw" id="7DdCaEOEkrY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7DdCaEOEks8" resolve="it" />
-                              </node>
-                              <node concept="2qgKlT" id="7DdCaEOEkrZ" role="2OqNvi">
-                                <ref role="37wK5l" to="pgas:7DdCaEODOqJ" resolve="getInfiniteInputSortByName" />
-                                <node concept="Xl_RD" id="7DdCaEOEks0" role="37wK5m">
-                                  <property role="Xl_RC" value="Context" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3fqX7Q" id="7DdCaEOEks1" role="3uHU7B">
-                            <node concept="2OqwBi" id="7DdCaEOEks2" role="3fr31v">
-                              <node concept="2OqwBi" id="7DdCaEOEks3" role="2Oq$k0">
-                                <node concept="37vLTw" id="7DdCaEOEks4" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7DdCaEOEks8" resolve="it" />
-                                </node>
-                                <node concept="3TrcHB" id="7DdCaEOEks5" role="2OqNvi">
-                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="7DdCaEOEks6" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
-                                <node concept="Xl_RD" id="7DdCaEOEks7" role="37wK5m">
-                                  <property role="Xl_RC" value="lookup" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="7DdCaEOEks8" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7DdCaEOEks9" role="1tU5fm" />
+                <node concept="2OqwBi" id="32CDcOyFunN" role="33vP2m">
+                  <node concept="37vLTw" id="32CDcOyFunO" role="2Oq$k0">
+                    <ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
+                  </node>
+                  <node concept="liA8E" id="32CDcOyFunP" role="2OqNvi">
+                    <ref role="37wK5l" to="5tos:32CDcOyEKvA" resolve="eliminateContextInput" />
+                    <node concept="37vLTw" id="32CDcOyFunQ" role="37wK5m">
+                      <ref role="3cqZAo" node="32CDcOyFqUA" resolve="decl" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="ANE8D" id="7DdCaEOElh$" role="2OqNvi" />
             </node>
-            <node concept="2I9FWS" id="7DdCaEOEkH3" role="1tU5fm">
-              <ref role="2I9WkF" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            <node concept="3clFbF" id="32CDcOyJhsB" role="3cqZAp">
+              <node concept="2YIFZM" id="32CDcOyJhuZ" role="3clFbG">
+                <ref role="37wK5l" to="5tos:32CDcOyHSfC" resolve="replaceInstancesOfDeclaration" />
+                <ref role="1Pybhc" to="5tos:32CDcOyGKwu" resolve="TypeLangModelQuerier" />
+                <node concept="1Q6Npb" id="32CDcOyJhvK" role="37wK5m" />
+                <node concept="37vLTw" id="32CDcOyJhxP" role="37wK5m">
+                  <ref role="3cqZAo" node="32CDcOyFqUA" resolve="decl" />
+                </node>
+                <node concept="37vLTw" id="32CDcOyJhEf" role="37wK5m">
+                  <ref role="3cqZAo" node="32CDcOyFunM" resolve="newDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="32CDcOyFqUA" role="1Duv9x">
+            <property role="TrG5h" value="decl" />
+            <node concept="3Tqbb2" id="32CDcOyFr4w" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
             </node>
           </node>
+          <node concept="37vLTw" id="32CDcOyFr$z" role="1DdaDG">
+            <ref role="3cqZAo" node="32CDcOyFp_A" resolve="declsWithContext" />
+          </node>
         </node>
+        <node concept="3clFbH" id="32CDcOyE9Xn" role="3cqZAp" />
       </node>
     </node>
   </node>
diff --git a/inca-translation/languages/TypeLang/models/behavior.mps b/inca-translation/languages/TypeLang/models/behavior.mps
index 3918a3d55b3127fb0448879dea9a702792545af4..02b0ae31de0265591ea7eac64038730fd3a6d9df 100644
--- a/inca-translation/languages/TypeLang/models/behavior.mps
+++ b/inca-translation/languages/TypeLang/models/behavior.mps
@@ -1078,6 +1078,117 @@
         <node concept="17QB3L" id="7DdCaEODTCj" role="1tU5fm" />
       </node>
     </node>
+    <node concept="13i0hz" id="32CDcOyZDFP" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getSortByName" />
+      <node concept="3Tm1VV" id="32CDcOyZDFQ" role="1B3o_S" />
+      <node concept="3clFbS" id="32CDcOyZDFR" role="3clF47">
+        <node concept="3clFbF" id="32CDcOyZDFS" role="3cqZAp">
+          <node concept="2OqwBi" id="32CDcOyZDFT" role="3clFbG">
+            <node concept="BsUDl" id="32CDcOyZElC" role="2Oq$k0">
+              <ref role="37wK5l" node="4XA4NEmGQRd" resolve="getSorts" />
+            </node>
+            <node concept="1z4cxt" id="32CDcOyZDFV" role="2OqNvi">
+              <node concept="1bVj0M" id="32CDcOyZDFW" role="23t8la">
+                <node concept="3clFbS" id="32CDcOyZDFX" role="1bW5cS">
+                  <node concept="3clFbF" id="32CDcOyZDFY" role="3cqZAp">
+                    <node concept="1Wc70l" id="32CDcOyZDFZ" role="3clFbG">
+                      <node concept="2OqwBi" id="32CDcOyZDG0" role="3uHU7w">
+                        <node concept="2OqwBi" id="32CDcOyZDG1" role="2Oq$k0">
+                          <node concept="2OqwBi" id="32CDcOyZDG2" role="2Oq$k0">
+                            <node concept="1PxgMI" id="32CDcOyZDG3" role="2Oq$k0">
+                              <node concept="chp4Y" id="32CDcOyZDG4" role="3oSUPX">
+                                <ref role="cht4Q" to="b83y:2_58u12cYwo" resolve="SortConcept" />
+                              </node>
+                              <node concept="37vLTw" id="32CDcOyZDG5" role="1m5AlR">
+                                <ref role="3cqZAo" node="32CDcOyZDGe" resolve="it" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="32CDcOyZDG6" role="2OqNvi">
+                              <ref role="3Tt5mk" to="b83y:2_58u12cYws" resolve="sort" />
+                            </node>
+                          </node>
+                          <node concept="3TrcHB" id="32CDcOyZDG7" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="32CDcOyZDG8" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                          <node concept="37vLTw" id="32CDcOyZDG9" role="37wK5m">
+                            <ref role="3cqZAo" node="32CDcOyZDGh" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="32CDcOyZDGa" role="3uHU7B">
+                        <node concept="37vLTw" id="32CDcOyZDGb" role="2Oq$k0">
+                          <ref role="3cqZAo" node="32CDcOyZDGe" resolve="it" />
+                        </node>
+                        <node concept="1mIQ4w" id="32CDcOyZDGc" role="2OqNvi">
+                          <node concept="chp4Y" id="32CDcOyZDGd" role="cj9EA">
+                            <ref role="cht4Q" to="b83y:2_58u12cYwo" resolve="SortConcept" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="32CDcOyZDGe" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="32CDcOyZDGf" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="32CDcOyZDGg" role="3clF45">
+        <ref role="ehGHo" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+      </node>
+      <node concept="37vLTG" id="32CDcOyZDGh" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="32CDcOyZDGi" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="13i0hz" id="32CDcOz44ei" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getIndexOfSortByName" />
+      <node concept="3Tm1VV" id="32CDcOz44ej" role="1B3o_S" />
+      <node concept="3clFbS" id="32CDcOz44ek" role="3clF47">
+        <node concept="3cpWs8" id="32CDcOz45SY" role="3cqZAp">
+          <node concept="3cpWsn" id="32CDcOz45SZ" role="3cpWs9">
+            <property role="TrG5h" value="sortByName" />
+            <node concept="3Tqbb2" id="32CDcOz45SV" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+            </node>
+            <node concept="BsUDl" id="32CDcOz45T0" role="33vP2m">
+              <ref role="37wK5l" node="32CDcOyZDFP" resolve="getSortByName" />
+              <node concept="37vLTw" id="32CDcOz45T1" role="37wK5m">
+                <ref role="3cqZAo" node="32CDcOz44eI" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="32CDcOz45Yy" role="3cqZAp">
+          <node concept="2OqwBi" id="32CDcOz47jx" role="3cqZAk">
+            <node concept="BsUDl" id="32CDcOz45ZB" role="2Oq$k0">
+              <ref role="37wK5l" node="4XA4NEmGQRd" resolve="getSorts" />
+            </node>
+            <node concept="2WmjW8" id="32CDcOz49YJ" role="2OqNvi">
+              <node concept="37vLTw" id="32CDcOz4a0a" role="25WWJ7">
+                <ref role="3cqZAo" node="32CDcOz45SZ" resolve="sortByName" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="32CDcOz44eI" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="32CDcOz44eJ" role="1tU5fm" />
+      </node>
+      <node concept="10Oyi0" id="32CDcOz44Ap" role="3clF45" />
+    </node>
     <node concept="13i0hz" id="5bZNdPkea12" role="13h7CS">
       <property role="13i0iv" value="true" />
       <property role="13i0it" value="true" />
@@ -2352,10 +2463,15 @@
           </node>
           <node concept="3clFbS" id="iMPJyMLU7j" role="Jncv$">
             <node concept="3clFbF" id="iMPJyMLU9i" role="3cqZAp">
-              <node concept="2OqwBi" id="iMPJyMLUhQ" role="3clFbG">
-                <node concept="13iPFW" id="iMPJyMLU9h" role="2Oq$k0" />
-                <node concept="3TrEf2" id="iMPJyMLUt9" role="2OqNvi">
-                  <ref role="3Tt5mk" to="b83y:2_58u12eCWS" resolve="judgment" />
+              <node concept="37vLTI" id="32CDcOyLROR" role="3clFbG">
+                <node concept="Jnkvi" id="32CDcOyLSdC" role="37vLTx">
+                  <ref role="1M0zk5" node="iMPJyMLU7k" resolve="declaration1" />
+                </node>
+                <node concept="2OqwBi" id="iMPJyMLUhQ" role="37vLTJ">
+                  <node concept="13iPFW" id="iMPJyMLU9h" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="iMPJyMLUt9" role="2OqNvi">
+                    <ref role="3Tt5mk" to="b83y:2_58u12eCWS" resolve="judgment" />
+                  </node>
                 </node>
               </node>
             </node>