--- a/org.chromium.debug.core/src/org/chromium/debug/core/model/DebugElementImpl.java	Wed Jan 27 10:42:14 2010 -0800
+++ b/org.chromium.debug.core/src/org/chromium/debug/core/model/DebugElementImpl.java	Wed Jan 27 15:45:27 2010 -0800
@@ -4,7 +4,6 @@
 
 package org.chromium.debug.core.model;
 
-import org.chromium.debug.core.ChromiumDebugPlugin;
 import org.eclipse.core.runtime.PlatformObject;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.model.IDebugElement;
@@ -14,13 +13,17 @@
  */
 public class DebugElementImpl extends PlatformObject implements IDebugElement {
 
-  private final IChromiumDebugTarget debugTarget;
+  /**
+   * Instance of {@link DebugTargetImpl} or {@code null} if this is {@link DebugTargetImpl}.
+   * TODO(peter.rybin): Do we really need this null value?
+   */
+  private final DebugTargetImpl debugTarget;
 
-  public DebugElementImpl(IChromiumDebugTarget debugTarget) {
+  public DebugElementImpl(DebugTargetImpl debugTarget) {
     this.debugTarget = debugTarget;
   }
 
-  public IChromiumDebugTarget getDebugTarget() {
+  public DebugTargetImpl getDebugTarget() {
     return debugTarget;
   }
 
@@ -29,7 +32,7 @@
   }
 
   public String getModelIdentifier() {
-    return ChromiumDebugPlugin.DEBUG_MODEL_ID;
+    return getDebugTarget().getChromiumModelIdentifier();
   }
 
   @Override