diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContext.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContext.java
index 0fba1f42eb89..25f855bfabed 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContext.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContext.java
@@ -17,7 +17,7 @@ public interface EvaluateContext {
    * additionalContext parameter.
    */
   @NotNull
-  Promise<EvaluateResult> evaluate(@NotNull String expression, @Nullable Map<String, EvaluateContextAdditionalParameter> additionalContext, boolean enableBreak);
+  Promise<EvaluateResult> evaluate(@NotNull String expression, @Nullable Map<String, Object> additionalContext, boolean enableBreak);
 
   @NotNull
   Promise<EvaluateResult> evaluate(@NotNull String expression);
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContextAdditionalParameter.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContextAdditionalParameter.java
deleted file mode 100644
index 3e79d16e6e0c..000000000000
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContextAdditionalParameter.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.jetbrains.debugger;
-
-public interface EvaluateContextAdditionalParameter {
-}
\ No newline at end of file
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContextBase.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContextBase.java
index 812f24d5d0f5..418d8de38629 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContextBase.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContextBase.java
@@ -38,7 +38,7 @@ public abstract class EvaluateContextBase<VALUE_MANAGER extends ValueManager> im
 
   @NotNull
   @Override
-  public abstract Promise<EvaluateResult> evaluate(@NotNull String expression, @Nullable Map<String, EvaluateContextAdditionalParameter> additionalContext, boolean enableBreak);
+  public abstract Promise<EvaluateResult> evaluate(@NotNull String expression, @Nullable Map<String, Object> additionalContext, boolean enableBreak);
 
   @NotNull
   public final VALUE_MANAGER getValueManager() {
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/ValueModifierUtil.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/ValueModifierUtil.java
index 87a3fea900e2..f903a705f37f 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/ValueModifierUtil.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/ValueModifierUtil.java
@@ -26,7 +26,7 @@ public final class ValueModifierUtil {
 
   @NotNull
   public static Promise<Value> evaluateGet(@NotNull final Variable variable,
-                                           @NotNull EvaluateContextAdditionalParameter host,
+                                           @NotNull Object host,
                                            @NotNull EvaluateContext evaluateContext,
                                            @NotNull String selfName) {
     StringBuilder builder = new StringBuilder(selfName);
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/values/Value.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/values/Value.java
index 3ed079409176..c64d1e090795 100755
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/values/Value.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/values/Value.java
@@ -1,12 +1,11 @@
 package org.jetbrains.debugger.values;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.debugger.EvaluateContextAdditionalParameter;
 
 /**
  * An object that represents a VM variable value (compound or atomic).
  */
-public interface Value extends EvaluateContextAdditionalParameter {
+public interface Value {
   @NotNull
   ValueType getType();
 
diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.java
index 12fb2bbc0f4b..de013574af0b 100644
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.java
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.java
@@ -98,7 +98,7 @@ public final class VariableView extends XNamedValue implements VariableContext {
       node.setPresentation(icon, null, valueString, true);
     }
     else {
-      context.getEvaluateContext().evaluate("a.length", Collections.<String, EvaluateContextAdditionalParameter>singletonMap("a", value), false)
+      context.getEvaluateContext().evaluate("a.length", Collections.<String, Object>singletonMap("a", value), false)
         .done(new Consumer<EvaluateResult>() {
           @Override
           public void consume(EvaluateResult result) {