diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
index 8d962d5b55..cd6a36056e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
@@ -5896,6 +5896,22 @@
       </node>
       <node concept="10P_77" id="4llm6dFyLwd" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="2X44w_B9GQu" role="13h7CS">
+      <property role="TrG5h" value="getReferenableNode" />
+      <ref role="13i0hy" to="pbu6:2X44w_B9GfH" resolve="getReferenableNode" />
+      <node concept="3Tm1VV" id="2X44w_B9GQv" role="1B3o_S" />
+      <node concept="3clFbS" id="2X44w_B9GQy" role="3clF47">
+        <node concept="3clFbF" id="2X44w_B9IpB" role="3cqZAp">
+          <node concept="2OqwBi" id="2X44w_B9IFU" role="3clFbG">
+            <node concept="13iPFW" id="2X44w_B9IpA" role="2Oq$k0" />
+            <node concept="3TrEf2" id="2X44w_B9J0A" role="2OqNvi">
+              <ref role="3Tt5mk" to="w9y2:7kdj6EM4KJZ" resolve="var" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2X44w_B9GQz" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="435Eqf9c0kq">
     <property role="3GE5qa" value="expr.nav" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
index 8180eb11f4..0f3a9c63a7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
@@ -3130,6 +3130,17 @@
         <ref role="ehGHo" to="hm2y:5GL30CqMVEV" resolve="ISSConstrainedValue" />
       </node>
     </node>
+    <node concept="13i0hz" id="2X44w_BbRRJ" role="13h7CS">
+      <property role="TrG5h" value="getReferenableNode" />
+      <ref role="13i0hy" node="2X44w_B9GfH" resolve="getReferenableNode" />
+      <node concept="3Tm1VV" id="2X44w_BbRRK" role="1B3o_S" />
+      <node concept="3clFbS" id="2X44w_BbRRN" role="3clF47">
+        <node concept="3clFbF" id="2X44w_BbSl3" role="3cqZAp">
+          <node concept="13iPFW" id="2X44w_BbSl2" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2X44w_BbRRO" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="7halHeUzsde">
     <ref role="13h7C2" to="hm2y:7halHeUzscN" resolve="PrimitiveLiteral" />
@@ -10922,6 +10933,17 @@
         <ref role="3uigEE" to="oq0c:3ni3WieuV7z" resolve="EffectDescriptor" />
       </node>
     </node>
+    <node concept="13i0hz" id="2X44w_BbTn3" role="13h7CS">
+      <property role="TrG5h" value="getReferenableNode" />
+      <ref role="13i0hy" node="2X44w_B9GfH" resolve="getReferenableNode" />
+      <node concept="3Tm1VV" id="2X44w_BbTn4" role="1B3o_S" />
+      <node concept="3clFbS" id="2X44w_BbTn7" role="3clF47">
+        <node concept="3clFbF" id="2X44w_BbTyK" role="3cqZAp">
+          <node concept="13iPFW" id="2X44w_BbTyJ" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2X44w_BbTn8" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="2ck7OjOLg5Z">
     <property role="3GE5qa" value="tuples" />
@@ -25014,6 +25036,14 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="2X44w_B9GfH" role="13h7CS">
+      <property role="13i0iv" value="true" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="getReferenableNode" />
+      <node concept="3Tm1VV" id="2X44w_B9GfI" role="1B3o_S" />
+      <node concept="3Tqbb2" id="2X44w_B9Gk6" role="3clF45" />
+      <node concept="3clFbS" id="2X44w_B9GfK" role="3clF47" />
+    </node>
     <node concept="13hLZK" id="aPhVmWYjmP" role="13h7CW">
       <node concept="3clFbS" id="aPhVmWYjmQ" role="2VODD2" />
     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps
index 4225ed17cc..aff199b3f6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/org.iets3.core.expr.base.dataFlow.mps
@@ -8,7 +8,7 @@
   <imports>
     <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
-    <import index="zzzn" ref="r:af0af2e7-f7e1-4536-83b5-6bf010d4afd2(org.iets3.core.expr.lambda.structure)" implicit="true" />
+    <import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -44,6 +44,9 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+      </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
         <reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
       </concept>
@@ -87,6 +90,7 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
         <reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
         <child id="1883223317721008709" name="body" index="Jncv$" />
@@ -935,15 +939,15 @@
           </node>
         </node>
         <node concept="3clFbH" id="3YOARm9A$MC" role="3cqZAp" />
-        <node concept="Jncv_" id="3YOARm9A$SK" role="3cqZAp">
-          <ref role="JncvD" to="zzzn:1VmWkC0$wKA" resolve="LocalVarRef" />
-          <node concept="2OqwBi" id="3YOARm9A_ih" role="JncvB">
-            <node concept="3__QtB" id="3YOARm9A_1F" role="2Oq$k0" />
-            <node concept="3TrEf2" id="3YOARm9A_Mt" role="2OqNvi">
+        <node concept="Jncv_" id="2X44w_BemyN" role="3cqZAp">
+          <ref role="JncvD" to="hm2y:aPhVmWYjmk" resolve="ICanBeLValue" />
+          <node concept="2OqwBi" id="2X44w_BemSK" role="JncvB">
+            <node concept="3__QtB" id="2X44w_BemCq" role="2Oq$k0" />
+            <node concept="3TrEf2" id="2X44w_Benqa" role="2OqNvi">
               <ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKm" resolve="left" />
             </node>
           </node>
-          <node concept="3clFbS" id="3YOARm9A$SO" role="Jncv$">
+          <node concept="3clFbS" id="2X44w_BemyR" role="Jncv$">
             <node concept="3_FXB6" id="3YOARm9At3w" role="3cqZAp">
               <node concept="2OqwBi" id="3YOARm9Atef" role="1XBRO_">
                 <node concept="3__QtB" id="3YOARm9AtdT" role="2Oq$k0" />
@@ -953,17 +957,17 @@
               </node>
               <node concept="2OqwBi" id="3YOARm9AAS7" role="3_H1SZ">
                 <node concept="Jnkvi" id="3YOARm9AAHN" role="2Oq$k0">
-                  <ref role="1M0zk5" node="3YOARm9A$SQ" resolve="localVarRef" />
+                  <ref role="1M0zk5" node="2X44w_BemyT" resolve="leftValue" />
                 </node>
-                <node concept="3TrEf2" id="3YOARm9ABac" role="2OqNvi">
-                  <ref role="3Tt5mk" to="zzzn:1VmWkC0$wL2" resolve="var" />
+                <node concept="2qgKlT" id="2X44w_Beoep" role="2OqNvi">
+                  <ref role="37wK5l" to="pbu6:2X44w_B9GfH" resolve="getReferenableNode" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="JncvC" id="3YOARm9A$SQ" role="JncvA">
-            <property role="TrG5h" value="localVarRef" />
-            <node concept="2jxLKc" id="3YOARm9A$SR" role="1tU5fm" />
+          <node concept="JncvC" id="2X44w_BemyT" role="JncvA">
+            <property role="TrG5h" value="leftValue" />
+            <node concept="2jxLKc" id="2X44w_BemyU" role="1tU5fm" />
           </node>
         </node>
       </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
index 696a9a8c9a..d420e32df8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
@@ -5664,6 +5664,22 @@
         <ref role="3uigEE" to="oq0c:3ni3WieuV7z" resolve="EffectDescriptor" />
       </node>
     </node>
+    <node concept="13i0hz" id="2X44w_Bd$jT" role="13h7CS">
+      <property role="TrG5h" value="getReferenableNode" />
+      <ref role="13i0hy" to="pbu6:2X44w_B9GfH" resolve="getReferenableNode" />
+      <node concept="3Tm1VV" id="2X44w_Bd$jU" role="1B3o_S" />
+      <node concept="3clFbS" id="2X44w_Bd$jX" role="3clF47">
+        <node concept="3clFbF" id="2X44w_Bd$s5" role="3cqZAp">
+          <node concept="2OqwBi" id="2X44w_Bd$FL" role="3clFbG">
+            <node concept="13iPFW" id="2X44w_Bd$s4" role="2Oq$k0" />
+            <node concept="3TrEf2" id="2X44w_Bd$ZD" role="2OqNvi">
+              <ref role="3Tt5mk" to="zzzn:1VmWkC0$wL2" resolve="var" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2X44w_Bd$jY" role="3clF45" />
+    </node>
     <node concept="13i0hz" id="1VmWkC1tFGd" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps
index d815120b90..5666edd6ea 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps
@@ -418,6 +418,22 @@
       </node>
       <node concept="10P_77" id="2bmnJndGuoD" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="2X44w_BdZ8l" role="13h7CS">
+      <property role="TrG5h" value="getReferenableNode" />
+      <ref role="13i0hy" to="pbu6:2X44w_B9GfH" resolve="getReferenableNode" />
+      <node concept="3Tm1VV" id="2X44w_BdZ8m" role="1B3o_S" />
+      <node concept="3clFbS" id="2X44w_BdZ8p" role="3clF47">
+        <node concept="3clFbF" id="2X44w_BdZi0" role="3cqZAp">
+          <node concept="2OqwBi" id="2X44w_BdZy5" role="3clFbG">
+            <node concept="13iPFW" id="2X44w_BdZhZ" role="2Oq$k0" />
+            <node concept="2qgKlT" id="2X44w_BdZTy" role="2OqNvi">
+              <ref role="37wK5l" node="4fgA7QrEdeJ" resolve="target" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2X44w_BdZ8q" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="4o9aP47qdi_">
     <ref role="13h7C2" to="lmd:4o9aP47qdic" resolve="IComparablePathPart" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps
index 4920b13e05..18f8fc5b5a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps
@@ -1685,6 +1685,22 @@
       </node>
       <node concept="10P_77" id="YMJl2BJIQ8" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="2X44w_Be1ug" role="13h7CS">
+      <property role="TrG5h" value="getReferenableNode" />
+      <ref role="13i0hy" to="pbu6:2X44w_B9GfH" resolve="getReferenableNode" />
+      <node concept="3Tm1VV" id="2X44w_Be1uh" role="1B3o_S" />
+      <node concept="3clFbS" id="2X44w_Be1uk" role="3clF47">
+        <node concept="3clFbF" id="2X44w_Be1Aq" role="3cqZAp">
+          <node concept="2OqwBi" id="2X44w_Be1QS" role="3clFbG">
+            <node concept="13iPFW" id="2X44w_Be1Ap" role="2Oq$k0" />
+            <node concept="3TrEf2" id="2X44w_Be2lx" role="2OqNvi">
+              <ref role="3Tt5mk" to="19m5:aPhVmWXzeQ" resolve="var" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2X44w_Be1ul" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="YMJl2BHsCY">
     <property role="3GE5qa" value="operations" />