diff --git a/plugins/debugger-api/api/jetbrains/mps/debug/api/programState.mps b/plugins/debugger-api/api/jetbrains/mps/debug/api/programState.mps
index a53a28ce9a8d..419850d12781 100644
--- a/plugins/debugger-api/api/jetbrains/mps/debug/api/programState.mps
+++ b/plugins/debugger-api/api/jetbrains/mps/debug/api/programState.mps
@@ -764,6 +764,7 @@
   <node concept="312cEu" id="5G8f0m409ra">
     <property role="1sVAO0" value="true" />
     <property role="TrG5h" value="AbstractWatchable" />
+    <node concept="2tJIrI" id="6X9HoDBGSb$" role="jymVt" />
     <node concept="3Tm1VV" id="5G8f0m409rb" role="1B3o_S" />
     <node concept="3uibUv" id="5G8f0m40muz" role="EKbjA">
       <ref role="3uigEE" node="5G8f0m40fKi" resolve="Watchable2" />
@@ -786,6 +787,28 @@
         </node>
       </node>
     </node>
+    <node concept="3clFb_" id="6X9HoDBGSd2" role="jymVt">
+      <property role="TrG5h" value="getNode" />
+      <property role="DiZV1" value="false" />
+      <node concept="3Tm1VV" id="6X9HoDBGSd3" role="1B3o_S" />
+      <node concept="3uibUv" id="6X9HoDBGSd4" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+      </node>
+      <node concept="2AHcQZ" id="6X9HoDBGSd6" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="2AHcQZ" id="6X9HoDBGSdl" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
+      <node concept="3clFbS" id="6X9HoDBGSdn" role="3clF47">
+        <node concept="3clFbF" id="6X9HoDBGSdq" role="3cqZAp">
+          <node concept="10Nm6u" id="6X9HoDBGSdp" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6X9HoDBGSdo" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
   </node>
   <node concept="3HP615" id="5G8f0m40fKi">
     <property role="TrG5h" value="Watchable2" />
diff --git a/plugins/debugger-api/api/source_gen.caches/jetbrains/mps/debug/api/programState/generated b/plugins/debugger-api/api/source_gen.caches/jetbrains/mps/debug/api/programState/generated
index f060704efee1..93a93af5b630 100644
--- a/plugins/debugger-api/api/source_gen.caches/jetbrains/mps/debug/api/programState/generated
+++ b/plugins/debugger-api/api/source_gen.caches/jetbrains/mps/debug/api/programState/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-9xibrmbwjght0durmhak4y3d9hrf73r">
+<product version="3" modelHash="33ivh171fejpfmft94zirml75453j05">
   <files names="AbstractWatchable.java:GenericSourceCodeLocation.java:ILocation.java:IStackFrame.java:IThread.java:IValue.java:IWatchable.java:NullLocation.java:Watchable2.java:WatchablesCategory.java" />
 </product>
 
diff --git a/plugins/debugger-api/api/source_gen/jetbrains/mps/debug/api/programState/AbstractWatchable.java b/plugins/debugger-api/api/source_gen/jetbrains/mps/debug/api/programState/AbstractWatchable.java
index d1d545768b33..7e3cc6fc7a2c 100644
--- a/plugins/debugger-api/api/source_gen/jetbrains/mps/debug/api/programState/AbstractWatchable.java
+++ b/plugins/debugger-api/api/source_gen/jetbrains/mps/debug/api/programState/AbstractWatchable.java
@@ -3,10 +3,19 @@
 /*Generated by MPS */
 
 import jetbrains.mps.annotations.GeneratedClass;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.mps.openapi.model.SNode;
 
 /**
  * Default implementation for {@link jetbrains.mps.debug.api.programState.IWatchable }, extend this class instead of implementing interface directly to facilitate API change
  */
 @GeneratedClass(node = "r:0a0d7eec-6e5a-412b-8e16-e3ee5ed7fb95(jetbrains.mps.debug.api.programState)/6559558851652261578", model = "r:0a0d7eec-6e5a-412b-8e16-e3ee5ed7fb95(jetbrains.mps.debug.api.programState)")
 public abstract class AbstractWatchable implements Watchable2 {
+
+  @Nullable
+  @Deprecated
+  @Override
+  public SNode getNode() {
+    return null;
+  }
 }
diff --git a/plugins/debugger-api/api/source_gen/jetbrains/mps/debug/api/programState/trace.info b/plugins/debugger-api/api/source_gen/jetbrains/mps/debug/api/programState/trace.info
index 4983ab37d3a7..babbb826f115 100644
--- a/plugins/debugger-api/api/source_gen/jetbrains/mps/debug/api/programState/trace.info
+++ b/plugins/debugger-api/api/source_gen/jetbrains/mps/debug/api/programState/trace.info
@@ -198,7 +198,11 @@
   </root>
   <root nodeRef="r:0a0d7eec-6e5a-412b-8e16-e3ee5ed7fb95(jetbrains.mps.debug.api.programState)/6559558851652261578">
     <file name="AbstractWatchable.java">
-      <unit id="6559558851652261578" at="10,0,13,0" name="jetbrains.mps.debug.api.programState.AbstractWatchable" />
+      <node id="8019140217559810906" at="18,26,19,16" concept="5" />
+      <node id="8019140217559810882" at="15,0,21,0" concept="4" trace="getNode#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="8019140217559810903" at="18,26,19,16" />
+      <scope id="8019140217559810882" at="15,0,21,0" />
+      <unit id="6559558851652261578" at="12,0,22,0" name="jetbrains.mps.debug.api.programState.AbstractWatchable" />
     </file>
   </root>
   <root nodeRef="r:0a0d7eec-6e5a-412b-8e16-e3ee5ed7fb95(jetbrains.mps.debug.api.programState)/6559558851652287506">