diff --git a/inca-translation/languages/TypeLang/TypeLang.mpl b/inca-translation/languages/TypeLang/TypeLang.mpl
index b4f3ec4a46165bfbe6d1291bf4b5b42ca1c3d31a..18093a309e3f73f225b171858aa87e767414c538 100644
--- a/inca-translation/languages/TypeLang/TypeLang.mpl
+++ b/inca-translation/languages/TypeLang/TypeLang.mpl
@@ -83,27 +83,13 @@
           <greater-priority-mapping>
             <generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
             <external-mapping>
-              <mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431052268520" />
-            </external-mapping>
-          </greater-priority-mapping>
-          <lesser-priority-mapping>
-            <generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
-            <external-mapping>
-              <mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431052268518" />
-            </external-mapping>
-          </lesser-priority-mapping>
-        </mapping-priority-rule>
-        <mapping-priority-rule kind="strictly_before">
-          <greater-priority-mapping>
-            <generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
-            <external-mapping>
-              <mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431052268518" />
+              <mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431052230593" />
             </external-mapping>
           </greater-priority-mapping>
           <lesser-priority-mapping>
-            <generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
+            <generator generatorUID="ffdbca37-b97f-439c-8366-148d3b8b6c53(org.inca.extensions#01)" />
             <external-mapping>
-              <mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="2973820376015168667" />
+              <all-local-mappings />
             </external-mapping>
           </lesser-priority-mapping>
         </mapping-priority-rule>
@@ -111,7 +97,7 @@
           <greater-priority-mapping>
             <generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
             <external-mapping>
-              <mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="2973820376015168667" />
+              <mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="8505746811416474161" />
             </external-mapping>
           </greater-priority-mapping>
           <lesser-priority-mapping>
@@ -121,20 +107,6 @@
             </external-mapping>
           </lesser-priority-mapping>
         </mapping-priority-rule>
-        <mapping-priority-rule kind="strictly_before">
-          <greater-priority-mapping>
-            <generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
-            <external-mapping>
-              <mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431052230593" />
-            </external-mapping>
-          </greater-priority-mapping>
-          <lesser-priority-mapping>
-            <generator generatorUID="ffdbca37-b97f-439c-8366-148d3b8b6c53(org.inca.extensions#01)" />
-            <external-mapping>
-              <all-local-mappings />
-            </external-mapping>
-          </lesser-priority-mapping>
-        </mapping-priority-rule>
       </mapping-priorities>
     </generator>
   </generators>
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 02d9ca42db26169c24b948b046df610d0be0c60b..a8cf0ea43568da0adc95f4a160fbae0a9fcc3354 100644
--- a/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
+++ b/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
@@ -118,6 +118,7 @@
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
+      <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
@@ -324,7 +325,13 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="1209727891789" name="jetbrains.mps.baseLanguage.collections.structure.ComparatorSortOperation" flags="nn" index="2DpFxk">
+        <child id="1209727996925" name="ascending" index="2Dq5b$" />
+      </concept>
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -345,6 +352,7 @@
       <concept id="5232196642625575054" name="jetbrains.mps.baseLanguage.collections.structure.TailListOperation" flags="nn" index="1eb2uI">
         <child id="5232196642625575056" name="fromIndex" index="1eb2uK" />
       </concept>
+      <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
         <child id="1197683475734" name="valueType" index="3rvSg0" />
@@ -7520,127 +7528,157 @@
     <node concept="3clFb_" id="4RJJaubau1Z" role="jymVt">
       <property role="TrG5h" value="replaceInstancesOfDeclaration" />
       <node concept="3clFbS" id="4RJJaubau21" role="3clF47">
-        <node concept="3cpWs8" id="4RJJaubau22" role="3cqZAp">
-          <node concept="3cpWsn" id="4RJJaubau23" role="3cpWs9">
-            <property role="TrG5h" value="instancesOfDeclaration" />
-            <node concept="2I9FWS" id="4RJJaubau24" role="1tU5fm">
-              <ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
+        <node concept="3clFbF" id="7oauUzsVBVQ" role="3cqZAp">
+          <node concept="1rXfSq" id="7oauUzsT5p1" role="3clFbG">
+            <ref role="37wK5l" node="7oauUzsSzyV" resolve="replaceInstancesOfDeclarationWithIndex" />
+            <node concept="37vLTw" id="7oauUzsT94A" role="37wK5m">
+              <ref role="3cqZAo" node="4RJJaubau2I" resolve="oldDecl" />
             </node>
-            <node concept="1rXfSq" id="4RJJaubau25" role="33vP2m">
-              <ref role="37wK5l" node="4RJJaub9DpF" resolve="getInstancesOfDeclaration" />
-              <node concept="37vLTw" id="4RJJaubau26" role="37wK5m">
+            <node concept="37vLTw" id="7oauUzsTcKS" role="37wK5m">
+              <ref role="3cqZAo" node="4RJJaubau2K" resolve="newDecl" />
+            </node>
+            <node concept="2OqwBi" id="7oauUzsTjz9" role="37wK5m">
+              <node concept="37vLTw" id="7oauUzsTgtE" role="2Oq$k0">
                 <ref role="3cqZAo" node="4RJJaubau2I" resolve="oldDecl" />
               </node>
+              <node concept="2qgKlT" id="7oauUzsTn1H" role="2OqNvi">
+                <ref role="37wK5l" to="pgas:4RJJaubsjNH" resolve="getIndexOfDifferenceInSorts" />
+                <node concept="37vLTw" id="7oauUzsTqJ1" role="37wK5m">
+                  <ref role="3cqZAo" node="4RJJaubau2K" resolve="newDecl" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="4RJJaubau27" role="3cqZAp">
-          <node concept="2OqwBi" id="4RJJaubau28" role="3clFbG">
-            <node concept="37vLTw" id="4RJJaubau29" role="2Oq$k0">
-              <ref role="3cqZAo" node="4RJJaubau2I" resolve="oldDecl" />
+      </node>
+      <node concept="3cqZAl" id="4RJJaubau2F" role="3clF45" />
+      <node concept="37vLTG" id="4RJJaubau2I" role="3clF46">
+        <property role="TrG5h" value="oldDecl" />
+        <node concept="3Tqbb2" id="4RJJaubau2J" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4RJJaubau2K" role="3clF46">
+        <property role="TrG5h" value="newDecl" />
+        <node concept="3Tqbb2" id="4RJJaubau2L" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4RJJaubau2E" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7oauUzsSCHA" role="jymVt" />
+    <node concept="3clFb_" id="7oauUzsSzyV" role="jymVt">
+      <property role="TrG5h" value="replaceInstancesOfDeclarationWithIndex" />
+      <node concept="3clFbS" id="7oauUzsSzyW" role="3clF47">
+        <node concept="3cpWs8" id="7oauUzsSzyX" role="3cqZAp">
+          <node concept="3cpWsn" id="7oauUzsSzyY" role="3cpWs9">
+            <property role="TrG5h" value="instancesOfDeclaration" />
+            <node concept="2I9FWS" id="7oauUzsSzyZ" role="1tU5fm">
+              <ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
             </node>
-            <node concept="1P9Npp" id="4RJJaubau2a" role="2OqNvi">
-              <node concept="37vLTw" id="4RJJaubau2b" role="1P9ThW">
-                <ref role="3cqZAo" node="4RJJaubau2K" resolve="newDecl" />
+            <node concept="1rXfSq" id="7oauUzsSzz0" role="33vP2m">
+              <ref role="37wK5l" node="4RJJaub9DpF" resolve="getInstancesOfDeclaration" />
+              <node concept="37vLTw" id="7oauUzsSzz1" role="37wK5m">
+                <ref role="3cqZAo" node="7oauUzsSzzB" resolve="oldDecl" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="1DcWWT" id="4RJJaubau2c" role="3cqZAp">
-          <node concept="3clFbS" id="4RJJaubau2d" role="2LFqv$">
-            <node concept="3cpWs8" id="4RJJaubau2e" role="3cqZAp">
-              <node concept="3cpWsn" id="4RJJaubau2f" role="3cpWs9">
-                <property role="TrG5h" value="index" />
-                <node concept="10Oyi0" id="4RJJaubau2g" role="1tU5fm" />
-                <node concept="2OqwBi" id="4RJJaubslYW" role="33vP2m">
-                  <node concept="37vLTw" id="4RJJaubslGu" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4RJJaubau2I" resolve="oldDecl" />
-                  </node>
-                  <node concept="2qgKlT" id="4RJJaubsmC9" role="2OqNvi">
-                    <ref role="37wK5l" to="pgas:4RJJaubsjNH" resolve="getIndexOfDifferenceInSorts" />
-                    <node concept="37vLTw" id="4RJJaubsmOc" role="37wK5m">
-                      <ref role="3cqZAo" node="4RJJaubau2K" resolve="newDecl" />
-                    </node>
-                  </node>
-                </node>
+        <node concept="3clFbF" id="7oauUzsSzz2" role="3cqZAp">
+          <node concept="2OqwBi" id="7oauUzsSzz3" role="3clFbG">
+            <node concept="37vLTw" id="7oauUzsSzz4" role="2Oq$k0">
+              <ref role="3cqZAo" node="7oauUzsSzzB" resolve="oldDecl" />
+            </node>
+            <node concept="1P9Npp" id="7oauUzsSzz5" role="2OqNvi">
+              <node concept="37vLTw" id="7oauUzsSzz6" role="1P9ThW">
+                <ref role="3cqZAo" node="7oauUzsSzzD" resolve="newDecl" />
               </node>
             </node>
-            <node concept="3cpWs8" id="4RJJaubau2k" role="3cqZAp">
-              <node concept="3cpWsn" id="4RJJaubau2l" role="3cpWs9">
+          </node>
+        </node>
+        <node concept="1DcWWT" id="7oauUzsSzze" role="3cqZAp">
+          <node concept="3clFbS" id="7oauUzsSzzf" role="2LFqv$">
+            <node concept="3cpWs8" id="7oauUzsSzzg" role="3cqZAp">
+              <node concept="3cpWsn" id="7oauUzsSzzh" role="3cpWs9">
                 <property role="TrG5h" value="newInstance" />
-                <node concept="3Tqbb2" id="4RJJaubau2m" role="1tU5fm">
+                <node concept="3Tqbb2" id="7oauUzsSzzi" role="1tU5fm">
                   <ref role="ehGHo" to="b83y:2_58u12fwJB" resolve="JudgmentInstance" />
                 </node>
-                <node concept="2OqwBi" id="4RJJaubau2n" role="33vP2m">
-                  <node concept="37vLTw" id="4RJJaubau2o" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4RJJaubau2B" resolve="instanceWithDeclaration" />
+                <node concept="2OqwBi" id="7oauUzsSzzj" role="33vP2m">
+                  <node concept="37vLTw" id="7oauUzsSzzk" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7oauUzsSzzz" resolve="instanceWithDeclaration" />
                   </node>
-                  <node concept="2qgKlT" id="4RJJaubau2p" role="2OqNvi">
+                  <node concept="2qgKlT" id="7oauUzsSzzl" role="2OqNvi">
                     <ref role="37wK5l" to="pgas:2loaFuj7QjI" resolve="removeSort" />
-                    <node concept="37vLTw" id="4RJJaubau2q" role="37wK5m">
-                      <ref role="3cqZAo" node="4RJJaubau2f" resolve="index" />
+                    <node concept="37vLTw" id="7oauUzsT1pQ" role="37wK5m">
+                      <ref role="3cqZAo" node="7oauUzsSUZ4" resolve="index" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="4RJJaubau2r" role="3cqZAp">
-              <node concept="2OqwBi" id="4RJJaubau2s" role="3clFbG">
-                <node concept="37vLTw" id="4RJJaubau2t" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4RJJaubau2B" resolve="instanceWithDeclaration" />
+            <node concept="3clFbF" id="7oauUzsSzzn" role="3cqZAp">
+              <node concept="2OqwBi" id="7oauUzsSzzo" role="3clFbG">
+                <node concept="37vLTw" id="7oauUzsSzzp" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7oauUzsSzzz" resolve="instanceWithDeclaration" />
                 </node>
-                <node concept="1P9Npp" id="4RJJaubau2u" role="2OqNvi">
-                  <node concept="37vLTw" id="4RJJaubau2v" role="1P9ThW">
-                    <ref role="3cqZAo" node="4RJJaubau2l" resolve="newInstance" />
+                <node concept="1P9Npp" id="7oauUzsSzzq" role="2OqNvi">
+                  <node concept="37vLTw" id="7oauUzsSzzr" role="1P9ThW">
+                    <ref role="3cqZAo" node="7oauUzsSzzh" resolve="newInstance" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="4RJJaubau2w" role="3cqZAp">
-              <node concept="2OqwBi" id="4RJJaubau2x" role="3clFbG">
-                <node concept="1PxgMI" id="4RJJaubau2y" role="2Oq$k0">
-                  <node concept="chp4Y" id="4RJJaubau2z" role="3oSUPX">
+            <node concept="3clFbF" id="7oauUzsSzzs" role="3cqZAp">
+              <node concept="2OqwBi" id="7oauUzsSzzt" role="3clFbG">
+                <node concept="1PxgMI" id="7oauUzsSzzu" role="2Oq$k0">
+                  <node concept="chp4Y" id="7oauUzsSzzv" role="3oSUPX">
                     <ref role="cht4Q" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
                   </node>
-                  <node concept="37vLTw" id="4RJJaubau2$" role="1m5AlR">
-                    <ref role="3cqZAo" node="4RJJaubau2l" resolve="newInstance" />
+                  <node concept="37vLTw" id="7oauUzsSzzw" role="1m5AlR">
+                    <ref role="3cqZAo" node="7oauUzsSzzh" resolve="newInstance" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="4RJJaubau2_" role="2OqNvi">
+                <node concept="2qgKlT" id="7oauUzsSzzx" role="2OqNvi">
                   <ref role="37wK5l" to="pgas:iMPJyMLTZV" resolve="setJudgment" />
-                  <node concept="37vLTw" id="4RJJaubau2A" role="37wK5m">
-                    <ref role="3cqZAo" node="4RJJaubau2K" resolve="newDecl" />
+                  <node concept="37vLTw" id="7oauUzsSzzy" role="37wK5m">
+                    <ref role="3cqZAo" node="7oauUzsSzzD" resolve="newDecl" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWsn" id="4RJJaubau2B" role="1Duv9x">
+          <node concept="3cpWsn" id="7oauUzsSzzz" role="1Duv9x">
             <property role="TrG5h" value="instanceWithDeclaration" />
-            <node concept="3Tqbb2" id="4RJJaubau2C" role="1tU5fm">
+            <node concept="3Tqbb2" id="7oauUzsSzz$" role="1tU5fm">
               <ref role="ehGHo" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
             </node>
           </node>
-          <node concept="37vLTw" id="4RJJaubau2D" role="1DdaDG">
-            <ref role="3cqZAo" node="4RJJaubau23" resolve="instancesOfDeclaration" />
+          <node concept="37vLTw" id="7oauUzsSzz_" role="1DdaDG">
+            <ref role="3cqZAo" node="7oauUzsSzyY" resolve="instancesOfDeclaration" />
           </node>
         </node>
       </node>
-      <node concept="3cqZAl" id="4RJJaubau2F" role="3clF45" />
-      <node concept="37vLTG" id="4RJJaubau2I" role="3clF46">
+      <node concept="3cqZAl" id="7oauUzsSzzA" role="3clF45" />
+      <node concept="37vLTG" id="7oauUzsSzzB" role="3clF46">
         <property role="TrG5h" value="oldDecl" />
-        <node concept="3Tqbb2" id="4RJJaubau2J" role="1tU5fm">
+        <node concept="3Tqbb2" id="7oauUzsSzzC" role="1tU5fm">
           <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
         </node>
       </node>
-      <node concept="37vLTG" id="4RJJaubau2K" role="3clF46">
+      <node concept="37vLTG" id="7oauUzsSzzD" role="3clF46">
         <property role="TrG5h" value="newDecl" />
-        <node concept="3Tqbb2" id="4RJJaubau2L" role="1tU5fm">
+        <node concept="3Tqbb2" id="7oauUzsSzzE" role="1tU5fm">
           <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="4RJJaubau2E" role="1B3o_S" />
+      <node concept="37vLTG" id="7oauUzsSUZ4" role="3clF46">
+        <property role="TrG5h" value="index" />
+        <node concept="10Oyi0" id="7oauUzsSYXi" role="1tU5fm" />
+      </node>
+      <node concept="3Tm1VV" id="7oauUzsSzzF" role="1B3o_S" />
     </node>
+    <node concept="2tJIrI" id="7oauUzsSvFC" role="jymVt" />
     <node concept="2tJIrI" id="6XUlM2nKY26" role="jymVt" />
     <node concept="3clFb_" id="6XUlM2nL3i2" role="jymVt">
       <property role="TrG5h" value="getRulesForDeclaration" />
@@ -9322,5 +9360,311 @@
     </node>
     <node concept="3Tm1VV" id="6XUlM2oz67u" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="7oauUzrT9ir">
+    <property role="TrG5h" value="ProjectNonUserInput2" />
+    <node concept="312cEg" id="7oauUzrT9yp" role="jymVt">
+      <property role="TrG5h" value="module" />
+      <node concept="3Tm6S6" id="7oauUzrT9yq" role="1B3o_S" />
+      <node concept="3Tqbb2" id="7oauUzrT9yr" role="1tU5fm">
+        <ref role="ehGHo" to="b83y:2_58u12cYEI" resolve="TypeLangModule" />
+      </node>
+      <node concept="10Nm6u" id="7oauUzrT9ys" role="33vP2m" />
+    </node>
+    <node concept="2tJIrI" id="7oauUzsLV8M" role="jymVt" />
+    <node concept="3clFbW" id="7oauUzsM1$v" role="jymVt">
+      <node concept="3cqZAl" id="7oauUzsM1$x" role="3clF45" />
+      <node concept="3Tm1VV" id="7oauUzsM1$y" role="1B3o_S" />
+      <node concept="3clFbS" id="7oauUzsM1$z" role="3clF47">
+        <node concept="3clFbF" id="7oauUzsM1Ek" role="3cqZAp">
+          <node concept="37vLTI" id="7oauUzsM2gC" role="3clFbG">
+            <node concept="37vLTw" id="7oauUzsM2jD" role="37vLTx">
+              <ref role="3cqZAo" node="7oauUzsM1Df" resolve="module" />
+            </node>
+            <node concept="2OqwBi" id="7oauUzsM1JK" role="37vLTJ">
+              <node concept="Xjq3P" id="7oauUzsM1Ej" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7oauUzsM1W_" role="2OqNvi">
+                <ref role="2Oxat5" node="7oauUzrT9yp" resolve="module" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7oauUzsM1Df" role="3clF46">
+        <property role="TrG5h" value="module" />
+        <node concept="3Tqbb2" id="7oauUzsM1De" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12cYEI" resolve="TypeLangModule" />
+        </node>
+      </node>
+    </node>
+    <node concept="3clFb_" id="7oauUzsLVa3" role="jymVt">
+      <property role="TrG5h" value="createProjectionDeclarationForSort" />
+      <node concept="3clFbS" id="7oauUzsLVa6" role="3clF47">
+        <node concept="3cpWs8" id="7oauUzrUAqh" role="3cqZAp">
+          <node concept="3cpWsn" id="7oauUzrUAqi" role="3cpWs9">
+            <property role="TrG5h" value="projectionJudgment" />
+            <node concept="3Tqbb2" id="7oauUzrUAqf" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="7oauUzrUAqj" role="33vP2m">
+              <node concept="37vLTw" id="7oauUzsLW$X" role="2Oq$k0">
+                <ref role="3cqZAo" node="7oauUzsLW0Q" resolve="declaration" />
+              </node>
+              <node concept="1$rogu" id="7oauUzrUAql" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7oauUzsh7Kk" role="3cqZAp">
+          <node concept="3cpWsn" id="7oauUzsh7Kl" role="3cpWs9">
+            <property role="TrG5h" value="indices" />
+            <node concept="A3Dl8" id="7oauUzsh7K9" role="1tU5fm">
+              <node concept="10Oyi0" id="7oauUzsh7Kc" role="A3Ik2" />
+            </node>
+            <node concept="2OqwBi" id="7oauUzsh7Km" role="33vP2m">
+              <node concept="2OqwBi" id="7oauUzsh7Kn" role="2Oq$k0">
+                <node concept="37vLTw" id="7oauUzsh7Ko" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+                </node>
+                <node concept="2qgKlT" id="7oauUzsh7Kp" role="2OqNvi">
+                  <ref role="37wK5l" to="pgas:7oauUzs6kXG" resolve="getNonUserSorts" />
+                </node>
+              </node>
+              <node concept="3$u5V9" id="7oauUzsh7Kq" role="2OqNvi">
+                <node concept="1bVj0M" id="7oauUzsh7Kr" role="23t8la">
+                  <node concept="3clFbS" id="7oauUzsh7Ks" role="1bW5cS">
+                    <node concept="3clFbF" id="7oauUzsh7Kt" role="3cqZAp">
+                      <node concept="2OqwBi" id="7oauUzsh7Ku" role="3clFbG">
+                        <node concept="2OqwBi" id="7oauUzsh7Kv" role="2Oq$k0">
+                          <node concept="37vLTw" id="7oauUzsh7Kw" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+                          </node>
+                          <node concept="2qgKlT" id="7oauUzsh7Kx" role="2OqNvi">
+                            <ref role="37wK5l" to="pgas:4XA4NEmGQRd" resolve="getSorts" />
+                          </node>
+                        </node>
+                        <node concept="2WmjW8" id="7oauUzsh7Ky" role="2OqNvi">
+                          <node concept="37vLTw" id="7oauUzsh7Kz" role="25WWJ7">
+                            <ref role="3cqZAo" node="7oauUzsh7K$" resolve="it" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="7oauUzsh7K$" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7oauUzsh7K_" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7oauUzshcAH" role="3cqZAp" />
+        <node concept="1DcWWT" id="7oauUzshhiO" role="3cqZAp">
+          <node concept="3clFbS" id="7oauUzshhiQ" role="2LFqv$">
+            <node concept="3clFbF" id="7oauUzrUJ_N" role="3cqZAp">
+              <node concept="37vLTI" id="7oauUzrUJZM" role="3clFbG">
+                <node concept="2OqwBi" id="7oauUzrUKa6" role="37vLTx">
+                  <node concept="37vLTw" id="7oauUzs1jIY" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+                  </node>
+                  <node concept="2qgKlT" id="7oauUzrULgN" role="2OqNvi">
+                    <ref role="37wK5l" to="pgas:4XA4NEmJ4Wv" resolve="removeSort" />
+                    <node concept="37vLTw" id="7oauUzrULmT" role="37wK5m">
+                      <ref role="3cqZAo" node="7oauUzshhiR" resolve="index" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="7oauUzrUJ_L" role="37vLTJ">
+                  <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="7oauUzshhiR" role="1Duv9x">
+            <property role="TrG5h" value="index" />
+            <node concept="10Oyi0" id="7oauUzshhHV" role="1tU5fm" />
+          </node>
+          <node concept="2OqwBi" id="7oauUzsjfWw" role="1DdaDG">
+            <node concept="37vLTw" id="7oauUzshhY0" role="2Oq$k0">
+              <ref role="3cqZAo" node="7oauUzsh7Kl" resolve="indices" />
+            </node>
+            <node concept="2DpFxk" id="7oauUzsjA51" role="2OqNvi">
+              <node concept="1bVj0M" id="7oauUzsjA53" role="23t8la">
+                <node concept="3clFbS" id="7oauUzsjA54" role="1bW5cS">
+                  <node concept="3clFbF" id="7oauUzsjAhq" role="3cqZAp">
+                    <node concept="3cpWsd" id="7oauUzsjB7i" role="3clFbG">
+                      <node concept="37vLTw" id="7oauUzsjB7l" role="3uHU7w">
+                        <ref role="3cqZAo" node="7oauUzsjA57" resolve="b" />
+                      </node>
+                      <node concept="37vLTw" id="7oauUzsjAhp" role="3uHU7B">
+                        <ref role="3cqZAo" node="7oauUzsjA55" resolve="a" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="7oauUzsjA55" role="1bW2Oz">
+                  <property role="TrG5h" value="a" />
+                  <node concept="2jxLKc" id="7oauUzsjA56" role="1tU5fm" />
+                </node>
+                <node concept="Rh6nW" id="7oauUzsjA57" role="1bW2Oz">
+                  <property role="TrG5h" value="b" />
+                  <node concept="2jxLKc" id="7oauUzsjA58" role="1tU5fm" />
+                </node>
+              </node>
+              <node concept="1nlBCl" id="7oauUzsjCrZ" role="2Dq5b$" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7oauUzrULzF" role="3cqZAp">
+          <node concept="37vLTI" id="7oauUzrUOya" role="3clFbG">
+            <node concept="37vLTw" id="7oauUzrUOJI" role="37vLTJ">
+              <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+            </node>
+            <node concept="2OqwBi" id="7oauUzrULNw" role="37vLTx">
+              <node concept="37vLTw" id="7oauUzs1jRL" role="2Oq$k0">
+                <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+              </node>
+              <node concept="2qgKlT" id="7oauUzrUM0z" role="2OqNvi">
+                <ref role="37wK5l" to="pgas:677Mj2_GY7K" resolve="addSort" />
+                <node concept="2pJPEk" id="7oauUzrUM6v" role="37wK5m">
+                  <node concept="2pJPED" id="7oauUzrUMe0" role="2pJPEn">
+                    <ref role="2pJxaS" to="b83y:2_58u12cYDt" resolve="Delimiter" />
+                    <node concept="2pJxcG" id="7oauUzrUMm4" role="2pJxcM">
+                      <ref role="2pJxcJ" to="b83y:2_58u12cYDu" resolve="text" />
+                      <node concept="Xl_RD" id="7oauUzrUMqH" role="2pJxcZ">
+                        <property role="Xl_RC" value="=&gt;" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="7oauUzsLYSb" role="37wK5m">
+                  <ref role="3cqZAo" node="7oauUzsLXaT" resolve="sortToProject" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7oauUzswU9_" role="3cqZAp">
+          <node concept="2OqwBi" id="7oauUzswUFc" role="3clFbG">
+            <node concept="37vLTw" id="7oauUzswU9z" role="2Oq$k0">
+              <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+            </node>
+            <node concept="2qgKlT" id="7oauUzswVRI" role="2OqNvi">
+              <ref role="37wK5l" to="pgas:5bZNdPkea12" resolve="setPre" />
+              <node concept="2pJPEk" id="7oauUzsx6lV" role="37wK5m">
+                <node concept="2pJPED" id="7oauUzsx6wd" role="2pJPEn">
+                  <ref role="2pJxaS" to="b83y:2_58u12cYDt" resolve="Delimiter" />
+                  <node concept="2pJxcG" id="7oauUzsx6B$" role="2pJxcM">
+                    <ref role="2pJxcJ" to="b83y:2_58u12cYDu" resolve="text" />
+                    <node concept="3cpWs3" id="7oauUzsx9ax" role="2pJxcZ">
+                      <node concept="2OqwBi" id="7oauUzsxdAO" role="3uHU7w">
+                        <node concept="2OqwBi" id="7oauUzsxauW" role="2Oq$k0">
+                          <node concept="1PxgMI" id="7oauUzsx9Td" role="2Oq$k0">
+                            <node concept="chp4Y" id="7oauUzsxabe" role="3oSUPX">
+                              <ref role="cht4Q" to="b83y:2_58u12cYwo" resolve="SortConcept" />
+                            </node>
+                            <node concept="37vLTw" id="7oauUzsLZ6x" role="1m5AlR">
+                              <ref role="3cqZAo" node="7oauUzsLXaT" resolve="sortToProject" />
+                            </node>
+                          </node>
+                          <node concept="3TrEf2" id="7oauUzsxc8C" role="2OqNvi">
+                            <ref role="3Tt5mk" to="b83y:2_58u12cYws" resolve="sort" />
+                          </node>
+                        </node>
+                        <node concept="3TrcHB" id="7oauUzsxf_5" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                      </node>
+                      <node concept="3cpWs3" id="7oauUzsx8e2" role="3uHU7B">
+                        <node concept="2OqwBi" id="7oauUzswW96" role="3uHU7B">
+                          <node concept="37vLTw" id="7oauUzswVXF" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+                          </node>
+                          <node concept="3TrcHB" id="7oauUzsziW4" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="7oauUzsx8e5" role="3uHU7w">
+                          <property role="Xl_RC" value="_" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7oauUzrUQ3j" role="3cqZAp">
+          <node concept="37vLTI" id="7oauUzrUSGE" role="3clFbG">
+            <node concept="3cpWs3" id="7oauUzrUVK9" role="37vLTx">
+              <node concept="2OqwBi" id="7oauUzrV0Ih" role="3uHU7w">
+                <node concept="2OqwBi" id="7oauUzrUX_P" role="2Oq$k0">
+                  <node concept="1PxgMI" id="7oauUzrUX7I" role="2Oq$k0">
+                    <node concept="chp4Y" id="7oauUzrUXlV" role="3oSUPX">
+                      <ref role="cht4Q" to="b83y:2_58u12cYwo" resolve="SortConcept" />
+                    </node>
+                    <node concept="37vLTw" id="7oauUzsM10O" role="1m5AlR">
+                      <ref role="3cqZAo" node="7oauUzsLXaT" resolve="sortToProject" />
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="7oauUzrUZbH" role="2OqNvi">
+                    <ref role="3Tt5mk" to="b83y:2_58u12cYws" resolve="sort" />
+                  </node>
+                </node>
+                <node concept="3TrcHB" id="7oauUzrV2CI" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+              <node concept="3cpWs3" id="7oauUzrUUZF" role="3uHU7B">
+                <node concept="2OqwBi" id="7oauUzrUSXY" role="3uHU7B">
+                  <node concept="37vLTw" id="7oauUzrUSJR" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+                  </node>
+                  <node concept="3TrcHB" id="7oauUzrUTUk" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="7oauUzrUUZI" role="3uHU7w">
+                  <property role="Xl_RC" value="_" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7oauUzrUQfh" role="37vLTJ">
+              <node concept="37vLTw" id="7oauUzs1jWz" role="2Oq$k0">
+                <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+              </node>
+              <node concept="3TrcHB" id="7oauUzrURqy" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="7oauUzsLZZC" role="3cqZAp">
+          <node concept="37vLTw" id="7oauUzsM0t4" role="3cqZAk">
+            <ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionJudgment" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7oauUzsLV9s" role="1B3o_S" />
+      <node concept="3Tqbb2" id="7oauUzsLV9Q" role="3clF45">
+        <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+      </node>
+      <node concept="37vLTG" id="7oauUzsLW0Q" role="3clF46">
+        <property role="TrG5h" value="declaration" />
+        <node concept="3Tqbb2" id="7oauUzsLW0P" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7oauUzsLXaT" role="3clF46">
+        <property role="TrG5h" value="sortToProject" />
+        <node concept="3Tqbb2" id="7oauUzsLYOh" role="1tU5fm">
+          <ref role="ehGHo" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7oauUzrT9yf" role="jymVt" />
+    <node concept="3Tm1VV" id="7oauUzrT9is" role="1B3o_S" />
+  </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 fde9b66dc4d45719bb0e2c8cac03d4df39cc69c2..4b38eba1d897bea86ad2428ee3937abb08456a9e 100644
--- a/inca-translation/languages/TypeLang/generator/template/main@generator.mps
+++ b/inca-translation/languages/TypeLang/generator/template/main@generator.mps
@@ -80,10 +80,13 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="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="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -121,7 +124,9 @@
       <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="7830515785164762753" name="jetbrains.mps.lang.generator.structure.MappingConfiguration_Condition" flags="in" index="avzCv" />
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
+        <child id="7830515785164764091" name="condition" index="avys_" />
         <child id="1195502100749" name="preMappingScript" index="1puA0r" />
       </concept>
       <concept id="1195499912406" name="jetbrains.mps.lang.generator.structure.MappingScript" flags="lg" index="1pmfR0">
@@ -220,9 +225,19 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
+        <property id="709746936026609031" name="linkId" index="3V$3ak" />
+        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
+      </concept>
+      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
+        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
+      </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -238,8 +253,10 @@
       <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="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+      <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <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" />
@@ -251,12 +268,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="bUwia" id="2_58u12cYir">
-    <property role="TrG5h" value="mergeContextProjectionLookupConfig" />
-    <node concept="1puMqW" id="2iwoW_qGyTa" role="1puA0r">
-      <ref role="1puQsG" node="6XUlM2nKRm7" resolve="mergeContextProjectionLookup" />
-    </node>
-  </node>
   <node concept="1pmfR0" id="4XA4NEmGx5U">
     <property role="TrG5h" value="eliminateRecursiveInputFromJudgment" />
     <property role="1v3f2W" value="pre_processing" />
@@ -2422,10 +2433,306 @@
       <ref role="1puQsG" node="2U2uJPpucId" resolve="compileToInca" />
     </node>
   </node>
-  <node concept="bUwia" id="6OMXo1PTnfA">
-    <property role="TrG5h" value="eliminateContextByProjectionConfig" />
-    <node concept="1puMqW" id="6OMXo1PTwRj" role="1puA0r">
-      <ref role="1puQsG" node="7DdCaEODx6h" resolve="eliminateContextByProjection" />
+  <node concept="1pmfR0" id="7oauUzrSZ8A">
+    <property role="TrG5h" value="eliminateInfiniteInputsByProjection" />
+    <property role="1v3f2W" value="pre_processing" />
+    <property role="1v3jST" value="true" />
+    <node concept="1pplIY" id="7oauUzrSZ8B" role="1pqMTA">
+      <node concept="3clFbS" id="7oauUzrSZ8C" role="2VODD2">
+        <node concept="3cpWs8" id="7oauUzrSZpc" role="3cqZAp">
+          <node concept="3cpWsn" id="7oauUzrSZpd" role="3cpWs9">
+            <property role="TrG5h" value="modules" />
+            <node concept="2I9FWS" id="7oauUzrSZpb" role="1tU5fm">
+              <ref role="2I9WkF" to="b83y:2_58u12cYEI" resolve="TypeLangModule" />
+            </node>
+            <node concept="2YIFZM" id="7oauUzrSZpe" role="33vP2m">
+              <ref role="37wK5l" to="5tos:4RJJaubbks$" resolve="getTypeLangModules" />
+              <ref role="1Pybhc" to="5tos:32CDcOyGKwu" resolve="TypeLangModuleQuerier" />
+              <node concept="1Q6Npb" id="7oauUzrSZpf" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="7oauUzrSZti" role="3cqZAp">
+          <node concept="3clFbS" id="7oauUzrSZtk" role="2LFqv$">
+            <node concept="3cpWs8" id="7oauUzrT2MP" role="3cqZAp">
+              <node concept="3cpWsn" id="7oauUzrT2MQ" role="3cpWs9">
+                <property role="TrG5h" value="querier" />
+                <node concept="3uibUv" id="7oauUzrT2ML" role="1tU5fm">
+                  <ref role="3uigEE" to="5tos:32CDcOyGKwu" resolve="TypeLangModuleQuerier" />
+                </node>
+                <node concept="2ShNRf" id="7oauUzrT2MR" role="33vP2m">
+                  <node concept="1pGfFk" id="7oauUzrT2MS" role="2ShVmc">
+                    <ref role="37wK5l" to="5tos:4RJJaub9nwG" resolve="TypeLangModuleQuerier" />
+                    <node concept="37vLTw" id="7oauUzrT2MT" role="37wK5m">
+                      <ref role="3cqZAo" node="7oauUzrSZtl" resolve="module" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="7oauUzsM84r" role="3cqZAp">
+              <node concept="3cpWsn" id="7oauUzsM84s" role="3cpWs9">
+                <property role="TrG5h" value="projectNonUserInput" />
+                <node concept="3uibUv" id="7oauUzsM84q" role="1tU5fm">
+                  <ref role="3uigEE" to="5tos:7oauUzrT9ir" resolve="ProjectNonUserInput2" />
+                </node>
+                <node concept="2ShNRf" id="7oauUzsM84t" role="33vP2m">
+                  <node concept="1pGfFk" id="7oauUzsM84u" role="2ShVmc">
+                    <ref role="37wK5l" to="5tos:7oauUzsM1$v" resolve="ProjectNonUserInput2" />
+                    <node concept="37vLTw" id="7oauUzsMd8b" role="37wK5m">
+                      <ref role="3cqZAo" node="7oauUzrSZtl" resolve="module" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="7oauUzrT39d" role="3cqZAp">
+              <node concept="3cpWsn" id="7oauUzrT39e" role="3cpWs9">
+                <property role="TrG5h" value="declarationsWithUserAndNonUserInput" />
+                <node concept="2I9FWS" id="7oauUzrT39b" role="1tU5fm">
+                  <ref role="2I9WkF" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+                </node>
+                <node concept="2OqwBi" id="7oauUzrT39f" role="33vP2m">
+                  <node concept="37vLTw" id="7oauUzrT39g" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7oauUzrT2MQ" resolve="querier" />
+                  </node>
+                  <node concept="liA8E" id="7oauUzrT39h" role="2OqNvi">
+                    <ref role="37wK5l" to="5tos:2iwoW_qmyLT" resolve="getDeclarationsWithUserAndNonUserInput" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="7oauUzrTd_w" role="3cqZAp" />
+            <node concept="1DcWWT" id="7oauUzrT3d6" role="3cqZAp">
+              <node concept="3clFbS" id="7oauUzrT3d8" role="2LFqv$">
+                <node concept="3SKdUt" id="7oauUzrTmAA" role="3cqZAp">
+                  <node concept="3SKdUq" id="7oauUzrTj1h" role="3SKWNk">
+                    <property role="3SKdUp" value="generate a projection judgment for each non user input of declaration" />
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="7oauUzrTd0s" role="3cqZAp">
+                  <node concept="3cpWsn" id="7oauUzrTd0t" role="3cpWs9">
+                    <property role="TrG5h" value="nonUserInputSorts" />
+                    <node concept="2I9FWS" id="7oauUzrTd0p" role="1tU5fm">
+                      <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+                    </node>
+                    <node concept="2OqwBi" id="7oauUzrTd0u" role="33vP2m">
+                      <node concept="37vLTw" id="7oauUzrTd0v" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7oauUzrT3d9" resolve="declaration" />
+                      </node>
+                      <node concept="2qgKlT" id="7oauUzs8vbB" role="2OqNvi">
+                        <ref role="37wK5l" to="pgas:2iwoW_qn4iq" resolve="getNonUserInputSorts" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="7oauUzsBns4" role="3cqZAp" />
+                <node concept="3cpWs8" id="7oauUzsBL4S" role="3cqZAp">
+                  <node concept="3cpWsn" id="7oauUzsBL4T" role="3cpWs9">
+                    <property role="TrG5h" value="newDeclaration" />
+                    <node concept="3Tqbb2" id="7oauUzsBL4O" role="1tU5fm">
+                      <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+                    </node>
+                    <node concept="37vLTw" id="7oauUzsBL4V" role="33vP2m">
+                      <ref role="3cqZAo" node="7oauUzrT3d9" resolve="declaration" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1DcWWT" id="7oauUzrTdo5" role="3cqZAp">
+                  <node concept="3clFbS" id="7oauUzrTdo7" role="2LFqv$">
+                    <node concept="3clFbH" id="7oauUzrTYG0" role="3cqZAp" />
+                    <node concept="3cpWs8" id="7oauUzsMev0" role="3cqZAp">
+                      <node concept="3cpWsn" id="7oauUzsMev1" role="3cpWs9">
+                        <property role="TrG5h" value="projectionJudgment" />
+                        <node concept="3Tqbb2" id="7oauUzsMeuS" role="1tU5fm">
+                          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+                        </node>
+                        <node concept="2OqwBi" id="7oauUzsMev2" role="33vP2m">
+                          <node concept="37vLTw" id="7oauUzsMev3" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7oauUzsM84s" resolve="projectNonUserInput" />
+                          </node>
+                          <node concept="liA8E" id="7oauUzsMev4" role="2OqNvi">
+                            <ref role="37wK5l" to="5tos:7oauUzsLVa3" resolve="createProjectionDeclarationForSort" />
+                            <node concept="37vLTw" id="7oauUzsMev5" role="37wK5m">
+                              <ref role="3cqZAo" node="7oauUzrT3d9" resolve="declaration" />
+                            </node>
+                            <node concept="37vLTw" id="7oauUzsMev6" role="37wK5m">
+                              <ref role="3cqZAo" node="7oauUzrTdo8" resolve="nonUserSortToProject" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7oauUzrUOXV" role="3cqZAp">
+                      <node concept="2OqwBi" id="7oauUzrUP9J" role="3clFbG">
+                        <node concept="37vLTw" id="7oauUzsXE_X" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7oauUzsBL4T" resolve="newDeclaration" />
+                        </node>
+                        <node concept="HtI8k" id="7oauUzrUPSA" role="2OqNvi">
+                          <node concept="37vLTw" id="7oauUzsMeQT" role="HtI8F">
+                            <ref role="3cqZAo" node="7oauUzsMev1" resolve="projectionJudgment" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="7oauUzsnLA_" role="3cqZAp" />
+                    <node concept="3cpWs8" id="7oauUzsnY6s" role="3cqZAp">
+                      <node concept="3cpWsn" id="7oauUzsnY6t" role="3cpWs9">
+                        <property role="TrG5h" value="index" />
+                        <node concept="10Oyi0" id="7oauUzsnY6m" role="1tU5fm" />
+                        <node concept="2OqwBi" id="7oauUzsnY6u" role="33vP2m">
+                          <node concept="2OqwBi" id="7oauUzsnY6v" role="2Oq$k0">
+                            <node concept="37vLTw" id="7oauUzsnY6w" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7oauUzrT3d9" resolve="declaration" />
+                            </node>
+                            <node concept="2qgKlT" id="7oauUzsnY6x" role="2OqNvi">
+                              <ref role="37wK5l" to="pgas:4XA4NEmGQRd" resolve="getSorts" />
+                            </node>
+                          </node>
+                          <node concept="2WmjW8" id="7oauUzsnY6y" role="2OqNvi">
+                            <node concept="37vLTw" id="7oauUzsnY6z" role="25WWJ7">
+                              <ref role="3cqZAo" node="7oauUzrTdo8" resolve="nonUserSortToProject" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="7oauUzsOfM7" role="3cqZAp">
+                      <node concept="3cpWsn" id="7oauUzsOfM8" role="3cpWs9">
+                        <property role="TrG5h" value="newerDeclaration" />
+                        <node concept="3Tqbb2" id="7oauUzsOfM6" role="1tU5fm">
+                          <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+                        </node>
+                        <node concept="2OqwBi" id="7oauUzsBS_K" role="33vP2m">
+                          <node concept="37vLTw" id="7oauUzsBSsg" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7oauUzsBL4T" resolve="newDeclaration" />
+                          </node>
+                          <node concept="2qgKlT" id="7oauUzsBTGu" role="2OqNvi">
+                            <ref role="37wK5l" to="pgas:4XA4NEmJ4Wv" resolve="removeSort" />
+                            <node concept="37vLTw" id="7oauUzsBTMD" role="37wK5m">
+                              <ref role="3cqZAo" node="7oauUzsnY6t" resolve="index" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="7oauUzsOeXW" role="3cqZAp" />
+                    <node concept="3clFbF" id="7oauUzsuPwW" role="3cqZAp">
+                      <node concept="2OqwBi" id="7oauUzsuPYz" role="3clFbG">
+                        <node concept="37vLTw" id="7oauUzsuPwU" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7oauUzrT2MQ" resolve="querier" />
+                        </node>
+                        <node concept="liA8E" id="7oauUzsuR6b" role="2OqNvi">
+                          <ref role="37wK5l" to="5tos:7oauUzsSzyV" resolve="replaceInstancesOfDeclarationWithIndex" />
+                          <node concept="37vLTw" id="7oauUzsOfGz" role="37wK5m">
+                            <ref role="3cqZAo" node="7oauUzsBL4T" resolve="newDeclaration" />
+                          </node>
+                          <node concept="37vLTw" id="7oauUzsOglb" role="37wK5m">
+                            <ref role="3cqZAo" node="7oauUzsOfM8" resolve="newerDeclaration" />
+                          </node>
+                          <node concept="37vLTw" id="7oauUzsTzGR" role="37wK5m">
+                            <ref role="3cqZAo" node="7oauUzsnY6t" resolve="index" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7oauUzsOh2D" role="3cqZAp">
+                      <node concept="37vLTI" id="7oauUzsOhv1" role="3clFbG">
+                        <node concept="37vLTw" id="7oauUzsOhvG" role="37vLTx">
+                          <ref role="3cqZAo" node="7oauUzsOfM8" resolve="newerDeclaration" />
+                        </node>
+                        <node concept="37vLTw" id="7oauUzsOh2B" role="37vLTJ">
+                          <ref role="3cqZAo" node="7oauUzsBL4T" resolve="newDeclaration" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWsn" id="7oauUzrTdo8" role="1Duv9x">
+                    <property role="TrG5h" value="nonUserSortToProject" />
+                    <node concept="3Tqbb2" id="7oauUzrTeZH" role="1tU5fm">
+                      <ref role="ehGHo" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="7oauUzsBCWE" role="1DdaDG">
+                    <node concept="37vLTw" id="7oauUzrTfwQ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7oauUzrTd0t" resolve="nonUserInputSorts" />
+                    </node>
+                    <node concept="35Qw8J" id="7oauUzsBFPx" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="1X3_iC" id="7oauUzsOhys" role="lGtFl">
+                  <property role="3V$3am" value="statement" />
+                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                  <node concept="3clFbF" id="7oauUzsJMxc" role="8Wnug">
+                    <node concept="2OqwBi" id="7oauUzsJO2D" role="3clFbG">
+                      <node concept="37vLTw" id="7oauUzsJMxa" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7oauUzrT2MQ" resolve="querier" />
+                      </node>
+                      <node concept="liA8E" id="7oauUzsJPaq" role="2OqNvi">
+                        <ref role="37wK5l" to="5tos:4RJJaubau1Z" resolve="replaceInstancesOfDeclaration" />
+                        <node concept="37vLTw" id="7oauUzsJPi6" role="37wK5m">
+                          <ref role="3cqZAo" node="7oauUzrT3d9" resolve="declaration" />
+                        </node>
+                        <node concept="37vLTw" id="7oauUzsJPsp" role="37wK5m">
+                          <ref role="3cqZAo" node="7oauUzsBL4T" resolve="newDeclaration" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="7oauUzsnE54" role="3cqZAp" />
+                <node concept="3SKdUt" id="7oauUzsnH4e" role="3cqZAp">
+                  <node concept="3SKdUq" id="7oauUzsnH4g" role="3SKWNk">
+                    <property role="3SKdUp" value="TODO generate rules for projection" />
+                  </node>
+                </node>
+                <node concept="3SKdUt" id="7oauUzsnK6R" role="3cqZAp">
+                  <node concept="3SKdUq" id="7oauUzsnK6T" role="3SKWNk">
+                    <property role="3SKdUp" value="TODO rewrite declarations without " />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWsn" id="7oauUzrT3d9" role="1Duv9x">
+                <property role="TrG5h" value="declaration" />
+                <node concept="3Tqbb2" id="7oauUzrT3mM" role="1tU5fm">
+                  <ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="7oauUzrT3QP" role="1DdaDG">
+                <ref role="3cqZAo" node="7oauUzrT39e" resolve="declarationsWithUserAndNonUserInput" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="7oauUzrSZtl" role="1Duv9x">
+            <property role="TrG5h" value="module" />
+            <node concept="3Tqbb2" id="7oauUzrSZAI" role="1tU5fm">
+              <ref role="ehGHo" to="b83y:2_58u12cYEI" resolve="TypeLangModule" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="7oauUzrSZYL" role="1DdaDG">
+            <ref role="3cqZAo" node="7oauUzrSZpd" resolve="modules" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="bUwia" id="7oauUzrSZ8L">
+    <property role="TrG5h" value="eliminateInfiniteInputsByProjectionConfig" />
+    <node concept="1puMqW" id="7oauUzrSZ8M" role="1puA0r">
+      <ref role="1puQsG" node="7oauUzrSZ8A" resolve="eliminateInfiniteInputsByProjection" />
+    </node>
+  </node>
+  <node concept="bUwia" id="2_58u12cYir">
+    <property role="TrG5h" value="mergeContextProjectionLookupConfig" />
+    <node concept="1puMqW" id="2iwoW_qGyTa" role="1puA0r">
+      <ref role="1puQsG" node="6XUlM2nKRm7" resolve="mergeContextProjectionLookup" />
+    </node>
+    <node concept="avzCv" id="7oauUzs8xUe" role="avys_">
+      <node concept="3clFbS" id="7oauUzs8xUf" role="2VODD2">
+        <node concept="3cpWs6" id="7oauUzs8y1_" role="3cqZAp">
+          <node concept="3clFbT" id="7oauUzs8y95" role="3cqZAk" />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="bUwia" id="6OMXo1PTnfC">
@@ -2433,6 +2740,26 @@
     <node concept="1puMqW" id="6OMXo1PTwRf" role="1puA0r">
       <ref role="1puQsG" node="4XA4NEmGx5U" resolve="eliminateRecursiveInputFromJudgment" />
     </node>
+    <node concept="avzCv" id="7oauUzs8xzR" role="avys_">
+      <node concept="3clFbS" id="7oauUzs8xzS" role="2VODD2">
+        <node concept="3cpWs6" id="7oauUzs8xFe" role="3cqZAp">
+          <node concept="3clFbT" id="7oauUzs8xMI" role="3cqZAk" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="bUwia" id="6OMXo1PTnfA">
+    <property role="TrG5h" value="eliminateContextByProjectionConfig" />
+    <node concept="1puMqW" id="6OMXo1PTwRj" role="1puA0r">
+      <ref role="1puQsG" node="7DdCaEODx6h" resolve="eliminateContextByProjection" />
+    </node>
+    <node concept="avzCv" id="7oauUzs8xdw" role="avys_">
+      <node concept="3clFbS" id="7oauUzs8xdx" role="2VODD2">
+        <node concept="3cpWs6" id="7oauUzs8xkR" role="3cqZAp">
+          <node concept="3clFbT" id="7oauUzs8xsn" role="3cqZAk" />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/inca-translation/languages/TypeLang/models/behavior.mps b/inca-translation/languages/TypeLang/models/behavior.mps
index aeb918467b7aec15dbbe8dd213ffee71470318ff..32d1ca3ee96f9b82efb17e0b5e476a818fa2e26f 100644
--- a/inca-translation/languages/TypeLang/models/behavior.mps
+++ b/inca-translation/languages/TypeLang/models/behavior.mps
@@ -131,6 +131,9 @@
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </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" />
@@ -1062,6 +1065,71 @@
         <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
       </node>
     </node>
+    <node concept="13i0hz" id="7oauUzs6kXG" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getNonUserSorts" />
+      <node concept="3Tm1VV" id="7oauUzs6kXH" role="1B3o_S" />
+      <node concept="3clFbS" id="7oauUzs6kXI" role="3clF47">
+        <node concept="3clFbF" id="7oauUzs6kXJ" role="3cqZAp">
+          <node concept="2OqwBi" id="7oauUzs6kXK" role="3clFbG">
+            <node concept="2OqwBi" id="7oauUzs6kXL" role="2Oq$k0">
+              <node concept="BsUDl" id="7oauUzs6kXM" role="2Oq$k0">
+                <ref role="37wK5l" node="4XA4NEmGQRd" resolve="getSorts" />
+              </node>
+              <node concept="3zZkjj" id="7oauUzs6kXN" role="2OqNvi">
+                <node concept="1bVj0M" id="7oauUzs6kXO" role="23t8la">
+                  <node concept="3clFbS" id="7oauUzs6kXP" role="1bW5cS">
+                    <node concept="3clFbF" id="7oauUzs6kXQ" role="3cqZAp">
+                      <node concept="22lmx$" id="7oauUzscwsg" role="3clFbG">
+                        <node concept="2OqwBi" id="7oauUzsgrzy" role="3uHU7B">
+                          <node concept="37vLTw" id="7oauUzsgrzz" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7oauUzs6kXZ" resolve="it" />
+                          </node>
+                          <node concept="2qgKlT" id="7oauUzsgrz$" role="2OqNvi">
+                            <ref role="37wK5l" node="2U2uJPpeU0b" resolve="isInfiniteNonlatticeOutput" />
+                          </node>
+                        </node>
+                        <node concept="1eOMI4" id="7oauUzsgrz_" role="3uHU7w">
+                          <node concept="1Wc70l" id="7oauUzsgrzA" role="1eOMHV">
+                            <node concept="3fqX7Q" id="7oauUzsgrzB" role="3uHU7w">
+                              <node concept="2OqwBi" id="7oauUzsgrzC" role="3fr31v">
+                                <node concept="37vLTw" id="7oauUzsgrzD" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7oauUzs6kXZ" resolve="it" />
+                                </node>
+                                <node concept="2qgKlT" id="7oauUzsgrzE" role="2OqNvi">
+                                  <ref role="37wK5l" node="2iwoW_q825k" resolve="isUserInput" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="7oauUzsgrzF" role="3uHU7B">
+                              <node concept="37vLTw" id="7oauUzsgrzG" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7oauUzs6kXZ" resolve="it" />
+                              </node>
+                              <node concept="2qgKlT" id="7oauUzsgrzH" role="2OqNvi">
+                                <ref role="37wK5l" node="2U2uJPpePaZ" resolve="isInfiniteInput" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="7oauUzs6kXZ" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7oauUzs6kY0" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="7oauUzs6kY1" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="2I9FWS" id="7oauUzs6kY2" role="3clF45">
+        <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+      </node>
+    </node>
     <node concept="13i0hz" id="2U2uJPpurJc" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />