diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps
index 40e143cc660..3f1dc33ad4a 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps
@@ -176,7 +176,6 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -273,10 +272,10 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <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="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
@@ -801,38 +800,12 @@
               <node concept="2ShNRf" id="2yaxsm5o3KY" role="37wK5m">
                 <node concept="1pGfFk" id="jgTeXj2AHS" role="2ShVmc">
                   <ref role="37wK5l" to="2ahs:2yaxsm5jILI" resolve="CombinedInterpreter" />
-                  <node concept="2OqwBi" id="48h5VLcj6ZO" role="37wK5m">
-                    <node concept="2OqwBi" id="48h5VLcj6ZP" role="2Oq$k0">
-                      <node concept="2OqwBi" id="48h5VLcj6ZQ" role="2Oq$k0">
-                        <node concept="2YIFZM" id="48h5VLcj6ZR" role="2Oq$k0">
-                          <ref role="1Pybhc" to="2ahs:6t6gMvcKSR1" resolve="CachedInterpreterFinder" />
-                          <ref role="37wK5l" to="2ahs:6t6gMvcMFOM" resolve="getInstance" />
-                        </node>
-                        <node concept="liA8E" id="48h5VLcj6ZS" role="2OqNvi">
-                          <ref role="37wK5l" to="2ahs:6t6gMvcMGib" resolve="findAllInterpreters" />
-                        </node>
-                      </node>
-                      <node concept="3$u5V9" id="48h5VLcj6ZU" role="2OqNvi">
-                        <node concept="1bVj0M" id="48h5VLcj6ZV" role="23t8la">
-                          <node concept="3clFbS" id="48h5VLcj6ZW" role="1bW5cS">
-                            <node concept="3clFbF" id="48h5VLcj6ZX" role="3cqZAp">
-                              <node concept="2YIFZM" id="48h5VLcj6ZY" role="3clFbG">
-                                <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
-                                <ref role="37wK5l" to="2ahs:4jkUBhBVOKX" resolve="getInterpreterExecutable" />
-                                <node concept="37vLTw" id="48h5VLcj6ZZ" role="37wK5m">
-                                  <ref role="3cqZAo" node="2SR9xrsN1rO" resolve="it" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="gl6BB" id="2SR9xrsN1rO" role="1bW2Oz">
-                            <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2SR9xrsN1rP" role="1tU5fm" />
-                          </node>
-                        </node>
-                      </node>
+                  <node concept="2OqwBi" id="2PA_oGfbOk5" role="37wK5m">
+                    <node concept="3_kTaI" id="2PA_oGfbQWl" role="2OqNvi" />
+                    <node concept="2YIFZM" id="2PA_oGfbFGC" role="2Oq$k0">
+                      <ref role="37wK5l" to="2ahs:2PA_oGfak8K" resolve="findAllInterpreterExecutables" />
+                      <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
                     </node>
-                    <node concept="3_kTaI" id="48h5VLcj702" role="2OqNvi" />
                   </node>
                 </node>
               </node>
@@ -1007,15 +980,15 @@
                         <node concept="3clFbF" id="4yPv6wmQBIT" role="3cqZAp">
                           <node concept="2OqwBi" id="4yPv6wmQBXP" role="3clFbG">
                             <node concept="37vLTw" id="4yPv6wmQBIS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2SR9xrsN1rQ" resolve="it" />
+                              <ref role="3cqZAo" node="4yPv6wmQBkB" resolve="it" />
                             </node>
                             <node concept="2Rf3mk" id="4yPv6wmQCO$" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="gl6BB" id="2SR9xrsN1rQ" role="1bW2Oz">
+                      <node concept="Rh6nW" id="4yPv6wmQBkB" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2SR9xrsN1rR" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4yPv6wmQBkC" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1036,7 +1009,7 @@
                       <node concept="2OqwBi" id="4rj4sdBt67j" role="3clFbG">
                         <node concept="2JrnkZ" id="4rj4sdBt67k" role="2Oq$k0">
                           <node concept="37vLTw" id="4rj4sdBt67l" role="2JrQYb">
-                            <ref role="3cqZAo" node="2SR9xrsN1rS" resolve="it" />
+                            <ref role="3cqZAo" node="4rj4sdBt67o" resolve="it" />
                           </node>
                         </node>
                         <node concept="liA8E" id="4rj4sdBt67m" role="2OqNvi">
@@ -1048,9 +1021,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="gl6BB" id="2SR9xrsN1rS" role="1bW2Oz">
+                  <node concept="Rh6nW" id="4rj4sdBt67o" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2SR9xrsN1rT" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4rj4sdBt67p" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1088,7 +1061,7 @@
                       <node concept="liA8E" id="3$DH87aKa4T" role="2OqNvi">
                         <ref role="37wK5l" to="qdxw:3$DH87aGXjx" resolve="clearDependentNodes" />
                         <node concept="37vLTw" id="3$DH87aKa7P" role="37wK5m">
-                          <ref role="3cqZAo" node="2SR9xrsN1rW" resolve="debuggable" />
+                          <ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
                         </node>
                       </node>
                     </node>
@@ -1111,7 +1084,7 @@
                                   <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                                   <node concept="3cpWs3" id="4rj4sdBt5Dk" role="37wK5m">
                                     <node concept="37vLTw" id="4rj4sdBt5Wg" role="3uHU7w">
-                                      <ref role="3cqZAo" node="2SR9xrsN1rU" resolve="dependency" />
+                                      <ref role="3cqZAo" node="4rj4sdBsE8U" resolve="dependency" />
                                     </node>
                                     <node concept="3cpWs3" id="4rj4sdBt4Sw" role="3uHU7B">
                                       <node concept="3cpWs3" id="5TykNF$uAAK" role="3uHU7B">
@@ -1120,7 +1093,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="6tcu$9nt9wv" role="3uHU7w">
                                           <node concept="37vLTw" id="5TykNF$uABm" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2SR9xrsN1rW" resolve="debuggable" />
+                                            <ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
                                           </node>
                                           <node concept="2Iv5rx" id="6tcu$9nt9ww" role="2OqNvi" />
                                         </node>
@@ -1141,10 +1114,10 @@
                                 <node concept="liA8E" id="3$DH87aKb58" role="2OqNvi">
                                   <ref role="37wK5l" to="qdxw:3$DH87aGNdp" resolve="registerDependentNode" />
                                   <node concept="37vLTw" id="3$DH87aKb8Q" role="37wK5m">
-                                    <ref role="3cqZAo" node="2SR9xrsN1rW" resolve="debuggable" />
+                                    <ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
                                   </node>
                                   <node concept="37vLTw" id="4rj4sdBsF3T" role="37wK5m">
-                                    <ref role="3cqZAo" node="2SR9xrsN1rU" resolve="dependency" />
+                                    <ref role="3cqZAo" node="4rj4sdBsE8U" resolve="dependency" />
                                   </node>
                                 </node>
                               </node>
@@ -1157,7 +1130,7 @@
                                 <node concept="liA8E" id="3$DH87aKbQF" role="2OqNvi">
                                   <ref role="37wK5l" to="qdxw:3$DH87aG$ie" resolve="setShowDebugger" />
                                   <node concept="37vLTw" id="3$DH87aKbU6" role="37wK5m">
-                                    <ref role="3cqZAo" node="2SR9xrsN1rW" resolve="debuggable" />
+                                    <ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
                                   </node>
                                   <node concept="37vLTw" id="3$DH87aKc0t" role="37wK5m">
                                     <ref role="3cqZAo" node="3$DH87aKbhg" resolve="expanded" />
@@ -1166,18 +1139,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="gl6BB" id="2SR9xrsN1rU" role="1bW2Oz">
+                          <node concept="Rh6nW" id="4rj4sdBsE8U" role="1bW2Oz">
                             <property role="TrG5h" value="dependency" />
-                            <node concept="2jxLKc" id="2SR9xrsN1rV" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4rj4sdBsE8V" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="gl6BB" id="2SR9xrsN1rW" role="1bW2Oz">
+                <node concept="Rh6nW" id="3$DH87aK9L_" role="1bW2Oz">
                   <property role="TrG5h" value="debuggable" />
-                  <node concept="2jxLKc" id="2SR9xrsN1rX" role="1tU5fm" />
+                  <node concept="2jxLKc" id="3$DH87aK9LA" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1347,7 +1320,7 @@
                   <node concept="3clFbF" id="$bJ0jgVdgU" role="3cqZAp">
                     <node concept="2OqwBi" id="$bJ0jgVdgW" role="3clFbG">
                       <node concept="37vLTw" id="$bJ0jgVdgX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2SR9xrsN1rY" resolve="it" />
+                        <ref role="3cqZAo" node="$bJ0jgVdh1" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="dfV14BYJk0" role="2OqNvi">
                         <ref role="37wK5l" to="hkt1:dfV14BYish" resolve="setDebuggedTest" />
@@ -1356,9 +1329,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="gl6BB" id="2SR9xrsN1rY" role="1bW2Oz">
+                <node concept="Rh6nW" id="$bJ0jgVdh1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2SR9xrsN1rZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="$bJ0jgVdh2" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
index 0a5ff20d06c..446e42ef6ee 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
@@ -63,9 +63,9 @@
     <import index="eoo2" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.nio.file(JDK/)" />
     <import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
-    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
-    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
     <import index="b9kz" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm.ex(MPS.IDEA/)" />
+    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
+    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="6xgk" ref="r:6e9ad488-5df2-49e4-8c01-8a7f3812adf7(jetbrains.mps.lang.scopes.runtime)" />
     <import index="z1c5" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
@@ -132,7 +132,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1188220165133" name="jetbrains.mps.baseLanguage.structure.ArrayLiteral" flags="nn" index="2BsdOp">
@@ -287,7 +287,7 @@
         <child id="1160998896846" name="condition" index="1gVkn0" />
         <child id="1160998916832" name="message" index="1gVpfI" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -324,7 +324,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -540,7 +540,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -560,7 +560,7 @@
         <property id="568377005202317272" name="default" index="3MtHw7" />
         <property id="568377005202317271" name="technicalKey" index="3MtHw8" />
       </concept>
-      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ngI" index="3ZOmrE">
+      <concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ng" index="3ZOmrE">
         <reference id="2510545900188083932" name="key" index="3ZOmrH" />
       </concept>
     </language>
@@ -15949,23 +15949,39 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbJ" id="2F9YZd59Z3T" role="3cqZAp">
+                      <node concept="3clFbS" id="2F9YZd59Z3V" role="3clFbx">
+                        <node concept="3clFbF" id="2F9YZd5a4XN" role="3cqZAp">
+                          <node concept="2OqwBi" id="2F9YZd5a76C" role="3clFbG">
+                            <node concept="37vLTw" id="2F9YZd5a4XL" role="2Oq$k0">
+                              <ref role="3cqZAo" node="17fjvcLCH2p" resolve="queue" />
+                            </node>
+                            <node concept="2Ke9KJ" id="2F9YZd5abU5" role="2OqNvi">
+                              <node concept="2GrUjf" id="2F9YZd5ad39" role="25WWJ7">
+                                <ref role="2Gs0qQ" node="17fjvcLCJUC" resolve="target" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3fqX7Q" id="2F9YZd59Z_x" role="3clFbw">
+                        <node concept="2OqwBi" id="2F9YZd5a1Nb" role="3fr31v">
+                          <node concept="37vLTw" id="2F9YZd5a0um" role="2Oq$k0">
+                            <ref role="3cqZAo" node="17fjvcLCGZa" resolve="visited" />
+                          </node>
+                          <node concept="3JPx81" id="2F9YZd5a3mA" role="2OqNvi">
+                            <node concept="2GrUjf" id="2F9YZd5a3H_" role="25WWJ7">
+                              <ref role="2Gs0qQ" node="17fjvcLCJUC" resolve="target" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                   <node concept="37vLTw" id="17fjvcLCK9D" role="2GsD0m">
                     <ref role="3cqZAo" node="17fjvcLCJL_" resolve="targets" />
                   </node>
                 </node>
-                <node concept="3clFbF" id="17fjvcLCKcX" role="3cqZAp">
-                  <node concept="2OqwBi" id="17fjvcLCKll" role="3clFbG">
-                    <node concept="37vLTw" id="17fjvcLCKcV" role="2Oq$k0">
-                      <ref role="3cqZAo" node="17fjvcLCH2p" resolve="queue" />
-                    </node>
-                    <node concept="X8dFx" id="17fjvcLCK$4" role="2OqNvi">
-                      <node concept="37vLTw" id="17fjvcLCKAN" role="25WWJ7">
-                        <ref role="3cqZAo" node="17fjvcLCJL_" resolve="targets" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
               </node>
               <node concept="3fqX7Q" id="17fjvcLCIBh" role="3clFbw">
                 <node concept="2OqwBi" id="17fjvcLCIPi" role="3fr31v">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/behavior.mps
index 0043817d018..4259ac8fe0a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/languageModels/behavior.mps
@@ -34,8 +34,6 @@
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -53,24 +51,11 @@
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
         <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
@@ -82,9 +67,6 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -98,21 +80,11 @@
       </concept>
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
-    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
-      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
-        <child id="1199569906740" name="parameter" index="1bW2Oz" />
-        <child id="1199569916463" name="body" index="1bW5cS" />
-      </concept>
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
-      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
-        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
-      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -133,10 +105,9 @@
       </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">
-        <child id="1204796294226" name="closure" index="23t8la" />
+      <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
+        <child id="4611582986551314344" name="requestedType" index="UnYnz" />
       </concept>
-      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
     </language>
   </registry>
@@ -155,50 +126,17 @@
             <node concept="1pGfFk" id="40eYuE1y_aI" role="2ShVmc">
               <ref role="37wK5l" to="2ahs:2pogikRxFvC" resolve="CombinedConditionalInterpreter" />
               <node concept="2OqwBi" id="40eYuE1y_aJ" role="37wK5m">
-                <node concept="2OqwBi" id="40eYuE1y_aK" role="2Oq$k0">
-                  <node concept="2OqwBi" id="40eYuE1y_aL" role="2Oq$k0">
-                    <node concept="2OqwBi" id="40eYuE1y_aM" role="2Oq$k0">
-                      <node concept="2YIFZM" id="40eYuE1y_aN" role="2Oq$k0">
-                        <ref role="37wK5l" to="2ahs:6t6gMvcMFOM" resolve="getInstance" />
-                        <ref role="1Pybhc" to="2ahs:6t6gMvcKSR1" resolve="CachedInterpreterFinder" />
-                      </node>
-                      <node concept="liA8E" id="40eYuE1y_aO" role="2OqNvi">
-                        <ref role="37wK5l" to="2ahs:6t6gMvcMGiv" resolve="findInterpretersForCategory" />
-                        <node concept="Xl_RD" id="40eYuE1y_aP" role="37wK5m">
-                          <property role="Xl_RC" value="CInterpreter" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="v3k3i" id="40eYuE1y_aQ" role="2OqNvi">
-                      <node concept="chp4Y" id="40eYuE1y_aR" role="v3oSu">
-                        <ref role="cht4Q" to="3673:7oujAIeONTA" resolve="ConditionalInterpreter" />
-                      </node>
+                <node concept="2OqwBi" id="2PA_oGfdWRO" role="2Oq$k0">
+                  <node concept="2YIFZM" id="2PA_oGfdWRP" role="2Oq$k0">
+                    <ref role="37wK5l" to="2ahs:2PA_oGdvp1R" resolve="findAllInterpreterExecutablesForCategory" />
+                    <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
+                    <node concept="Xl_RD" id="2PA_oGfdWRQ" role="37wK5m">
+                      <property role="Xl_RC" value="CInterpreter" />
                     </node>
                   </node>
-                  <node concept="3$u5V9" id="40eYuE1y_aS" role="2OqNvi">
-                    <node concept="1bVj0M" id="40eYuE1y_aT" role="23t8la">
-                      <node concept="3clFbS" id="40eYuE1y_aU" role="1bW5cS">
-                        <node concept="3clFbF" id="40eYuE1y_aV" role="3cqZAp">
-                          <node concept="1eOMI4" id="40eYuE1y_aW" role="3clFbG">
-                            <node concept="10QFUN" id="40eYuE1y_aX" role="1eOMHV">
-                              <node concept="2YIFZM" id="40eYuE1y_aY" role="10QFUP">
-                                <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
-                                <ref role="37wK5l" to="2ahs:4jkUBhBVOKX" resolve="getInterpreterExecutable" />
-                                <node concept="37vLTw" id="40eYuE1y_aZ" role="37wK5m">
-                                  <ref role="3cqZAo" node="2SR9xrsN1G1" resolve="it" />
-                                </node>
-                              </node>
-                              <node concept="3uibUv" id="40eYuE1y_b0" role="10QFUM">
-                                <ref role="3uigEE" to="2ahs:7oujAIfiLO4" resolve="IConditionalInterpreter" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="gl6BB" id="2SR9xrsN1G1" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2SR9xrsN1G2" role="1tU5fm" />
-                      </node>
+                  <node concept="UnYns" id="2PA_oGfdWRR" role="2OqNvi">
+                    <node concept="3uibUv" id="2PA_oGfdWRS" role="UnYnz">
+                      <ref role="3uigEE" to="2ahs:7oujAIfiLO4" resolve="IConditionalInterpreter" />
                     </node>
                   </node>
                 </node>
@@ -317,55 +255,22 @@
           <node concept="2ShNRf" id="2pogikRzImK" role="3cqZAk">
             <node concept="1pGfFk" id="2pogikRzNEc" role="2ShVmc">
               <ref role="37wK5l" to="2ahs:2pogikRxFvC" resolve="CombinedConditionalInterpreter" />
-              <node concept="2OqwBi" id="40eYuE1yzVC" role="37wK5m">
-                <node concept="2OqwBi" id="40eYuE1yyhh" role="2Oq$k0">
-                  <node concept="2OqwBi" id="40eYuE1xygk" role="2Oq$k0">
-                    <node concept="2OqwBi" id="15Er3QytrWK" role="2Oq$k0">
-                      <node concept="2YIFZM" id="15Er3QytrWL" role="2Oq$k0">
-                        <ref role="1Pybhc" to="2ahs:6t6gMvcKSR1" resolve="CachedInterpreterFinder" />
-                        <ref role="37wK5l" to="2ahs:6t6gMvcMFOM" resolve="getInstance" />
-                      </node>
-                      <node concept="liA8E" id="15Er3QytrWM" role="2OqNvi">
-                        <ref role="37wK5l" to="2ahs:6t6gMvcMGiv" resolve="findInterpretersForCategory" />
-                        <node concept="Xl_RD" id="7xtsKqWlq7Z" role="37wK5m">
-                          <property role="Xl_RC" value="CInterpreter" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="v3k3i" id="40eYuE1xyYE" role="2OqNvi">
-                      <node concept="chp4Y" id="40eYuE1yxEe" role="v3oSu">
-                        <ref role="cht4Q" to="3673:7oujAIeONTA" resolve="ConditionalInterpreter" />
-                      </node>
+              <node concept="2OqwBi" id="2PA_oGfdadJ" role="37wK5m">
+                <node concept="2OqwBi" id="40eYuE1yzVC" role="2Oq$k0">
+                  <node concept="2YIFZM" id="2PA_oGfd6Yt" role="2Oq$k0">
+                    <ref role="37wK5l" to="2ahs:2PA_oGdvp1R" resolve="findAllInterpreterExecutablesForCategory" />
+                    <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
+                    <node concept="Xl_RD" id="2PA_oGfd77p" role="37wK5m">
+                      <property role="Xl_RC" value="CInterpreter" />
                     </node>
                   </node>
-                  <node concept="3$u5V9" id="40eYuE1yyCe" role="2OqNvi">
-                    <node concept="1bVj0M" id="40eYuE1yyCg" role="23t8la">
-                      <node concept="3clFbS" id="40eYuE1yyCh" role="1bW5cS">
-                        <node concept="3clFbF" id="40eYuE1yz45" role="3cqZAp">
-                          <node concept="1eOMI4" id="7FtvAFycdiK" role="3clFbG">
-                            <node concept="10QFUN" id="7FtvAFycdiL" role="1eOMHV">
-                              <node concept="2YIFZM" id="7FtvAFycdiI" role="10QFUP">
-                                <ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
-                                <ref role="37wK5l" to="2ahs:4jkUBhBVOKX" resolve="getInterpreterExecutable" />
-                                <node concept="37vLTw" id="7FtvAFycdiJ" role="37wK5m">
-                                  <ref role="3cqZAo" node="2SR9xrsN1G3" resolve="it" />
-                                </node>
-                              </node>
-                              <node concept="3uibUv" id="7FtvAFycdv9" role="10QFUM">
-                                <ref role="3uigEE" to="2ahs:7oujAIfiLO4" resolve="IConditionalInterpreter" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="gl6BB" id="2SR9xrsN1G3" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2SR9xrsN1G4" role="1tU5fm" />
-                      </node>
+                  <node concept="UnYns" id="2PA_oGfd8V1" role="2OqNvi">
+                    <node concept="3uibUv" id="2PA_oGfd946" role="UnYnz">
+                      <ref role="3uigEE" to="2ahs:7oujAIfiLO4" resolve="IConditionalInterpreter" />
                     </node>
                   </node>
                 </node>
-                <node concept="3_kTaI" id="40eYuE1y$Y7" role="2OqNvi" />
+                <node concept="3_kTaI" id="2PA_oGfdatg" role="2OqNvi" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl
index e2157a0733f..913fcf927e3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl
@@ -43,6 +43,7 @@
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps
index 29e1f4b2b19..ebebade3912 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps
@@ -10,6 +10,7 @@
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -53,7 +54,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -108,7 +109,7 @@
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -175,7 +176,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -203,7 +204,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -274,7 +275,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -442,7 +443,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -3161,6 +3162,38 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4X7QcQ3ULux" role="jymVt" />
+    <node concept="3clFb_" id="2PA_oGdpdQo" role="jymVt">
+      <property role="TrG5h" value="getCategory" />
+      <node concept="3Tm1VV" id="2PA_oGdpdQs" role="1B3o_S" />
+      <node concept="17QB3L" id="2PA_oGdpdQt" role="3clF45" />
+      <node concept="3clFbS" id="2PA_oGdpdQx" role="3clF47">
+        <node concept="3clFbF" id="2PA_oGdpgWr" role="3cqZAp">
+          <node concept="Xl_RD" id="2PA_oGdpgWq" role="3clFbG">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="2PA_oGdphLo" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <node concept="3zFVjK" id="2PA_oGdphLr" role="3zH0cK">
+                <node concept="3clFbS" id="2PA_oGdphLs" role="2VODD2">
+                  <node concept="3clFbF" id="2PA_oGdphLy" role="3cqZAp">
+                    <node concept="2OqwBi" id="2PA_oGdphLt" role="3clFbG">
+                      <node concept="3TrcHB" id="2PA_oGdphLw" role="2OqNvi">
+                        <ref role="3TsBF5" to="3673:7jJIR9e5_JR" resolve="category" />
+                      </node>
+                      <node concept="30H73N" id="2PA_oGdphLx" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2PA_oGdpdQy" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2PA_oGdthiz" role="jymVt" />
     <node concept="3clFb_" id="6ENu_m7vyzy" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="populateEvaluators" />
@@ -5264,6 +5297,38 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7oujAIfrzPK" role="jymVt" />
+    <node concept="3clFb_" id="6GJBP5i6Qzq" role="jymVt">
+      <property role="TrG5h" value="getCategory" />
+      <node concept="3Tm1VV" id="6GJBP5i6Qzr" role="1B3o_S" />
+      <node concept="17QB3L" id="6GJBP5i6Qzs" role="3clF45" />
+      <node concept="3clFbS" id="6GJBP5i6Qzt" role="3clF47">
+        <node concept="3clFbF" id="6GJBP5i6Qzu" role="3cqZAp">
+          <node concept="Xl_RD" id="6GJBP5i6Qzv" role="3clFbG">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="6GJBP5i6Qzw" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <node concept="3zFVjK" id="6GJBP5i6Qzx" role="3zH0cK">
+                <node concept="3clFbS" id="6GJBP5i6Qzy" role="2VODD2">
+                  <node concept="3clFbF" id="6GJBP5i6Qzz" role="3cqZAp">
+                    <node concept="2OqwBi" id="6GJBP5i6Qz$" role="3clFbG">
+                      <node concept="3TrcHB" id="6GJBP5i6Qz_" role="2OqNvi">
+                        <ref role="3TsBF5" to="3673:7jJIR9e5_JR" resolve="category" />
+                      </node>
+                      <node concept="30H73N" id="6GJBP5i6QzA" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6GJBP5i6QzB" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6GJBP5i6PuO" role="jymVt" />
     <node concept="3clFb_" id="7oujAIfrzPL" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="populateEvaluators" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
index 13ffda71c81..e1197d94791 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
@@ -2,7 +2,7 @@
 <model ref="r:ea6cf71d-29d2-478d-8027-a9f4a4de53c4(com.mbeddr.mpsutil.interpreter.rt)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -55,6 +55,9 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
+      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
+        <child id="2323553266850475953" name="modifiers" index="2frcjj" />
+      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
@@ -73,6 +76,7 @@
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
       </concept>
+      <concept id="4678410916365116210" name="jetbrains.mps.baseLanguage.structure.DefaultModifier" flags="ng" index="2JFqV2" />
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -173,6 +177,7 @@
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -300,6 +305,7 @@
         <child id="1163670683720" name="body" index="3Kbo56" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
+      <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
@@ -462,6 +468,7 @@
       <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="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" />
@@ -480,6 +487,7 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -644,6 +652,18 @@
   <node concept="3HP615" id="4X7QcQ36WR7">
     <property role="TrG5h" value="IInterpreter" />
     <node concept="3Tm1VV" id="4X7QcQ36WR8" role="1B3o_S" />
+    <node concept="3clFb_" id="2PA_oGdoAzN" role="jymVt">
+      <property role="TrG5h" value="getCategory" />
+      <node concept="3clFbS" id="2PA_oGdoAzQ" role="3clF47">
+        <node concept="3clFbF" id="2PA_oGdp9wQ" role="3cqZAp">
+          <node concept="10Nm6u" id="2PA_oGdp9wP" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2PA_oGdoAzR" role="1B3o_S" />
+      <node concept="17QB3L" id="2PA_oGdoAwD" role="3clF45" />
+      <node concept="2JFqV2" id="2PA_oGdp9bO" role="2frcjj" />
+    </node>
+    <node concept="2tJIrI" id="2PA_oGdo$9S" role="jymVt" />
     <node concept="3clFb_" id="2X4$XGmegKw" role="jymVt">
       <property role="TrG5h" value="evaluate" />
       <node concept="3uibUv" id="2X4$XGmegKx" role="3clF45">
@@ -1031,8 +1051,36 @@
       <node concept="3Tm1VV" id="6ENu_m7tE9n" role="1B3o_S" />
       <node concept="3clFbS" id="6ENu_m7tE9p" role="3clF47">
         <node concept="3cpWs6" id="6ENu_m7tFy2" role="3cqZAp">
-          <node concept="37vLTw" id="6ENu_m7tF_p" role="3cqZAk">
-            <ref role="3cqZAo" node="6ENu_m7tEKO" resolve="evaluators" />
+          <node concept="2OqwBi" id="2PA_oGfERDt" role="3cqZAk">
+            <node concept="2OqwBi" id="2PA_oGfDKC1" role="2Oq$k0">
+              <node concept="37vLTw" id="6ENu_m7tF_p" role="2Oq$k0">
+                <ref role="3cqZAo" node="6ENu_m7tEKO" resolve="evaluators" />
+              </node>
+              <node concept="2S7cBI" id="2PA_oGfEG7Q" role="2OqNvi">
+                <node concept="1bVj0M" id="2PA_oGfEG7S" role="23t8la">
+                  <node concept="3clFbS" id="2PA_oGfEG7T" role="1bW5cS">
+                    <node concept="3clFbF" id="2PA_oGfEK6g" role="3cqZAp">
+                      <node concept="2OqwBi" id="2PA_oGfKYPC" role="3clFbG">
+                        <node concept="37vLTw" id="2PA_oGfKYPD" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2PA_oGfEG7U" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="2PA_oGfKYPE" role="2OqNvi">
+                          <ref role="37wK5l" node="5wdSIUgtYu9" resolve="canLookupBeCached" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="2PA_oGfEG7U" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="2PA_oGfEG7V" role="1tU5fm" />
+                  </node>
+                </node>
+                <node concept="1nlBCl" id="2PA_oGfEG7W" role="2S7zOq">
+                  <property role="3clFbU" value="true" />
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="2PA_oGfEUAT" role="2OqNvi" />
           </node>
         </node>
       </node>
@@ -5287,38 +5335,46 @@
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <node concept="3clFbS" id="6ENu_m7r_Br" role="3clF47">
-        <node concept="3clFbF" id="2ALJBcrGXmV" role="3cqZAp">
-          <node concept="2OqwBi" id="6ENu_m7thGA" role="3clFbG">
-            <node concept="37vLTw" id="6ENu_m7tgNb" role="2Oq$k0">
-              <ref role="3cqZAo" node="6ENu_m7rCLn" resolve="constraints" />
-            </node>
-            <node concept="2HxqBE" id="6ENu_m7tl5j" role="2OqNvi">
-              <node concept="1bVj0M" id="6ENu_m7tl5l" role="23t8la">
-                <node concept="3clFbS" id="6ENu_m7tl5m" role="1bW5cS">
-                  <node concept="3clFbF" id="6ENu_m7tlPN" role="3cqZAp">
-                    <node concept="2OqwBi" id="6ENu_m7tmcE" role="3clFbG">
-                      <node concept="37vLTw" id="6ENu_m7tlPM" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2SR9xrsN2Co" resolve="it" />
-                      </node>
-                      <node concept="liA8E" id="6ENu_m7tn4D" role="2OqNvi">
-                        <ref role="37wK5l" node="6ENu_m7svjd" resolve="matchesConstraint" />
-                        <node concept="37vLTw" id="6ENu_m7tnOX" role="37wK5m">
-                          <ref role="3cqZAo" node="6ENu_m7sfAn" resolve="node" />
-                        </node>
-                        <node concept="37vLTw" id="6ENu_m7trvl" role="37wK5m">
-                          <ref role="3cqZAo" node="6ENu_m7tojn" resolve="context" />
-                        </node>
-                      </node>
+        <node concept="1DcWWT" id="2PA_oGfxxIN" role="3cqZAp">
+          <node concept="3clFbS" id="2PA_oGfxxIP" role="2LFqv$">
+            <node concept="3clFbJ" id="2PA_oGfx_f4" role="3cqZAp">
+              <node concept="3clFbS" id="2PA_oGfx_f6" role="3clFbx">
+                <node concept="3cpWs6" id="2PA_oGfxE_K" role="3cqZAp">
+                  <node concept="3clFbT" id="2PA_oGfxG0I" role="3cqZAk" />
+                </node>
+              </node>
+              <node concept="3fqX7Q" id="2PA_oGfxCQf" role="3clFbw">
+                <node concept="2OqwBi" id="2PA_oGfxCQh" role="3fr31v">
+                  <node concept="liA8E" id="2PA_oGfxCQi" role="2OqNvi">
+                    <ref role="37wK5l" node="6ENu_m7svjd" resolve="matchesConstraint" />
+                    <node concept="37vLTw" id="2PA_oGfxCQj" role="37wK5m">
+                      <ref role="3cqZAo" node="6ENu_m7sfAn" resolve="node" />
+                    </node>
+                    <node concept="37vLTw" id="2PA_oGfxCQk" role="37wK5m">
+                      <ref role="3cqZAo" node="6ENu_m7tojn" resolve="context" />
                     </node>
                   </node>
-                </node>
-                <node concept="gl6BB" id="2SR9xrsN2Co" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2SR9xrsN2Cp" role="1tU5fm" />
+                  <node concept="37vLTw" id="2PA_oGfxCQl" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2PA_oGfxxIQ" resolve="constraint" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3cpWsn" id="2PA_oGfxxIQ" role="1Duv9x">
+            <property role="TrG5h" value="constraint" />
+            <node concept="3uibUv" id="2PA_oGfxyjf" role="1tU5fm">
+              <ref role="3uigEE" node="6ENu_m7svj4" resolve="IConstraint" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="2PA_oGfxzfN" role="1DdaDG">
+            <ref role="3cqZAo" node="6ENu_m7rCLn" resolve="constraints" />
+          </node>
+        </node>
+        <node concept="3cpWs6" id="2PA_oGfxJ94" role="3cqZAp">
+          <node concept="3clFbT" id="2PA_oGfxJFv" role="3cqZAk">
+            <property role="3clFbU" value="true" />
+          </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="6ENu_m7r_9W" role="1B3o_S" />
@@ -9156,6 +9212,93 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="4jkUBhBVMPT" role="1B3o_S" />
+    <node concept="2tJIrI" id="2PA_oGdvose" role="jymVt" />
+    <node concept="2YIFZL" id="2PA_oGfak8K" role="jymVt">
+      <property role="TrG5h" value="findAllInterpreterExecutables" />
+      <node concept="3clFbS" id="2PA_oGfak8N" role="3clF47">
+        <node concept="3clFbF" id="2PA_oGfakyY" role="3cqZAp">
+          <node concept="1rXfSq" id="2PA_oGfakyX" role="3clFbG">
+            <ref role="37wK5l" node="2PA_oGdvp1R" resolve="findAllInterpreterExecutablesForCategory" />
+            <node concept="10Nm6u" id="2PA_oGfal2K" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2PA_oGfaj_m" role="1B3o_S" />
+      <node concept="A3Dl8" id="2PA_oGfajSP" role="3clF45">
+        <node concept="3uibUv" id="2PA_oGfajUW" role="A3Ik2">
+          <ref role="3uigEE" node="4X7QcQ36WR7" resolve="IInterpreter" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2PA_oGfajkc" role="jymVt" />
+    <node concept="2YIFZL" id="2PA_oGdvp1R" role="jymVt">
+      <property role="TrG5h" value="findAllInterpreterExecutablesForCategory" />
+      <node concept="3clFbS" id="2PA_oGdvp1U" role="3clF47">
+        <node concept="3clFbF" id="2PA_oGdvptE" role="3cqZAp">
+          <node concept="2OqwBi" id="2PA_oGdvpQg" role="3clFbG">
+            <node concept="2OqwBi" id="2PA_oGdvptG" role="2Oq$k0">
+              <node concept="2O5UvJ" id="2PA_oGdvptH" role="2Oq$k0">
+                <ref role="2O5UnU" to="6f5b:3EpCmwx0lam" resolve="InterpreterExtensionPoint" />
+              </node>
+              <node concept="SfwO_" id="2PA_oGdvptI" role="2OqNvi" />
+            </node>
+            <node concept="3zZkjj" id="2PA_oGdvqb7" role="2OqNvi">
+              <node concept="1bVj0M" id="2PA_oGdvqb9" role="23t8la">
+                <node concept="3clFbS" id="2PA_oGdvqba" role="1bW5cS">
+                  <node concept="3clFbJ" id="2PA_oGfageZ" role="3cqZAp">
+                    <node concept="3clFbS" id="2PA_oGfagf1" role="3clFbx">
+                      <node concept="3cpWs6" id="2PA_oGfaivP" role="3cqZAp">
+                        <node concept="3clFbT" id="2PA_oGfajg5" role="3cqZAk">
+                          <property role="3clFbU" value="true" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbC" id="2PA_oGfahu1" role="3clFbw">
+                      <node concept="10Nm6u" id="2PA_oGfai1M" role="3uHU7w" />
+                      <node concept="37vLTw" id="2PA_oGfagQ7" role="3uHU7B">
+                        <ref role="3cqZAo" node="2PA_oGdvpgE" resolve="category" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="2PA_oGdvqsO" role="3cqZAp">
+                    <node concept="17R0WA" id="2PA_oGdvsuG" role="3clFbG">
+                      <node concept="37vLTw" id="2PA_oGdvt5M" role="3uHU7w">
+                        <ref role="3cqZAo" node="2PA_oGdvpgE" resolve="category" />
+                      </node>
+                      <node concept="2OqwBi" id="2PA_oGdvqA9" role="3uHU7B">
+                        <node concept="37vLTw" id="2PA_oGdvqsN" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2PA_oGdvqbb" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="2PA_oGdvqU2" role="2OqNvi">
+                          <ref role="37wK5l" node="2PA_oGdoAzN" resolve="getCategory" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="2PA_oGdvqbb" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="2PA_oGdvqbc" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2PA_oGdvoKw" role="1B3o_S" />
+      <node concept="A3Dl8" id="2PA_oGdvpmI" role="3clF45">
+        <node concept="3uibUv" id="2PA_oGdvpmK" role="A3Ik2">
+          <ref role="3uigEE" node="4X7QcQ36WR7" resolve="IInterpreter" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2PA_oGdvpgE" role="3clF46">
+        <property role="TrG5h" value="category" />
+        <node concept="17QB3L" id="2PA_oGdvpgD" role="1tU5fm" />
+        <node concept="2AHcQZ" id="2PA_oGfadZS" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="3HP615" id="4N5UlZR9g6v">
     <property role="TrG5h" value="IEnvironmentId" />
@@ -13045,50 +13188,110 @@
             </node>
           </node>
           <node concept="3clFbS" id="3ENzatsrBYH" role="3clFbx">
-            <node concept="3cpWs8" id="48h5VLcj6ZK" role="3cqZAp">
-              <node concept="3cpWsn" id="48h5VLcj6ZL" role="3cpWs9">
-                <property role="TrG5h" value="interpreter" />
-                <node concept="3uibUv" id="48h5VLcj6Z9" role="1tU5fm">
-                  <ref role="3uigEE" node="2yaxsm5jIAm" resolve="CombinedInterpreter" />
+            <node concept="3cpWs8" id="2PA_oGf96yl" role="3cqZAp">
+              <node concept="3cpWsn" id="2PA_oGf96ym" role="3cpWs9">
+                <property role="TrG5h" value="interpreters" />
+                <node concept="10Q1$e" id="2PA_oGf95W8" role="1tU5fm">
+                  <node concept="3uibUv" id="2PA_oGf95Wb" role="10Q1$1">
+                    <ref role="3uigEE" node="4X7QcQ36WR7" resolve="IInterpreter" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="2PA_oGf96yn" role="33vP2m">
+                  <node concept="3_kTaI" id="2PA_oGf96yo" role="2OqNvi" />
+                  <node concept="2YIFZM" id="2PA_oGf96yp" role="2Oq$k0">
+                    <ref role="37wK5l" node="2PA_oGdvp1R" resolve="findAllInterpreterExecutablesForCategory" />
+                    <ref role="1Pybhc" node="4jkUBhBVMPS" resolve="InterpreterRegistry" />
+                    <node concept="37vLTw" id="2PA_oGf96yq" role="37wK5m">
+                      <ref role="3cqZAo" node="50LzNoSyEwk" resolve="category" />
+                    </node>
+                  </node>
                 </node>
-                <node concept="2ShNRf" id="48h5VLcj6ZM" role="33vP2m">
-                  <node concept="1pGfFk" id="48h5VLcj6ZN" role="2ShVmc">
-                    <ref role="37wK5l" node="2yaxsm5jILI" resolve="CombinedInterpreter" />
-                    <node concept="2OqwBi" id="48h5VLcj6ZO" role="37wK5m">
-                      <node concept="2OqwBi" id="48h5VLcj6ZP" role="2Oq$k0">
-                        <node concept="2OqwBi" id="48h5VLcj6ZQ" role="2Oq$k0">
-                          <node concept="2YIFZM" id="48h5VLcj6ZR" role="2Oq$k0">
+              </node>
+            </node>
+            <node concept="3clFbH" id="2PA_oGf948c" role="3cqZAp" />
+            <node concept="3clFbJ" id="2PA_oGf9dvh" role="3cqZAp">
+              <node concept="3clFbS" id="2PA_oGf9dvj" role="3clFbx">
+                <node concept="3SKdUt" id="2PA_oGf9AgM" role="3cqZAp">
+                  <node concept="1PaTwC" id="2PA_oGf9AgN" role="1aUNEU">
+                    <node concept="3oM_SD" id="2PA_oGf9Boo" role="1PaTwD">
+                      <property role="3oM_SC" value="try" />
+                    </node>
+                    <node concept="3oM_SD" id="2PA_oGf9Bop" role="1PaTwD">
+                      <property role="3oM_SC" value="old" />
+                    </node>
+                    <node concept="3oM_SD" id="2PA_oGf9Bov" role="1PaTwD">
+                      <property role="3oM_SC" value="approach" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2PA_oGf9G3S" role="3cqZAp">
+                  <node concept="37vLTI" id="2PA_oGf9H_G" role="3clFbG">
+                    <node concept="37vLTw" id="2PA_oGf9G3Q" role="37vLTJ">
+                      <ref role="3cqZAo" node="2PA_oGf96ym" resolve="interpreters" />
+                    </node>
+                    <node concept="2OqwBi" id="2PA_oGf9Knt" role="37vLTx">
+                      <node concept="2OqwBi" id="2PA_oGf930e" role="2Oq$k0">
+                        <node concept="2OqwBi" id="2PA_oGf930f" role="2Oq$k0">
+                          <node concept="2YIFZM" id="2PA_oGf930g" role="2Oq$k0">
                             <ref role="1Pybhc" node="6t6gMvcKSR1" resolve="CachedInterpreterFinder" />
                             <ref role="37wK5l" node="6t6gMvcMFOM" resolve="getInstance" />
                           </node>
-                          <node concept="liA8E" id="48h5VLcj6ZS" role="2OqNvi">
+                          <node concept="liA8E" id="2PA_oGf930h" role="2OqNvi">
                             <ref role="37wK5l" node="6t6gMvcMGiv" resolve="findInterpretersForCategory" />
-                            <node concept="37vLTw" id="48h5VLcj6ZT" role="37wK5m">
+                            <node concept="37vLTw" id="2PA_oGf930i" role="37wK5m">
                               <ref role="3cqZAo" node="50LzNoSyEwk" resolve="category" />
                             </node>
                           </node>
                         </node>
-                        <node concept="3$u5V9" id="48h5VLcj6ZU" role="2OqNvi">
-                          <node concept="1bVj0M" id="48h5VLcj6ZV" role="23t8la">
-                            <node concept="3clFbS" id="48h5VLcj6ZW" role="1bW5cS">
-                              <node concept="3clFbF" id="48h5VLcj6ZX" role="3cqZAp">
-                                <node concept="2YIFZM" id="48h5VLcj6ZY" role="3clFbG">
+                        <node concept="3$u5V9" id="2PA_oGf930j" role="2OqNvi">
+                          <node concept="1bVj0M" id="2PA_oGf930k" role="23t8la">
+                            <node concept="3clFbS" id="2PA_oGf930l" role="1bW5cS">
+                              <node concept="3clFbF" id="2PA_oGf930m" role="3cqZAp">
+                                <node concept="2YIFZM" id="2PA_oGf930n" role="3clFbG">
                                   <ref role="37wK5l" node="4jkUBhBVOKX" resolve="getInterpreterExecutable" />
                                   <ref role="1Pybhc" node="4jkUBhBVMPS" resolve="InterpreterRegistry" />
-                                  <node concept="37vLTw" id="48h5VLcj6ZZ" role="37wK5m">
-                                    <ref role="3cqZAo" node="2SR9xrsN2CS" resolve="it" />
+                                  <node concept="37vLTw" id="2PA_oGf930o" role="37wK5m">
+                                    <ref role="3cqZAo" node="2PA_oGf930p" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="gl6BB" id="2SR9xrsN2CS" role="1bW2Oz">
+                            <node concept="Rh6nW" id="2PA_oGf930p" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2SR9xrsN2CT" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2PA_oGf930q" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="3_kTaI" id="48h5VLcj702" role="2OqNvi" />
+                      <node concept="3_kTaI" id="2PA_oGf9McF" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbC" id="2PA_oGf9$YO" role="3clFbw">
+                <node concept="2OqwBi" id="2PA_oGf9t7l" role="3uHU7B">
+                  <node concept="37vLTw" id="2PA_oGf9ehH" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2PA_oGf96ym" resolve="interpreters" />
+                  </node>
+                  <node concept="1Rwk04" id="2PA_oGf9uTi" role="2OqNvi" />
+                </node>
+                <node concept="3cmrfG" id="2PA_oGf9zRi" role="3uHU7w">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="2PA_oGfa4mv" role="3cqZAp" />
+            <node concept="3cpWs8" id="48h5VLcj6ZK" role="3cqZAp">
+              <node concept="3cpWsn" id="48h5VLcj6ZL" role="3cpWs9">
+                <property role="TrG5h" value="interpreter" />
+                <node concept="3uibUv" id="48h5VLcj6Z9" role="1tU5fm">
+                  <ref role="3uigEE" node="2yaxsm5jIAm" resolve="CombinedInterpreter" />
+                </node>
+                <node concept="2ShNRf" id="48h5VLcj6ZM" role="33vP2m">
+                  <node concept="1pGfFk" id="48h5VLcj6ZN" role="2ShVmc">
+                    <ref role="37wK5l" node="2yaxsm5jILI" resolve="CombinedInterpreter" />
+                    <node concept="37vLTw" id="2PA_oGf9OY5" role="37wK5m">
+                      <ref role="3cqZAo" node="2PA_oGf96ym" resolve="interpreters" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
index 4d553e73693..24b7ef92bf0 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
@@ -2,7 +2,7 @@
 <model ref="r:007d0985-20e2-4d70-80f1-d0de1aff1076(com.mbeddr.mpsutil.common.graph)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -205,6 +205,12 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
+        <child id="1144226360166" name="iterable" index="1DdaDG" />
+      </concept>
+      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
+        <child id="1144230900587" name="variable" index="1Duv9x" />
+      </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
         <child id="1163668914799" name="condition" index="3K4Cdx" />
@@ -221,7 +227,6 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -286,7 +291,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
         <child id="1226511765987" name="elementType" index="2hN53Y" />
       </concept>
@@ -320,6 +324,7 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -2613,206 +2618,211 @@
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <node concept="3clFbS" id="7Y6OrjMd05L" role="3clF47">
+        <node concept="3cpWs8" id="2F9YZd4J6Qc" role="3cqZAp">
+          <node concept="3cpWsn" id="2F9YZd4J6Qd" role="3cpWs9">
+            <property role="TrG5h" value="allNodes" />
+            <node concept="2hMVRd" id="2F9YZd4J6J9" role="1tU5fm">
+              <node concept="16syzq" id="2F9YZd4J6Jc" role="2hN53Y">
+                <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2F9YZd4J6Qe" role="33vP2m">
+              <node concept="37vLTw" id="2F9YZd4J6Qf" role="2Oq$k0">
+                <ref role="3cqZAo" node="1GB88PxeIla" resolve="graph" />
+              </node>
+              <node concept="liA8E" id="2F9YZd4J6Qg" role="2OqNvi">
+                <ref role="37wK5l" node="9NO9Tq8VPO" resolve="getAllNodes" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2F9YZd4J7Es" role="3cqZAp" />
         <node concept="3clFbJ" id="1GB88Pxqfp7" role="3cqZAp">
           <node concept="3clFbS" id="1GB88Pxqfp9" role="3clFbx">
-            <node concept="3cpWs8" id="7P61H4bE7A5" role="3cqZAp">
-              <node concept="3cpWsn" id="7P61H4bE7A8" role="3cpWs9">
-                <property role="TrG5h" value="visited" />
-                <node concept="2hMVRd" id="7P61H4bE7A1" role="1tU5fm">
-                  <node concept="16syzq" id="7P61H4bE8Cl" role="2hN53Y">
-                    <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="7P61H4bE8FZ" role="33vP2m">
-                  <node concept="2i4dXS" id="7P61H4bE8Rm" role="2ShVmc">
-                    <node concept="16syzq" id="7P61H4bE8XL" role="HW$YZ">
-                      <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
-                    </node>
-                  </node>
+            <node concept="3cpWs6" id="7Y6OrjMd0km" role="3cqZAp">
+              <node concept="3clFbT" id="2F9YZd4Helh" role="3cqZAk">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="2F9YZd4H9uE" role="3clFbw">
+            <node concept="37vLTw" id="2F9YZd4J6Qh" role="2Oq$k0">
+              <ref role="3cqZAo" node="2F9YZd4J6Qd" resolve="allNodes" />
+            </node>
+            <node concept="1v1jN8" id="2F9YZd4HblD" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="2F9YZd4IWFo" role="3cqZAp" />
+        <node concept="3clFbJ" id="2F9YZd4IX$g" role="3cqZAp">
+          <node concept="3clFbS" id="2F9YZd4IX$i" role="3clFbx">
+            <node concept="3cpWs6" id="2F9YZd4J6dI" role="3cqZAp">
+              <node concept="3clFbT" id="2F9YZd4J6fb" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3fqX7Q" id="2F9YZd4IYkK" role="3clFbw">
+            <node concept="2OqwBi" id="2F9YZd4J29q" role="3fr31v">
+              <node concept="37vLTw" id="2F9YZd4J6Qi" role="2Oq$k0">
+                <ref role="3cqZAo" node="2F9YZd4J6Qd" resolve="allNodes" />
+              </node>
+              <node concept="3JPx81" id="2F9YZd4J4H4" role="2OqNvi">
+                <node concept="37vLTw" id="2F9YZd4J5l1" role="25WWJ7">
+                  <ref role="3cqZAo" node="1GB88PxeInL" resolve="initial" />
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="1GB88PxeL5Q" role="3cqZAp">
-              <node concept="3cpWsn" id="1GB88PxeL5T" role="3cpWs9">
-                <property role="TrG5h" value="toVisit" />
-                <node concept="3O6Q9H" id="1GB88PxeL5N" role="1tU5fm">
-                  <node concept="16syzq" id="1GB88PxeL7o" role="3O5elw">
-                    <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
-                  </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2F9YZd4H49t" role="3cqZAp" />
+        <node concept="3cpWs8" id="2F9YZd4HhHb" role="3cqZAp">
+          <node concept="3cpWsn" id="2F9YZd4HhHc" role="3cpWs9">
+            <property role="TrG5h" value="visited" />
+            <node concept="2hMVRd" id="2F9YZd4HhHd" role="1tU5fm">
+              <node concept="16syzq" id="2F9YZd4HhHe" role="2hN53Y">
+                <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="2F9YZd4HhHf" role="33vP2m">
+              <node concept="2i4dXS" id="2F9YZd4HhHg" role="2ShVmc">
+                <node concept="16syzq" id="2F9YZd4HhHh" role="HW$YZ">
+                  <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
                 </node>
-                <node concept="2ShNRf" id="1GB88PxeL9w" role="33vP2m">
-                  <node concept="2Jqq0_" id="1GB88PxeLMm" role="2ShVmc">
-                    <node concept="16syzq" id="1GB88PxeM07" role="HW$YZ">
-                      <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
-                    </node>
-                  </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2F9YZd4HjFs" role="3cqZAp">
+          <node concept="3cpWsn" id="2F9YZd4HjFt" role="3cpWs9">
+            <property role="TrG5h" value="toVisit" />
+            <node concept="3O6Q9H" id="2F9YZd4HjFu" role="1tU5fm">
+              <node concept="16syzq" id="2F9YZd4HjFv" role="3O5elw">
+                <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="2F9YZd4HjFw" role="33vP2m">
+              <node concept="2Jqq0_" id="2F9YZd4HjFx" role="2ShVmc">
+                <node concept="16syzq" id="2F9YZd4HjFy" role="HW$YZ">
+                  <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
                 </node>
               </node>
             </node>
-            <node concept="3clFbJ" id="7P61H4bQc6Z" role="3cqZAp">
-              <node concept="3clFbS" id="7P61H4bQc71" role="3clFbx">
-                <node concept="3clFbF" id="7P61H4bEbLL" role="3cqZAp">
-                  <node concept="2OqwBi" id="7P61H4bEcmj" role="3clFbG">
-                    <node concept="37vLTw" id="7P61H4bEbLJ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7P61H4bE7A8" resolve="visited" />
-                    </node>
-                    <node concept="TSZUe" id="7P61H4bEcLa" role="2OqNvi">
-                      <node concept="37vLTw" id="7P61H4bEd4E" role="25WWJ7">
-                        <ref role="3cqZAo" node="1GB88PxeInL" resolve="initial" />
-                      </node>
-                    </node>
-                  </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2F9YZd4Hk_n" role="3cqZAp">
+          <node concept="2OqwBi" id="2F9YZd4Hk_o" role="3clFbG">
+            <node concept="37vLTw" id="2F9YZd4Hk_p" role="2Oq$k0">
+              <ref role="3cqZAo" node="2F9YZd4HjFt" resolve="toVisit" />
+            </node>
+            <node concept="2Ke9KJ" id="2F9YZd4Hk_q" role="2OqNvi">
+              <node concept="37vLTw" id="2F9YZd4Hk_r" role="25WWJ7">
+                <ref role="3cqZAo" node="1GB88PxeInL" resolve="initial" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2F9YZd4HiVW" role="3cqZAp" />
+        <node concept="2$JKZl" id="2F9YZd4HmPP" role="3cqZAp">
+          <node concept="3clFbS" id="2F9YZd4HmPR" role="2LFqv$">
+            <node concept="3cpWs8" id="2F9YZd4H$R5" role="3cqZAp">
+              <node concept="3cpWsn" id="2F9YZd4H$R6" role="3cpWs9">
+                <property role="TrG5h" value="currentNode" />
+                <node concept="16syzq" id="2F9YZd4H$Kf" role="1tU5fm">
+                  <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
                 </node>
-                <node concept="3clFbF" id="1GB88PxeM68" role="3cqZAp">
-                  <node concept="2OqwBi" id="1GB88PxeMnp" role="3clFbG">
-                    <node concept="37vLTw" id="1GB88PxeM66" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1GB88PxeL5T" resolve="toVisit" />
-                    </node>
-                    <node concept="2Ke9KJ" id="1GB88PxeMzZ" role="2OqNvi">
-                      <node concept="37vLTw" id="1GB88PxeMPS" role="25WWJ7">
-                        <ref role="3cqZAo" node="1GB88PxeInL" resolve="initial" />
-                      </node>
-                    </node>
+                <node concept="2OqwBi" id="2F9YZd4H$R7" role="33vP2m">
+                  <node concept="37vLTw" id="2F9YZd4H$R8" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2F9YZd4HjFt" resolve="toVisit" />
                   </node>
+                  <node concept="2Kt2Hk" id="2F9YZd4H$R9" role="2OqNvi" />
                 </node>
               </node>
-              <node concept="2OqwBi" id="7P61H4bQfIU" role="3clFbw">
-                <node concept="2OqwBi" id="7P61H4bQdsx" role="2Oq$k0">
-                  <node concept="37vLTw" id="7P61H4bQdmj" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1GB88PxeIla" resolve="graph" />
-                  </node>
-                  <node concept="liA8E" id="7P61H4bQdAO" role="2OqNvi">
-                    <ref role="37wK5l" node="9NO9Tq8VPO" resolve="getAllNodes" />
-                  </node>
+            </node>
+            <node concept="3clFbF" id="2F9YZd4HF_n" role="3cqZAp">
+              <node concept="2OqwBi" id="2F9YZd4HGHG" role="3clFbG">
+                <node concept="37vLTw" id="2F9YZd4HF_l" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2F9YZd4HhHc" resolve="visited" />
                 </node>
-                <node concept="3JPx81" id="7P61H4bQgfu" role="2OqNvi">
-                  <node concept="37vLTw" id="7P61H4bQghR" role="25WWJ7">
-                    <ref role="3cqZAo" node="1GB88PxeInL" resolve="initial" />
+                <node concept="TSZUe" id="2F9YZd4HHvp" role="2OqNvi">
+                  <node concept="37vLTw" id="2F9YZd4HLun" role="25WWJ7">
+                    <ref role="3cqZAo" node="2F9YZd4H$R6" resolve="currentNode" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="1GB88PxeM42" role="3cqZAp" />
-            <node concept="2$JKZl" id="1GB88PxeMTT" role="3cqZAp">
-              <node concept="3clFbS" id="1GB88PxeMTV" role="2LFqv$">
-                <node concept="3clFbF" id="1GB88PxiDvY" role="3cqZAp">
-                  <node concept="2OqwBi" id="1GB88PxiEk5" role="3clFbG">
-                    <node concept="2OqwBi" id="1GB88PxiDyT" role="2Oq$k0">
-                      <node concept="37vLTw" id="1GB88PxiDvX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1GB88PxeIla" resolve="graph" />
-                      </node>
-                      <node concept="liA8E" id="1GB88PxiDBM" role="2OqNvi">
-                        <ref role="37wK5l" node="9NO9Tq8VOy" resolve="getTargets" />
-                        <node concept="2OqwBi" id="1GB88PxiCZg" role="37wK5m">
-                          <node concept="37vLTw" id="1GB88PxiCZh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1GB88PxeL5T" resolve="toVisit" />
+            <node concept="3clFbH" id="2F9YZd4HMjT" role="3cqZAp" />
+            <node concept="1DcWWT" id="2F9YZd4HNug" role="3cqZAp">
+              <node concept="3clFbS" id="2F9YZd4HNui" role="2LFqv$">
+                <node concept="3clFbJ" id="2F9YZd4HWF3" role="3cqZAp">
+                  <node concept="3clFbS" id="2F9YZd4HWF5" role="3clFbx">
+                    <node concept="3clFbF" id="2F9YZd4I5z3" role="3cqZAp">
+                      <node concept="2OqwBi" id="2F9YZd4I77R" role="3clFbG">
+                        <node concept="37vLTw" id="2F9YZd4I5z1" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2F9YZd4HjFt" resolve="toVisit" />
+                        </node>
+                        <node concept="2Ke9KJ" id="2F9YZd4I90U" role="2OqNvi">
+                          <node concept="37vLTw" id="2F9YZd4Ia0k" role="25WWJ7">
+                            <ref role="3cqZAo" node="2F9YZd4HNuj" resolve="target" />
                           </node>
-                          <node concept="2Kt2Hk" id="1GB88PxiCZi" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2es0OD" id="1GB88PxiER9" role="2OqNvi">
-                      <node concept="1bVj0M" id="1GB88PxiERb" role="23t8la">
-                        <node concept="3clFbS" id="1GB88PxiERc" role="1bW5cS">
-                          <node concept="3clFbJ" id="7P61H4bEhhJ" role="3cqZAp">
-                            <node concept="3clFbS" id="7P61H4bEhhL" role="3clFbx">
-                              <node concept="3clFbF" id="7P61H4bEl0X" role="3cqZAp">
-                                <node concept="2OqwBi" id="7P61H4bElRS" role="3clFbG">
-                                  <node concept="37vLTw" id="7P61H4bEl0V" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7P61H4bE7A8" resolve="visited" />
-                                  </node>
-                                  <node concept="TSZUe" id="7P61H4bErOP" role="2OqNvi">
-                                    <node concept="37vLTw" id="7P61H4bEsRL" role="25WWJ7">
-                                      <ref role="3cqZAo" node="2SR9xrsN2E4" resolve="target" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="7P61H4bEoym" role="3cqZAp">
-                                <node concept="2OqwBi" id="7P61H4bEp2T" role="3clFbG">
-                                  <node concept="37vLTw" id="7P61H4bEoyk" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1GB88PxeL5T" resolve="toVisit" />
-                                  </node>
-                                  <node concept="2Ke9KJ" id="7P61H4bEpFY" role="2OqNvi">
-                                    <node concept="37vLTw" id="7P61H4bEqlP" role="25WWJ7">
-                                      <ref role="3cqZAo" node="2SR9xrsN2E4" resolve="target" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3fqX7Q" id="7P61H4bPVrk" role="3clFbw">
-                              <node concept="2OqwBi" id="7P61H4bPVrm" role="3fr31v">
-                                <node concept="37vLTw" id="7P61H4bPVrn" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7P61H4bE7A8" resolve="visited" />
-                                </node>
-                                <node concept="3JPx81" id="7P61H4bPVro" role="2OqNvi">
-                                  <node concept="37vLTw" id="7P61H4bPVrp" role="25WWJ7">
-                                    <ref role="3cqZAo" node="2SR9xrsN2E4" resolve="target" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="gl6BB" id="2SR9xrsN2E4" role="1bW2Oz">
-                          <property role="TrG5h" value="target" />
-                          <node concept="2jxLKc" id="2SR9xrsN2E5" role="1tU5fm" />
+                  </node>
+                  <node concept="3fqX7Q" id="2F9YZd4HY6g" role="3clFbw">
+                    <node concept="2OqwBi" id="2F9YZd4I14v" role="3fr31v">
+                      <node concept="37vLTw" id="2F9YZd4HZr9" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2F9YZd4HhHc" resolve="visited" />
+                      </node>
+                      <node concept="3JPx81" id="2F9YZd4I2D3" role="2OqNvi">
+                        <node concept="37vLTw" id="2F9YZd4I4sU" role="25WWJ7">
+                          <ref role="3cqZAo" node="2F9YZd4HNuj" resolve="target" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="2OqwBi" id="1GB88PxeNk0" role="2$JKZa">
-                <node concept="37vLTw" id="1GB88PxeMWd" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1GB88PxeL5T" resolve="toVisit" />
+              <node concept="3cpWsn" id="2F9YZd4HNuj" role="1Duv9x">
+                <property role="TrG5h" value="target" />
+                <node concept="16syzq" id="2F9YZd4HOEb" role="1tU5fm">
+                  <ref role="16sUi3" node="1GB88PxeIkf" resolve="T" />
                 </node>
-                <node concept="3GX2aA" id="1GB88PxeNwC" role="2OqNvi" />
               </node>
-            </node>
-            <node concept="3cpWs6" id="7Y6OrjMd0km" role="3cqZAp">
-              <node concept="3clFbC" id="1GB88PxqI6K" role="3cqZAk">
-                <node concept="2OqwBi" id="1GB88PxqLKt" role="3uHU7w">
-                  <node concept="2OqwBi" id="1GB88PxqK9l" role="2Oq$k0">
-                    <node concept="37vLTw" id="1GB88PxqIU9" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1GB88PxeIla" resolve="graph" />
-                    </node>
-                    <node concept="liA8E" id="1GB88PxqKPA" role="2OqNvi">
-                      <ref role="37wK5l" node="9NO9Tq8VPO" resolve="getAllNodes" />
-                    </node>
-                  </node>
-                  <node concept="34oBXx" id="1GB88PxqN1g" role="2OqNvi" />
+              <node concept="2OqwBi" id="2F9YZd4HSp_" role="1DdaDG">
+                <node concept="37vLTw" id="2F9YZd4HRIw" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1GB88PxeIla" resolve="graph" />
                 </node>
-                <node concept="2OqwBi" id="7P61H4bEvwl" role="3uHU7B">
-                  <node concept="37vLTw" id="7P61H4bEusF" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7P61H4bE7A8" resolve="visited" />
+                <node concept="liA8E" id="2F9YZd4HTFu" role="2OqNvi">
+                  <ref role="37wK5l" node="9NO9Tq8VOy" resolve="getTargets" />
+                  <node concept="37vLTw" id="2F9YZd4HVl3" role="37wK5m">
+                    <ref role="3cqZAo" node="2F9YZd4H$R6" resolve="currentNode" />
                   </node>
-                  <node concept="34oBXx" id="7P61H4bEwFi" role="2OqNvi" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3eOSWO" id="1GB88Pxqk4y" role="3clFbw">
-            <node concept="3cmrfG" id="1GB88Pxqk4S" role="3uHU7w">
-              <property role="3cmrfH" value="0" />
-            </node>
-            <node concept="2OqwBi" id="1GB88Pxqh6k" role="3uHU7B">
-              <node concept="2OqwBi" id="1GB88PxqgcI" role="2Oq$k0">
-                <node concept="37vLTw" id="1GB88PxqfDV" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1GB88PxeIla" resolve="graph" />
-                </node>
-                <node concept="liA8E" id="1GB88PxqgJc" role="2OqNvi">
-                  <ref role="37wK5l" node="9NO9Tq8VPO" resolve="getAllNodes" />
-                </node>
+          <node concept="3fqX7Q" id="2F9YZd4HntW" role="2$JKZa">
+            <node concept="2OqwBi" id="2F9YZd4Hqjc" role="3fr31v">
+              <node concept="37vLTw" id="2F9YZd4HoCc" role="2Oq$k0">
+                <ref role="3cqZAo" node="2F9YZd4HjFt" resolve="toVisit" />
               </node>
-              <node concept="34oBXx" id="1GB88Pxqi4l" role="2OqNvi" />
+              <node concept="1v1jN8" id="2F9YZd4Hr_B" role="2OqNvi" />
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="2F9YZd4IceI" role="3cqZAp" />
         <node concept="3cpWs6" id="1GB88PxqonG" role="3cqZAp">
-          <node concept="3clFbT" id="1GB88PxqpUl" role="3cqZAk">
-            <property role="3clFbU" value="true" />
+          <node concept="3clFbC" id="2F9YZd4IqpN" role="3cqZAk">
+            <node concept="2OqwBi" id="2F9YZd4Ix_Y" role="3uHU7w">
+              <node concept="37vLTw" id="2F9YZd4J6Qj" role="2Oq$k0">
+                <ref role="3cqZAo" node="2F9YZd4J6Qd" resolve="allNodes" />
+              </node>
+              <node concept="34oBXx" id="2F9YZd4Iz65" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="2F9YZd4IkRw" role="3uHU7B">
+              <node concept="37vLTw" id="2F9YZd4Ij4R" role="2Oq$k0">
+                <ref role="3cqZAo" node="2F9YZd4HhHc" resolve="visited" />
+              </node>
+              <node concept="34oBXx" id="2F9YZd4ImP$" role="2OqNvi" />
+            </node>
           </node>
         </node>
       </node>
@@ -3415,14 +3425,14 @@
                             <ref role="3cqZAo" node="2G8yZXxJiey" resolve="sought" />
                           </node>
                           <node concept="37vLTw" id="2G8yZXxJCaT" role="3uHU7B">
-                            <ref role="3cqZAo" node="2SR9xrsN2E6" resolve="it" />
+                            <ref role="3cqZAo" node="2G8yZXxJC6E" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="gl6BB" id="2SR9xrsN2E6" role="1bW2Oz">
+                    <node concept="Rh6nW" id="2G8yZXxJC6E" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2SR9xrsN2E7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2G8yZXxJC6F" role="1tU5fm" />
                     </node>
                   </node>
                 </node>