diff --git a/plugins/org.eclipse.dd.dsf.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.dd.dsf.debug/META-INF/MANIFEST.MF
index 42715ebf451..8edc247599b 100644
--- a/plugins/org.eclipse.dd.dsf.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dd.dsf.debug/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Debug Services Framework Debug
 Bundle-Vendor: Eclipse.org
-Bundle-SymbolicName: org.eclipse.dd.dsf.debug
+Bundle-SymbolicName: org.eclipse.dd.dsf.debug;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.dd.dsf.debug.DsfDebugPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.dd.dsf,
- org.eclipse.cdt.core
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.debug.core
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.dd.dsf.debug.model,
  org.eclipse.dd.dsf.debug.service,
diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IDsfBreakpointExtension.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IDsfBreakpointExtension.java
new file mode 100644
index 00000000000..6bd9dbf68c8
--- /dev/null
+++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IDsfBreakpointExtension.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Wind River Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.dd.dsf.debug.service;
+
+import org.eclipse.cdt.debug.core.model.ICBreakpointExtension;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.dd.dsf.debug.service.IRunControl.IContainerDMContext;
+import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext;
+
+/**
+ * An extension to {@link ICBreakpoint} with model-specific breakpoint 
+ * attributes. Different debug models can use the standard C breakpoints that 
+ * extend the basic <code>ICBreakpoint</code>.  The can use this extension 
+ * mechanism to edit and store model-specific data in the original breakpoint 
+ * object.
+ *   
+ * A breakpoint extension is defined by an extension of kind 
+ * <code>"org.eclipse.cdt.debug.core.BreakpointExtension"</code></li>.
+ * The <code>ICBreakpoint</code> implementation instantiates breakpoint 
+ * extensions registered for its specific marker type when a client requests
+ * extensions for a given debug model type.  Thus the extension classes and 
+ * plugins that declare them are not loaded unless requested by a client.   
+ * 
+ * @see ICBreakpoint#getExtension(String, Class)
+ */
+public interface IDsfBreakpointExtension extends ICBreakpointExtension {
+   
+    public void setTargetFilter( IContainerDMContext target ) throws CoreException;
+    public void removeTargetFilter( IContainerDMContext target ) throws CoreException;
+    public IContainerDMContext[] getTargetFilters() throws CoreException;
+
+    public void setThreadFilters( IExecutionDMContext[] threads ) throws CoreException;
+    public void removeThreadFilters( IExecutionDMContext[] threads ) throws CoreException;
+    public IExecutionDMContext[] getThreadFilters( IContainerDMContext target ) throws CoreException;
+
+}
diff --git a/plugins/org.eclipse.dd.dsf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dd.dsf.ui/META-INF/MANIFEST.MF
index bf9157f877d..7eda21ec60b 100644
--- a/plugins/org.eclipse.dd.dsf.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dd.dsf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Debug Services Framework UI
 Bundle-Vendor: Eclipse.org
-Bundle-SymbolicName: org.eclipse.dd.dsf.ui
+Bundle-SymbolicName: org.eclipse.dd.dsf.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.dd.dsf.ui.DsfUIPlugin
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.dd.dsf/META-INF/MANIFEST.MF b/plugins/org.eclipse.dd.dsf/META-INF/MANIFEST.MF
index 7464f6a24e4..14dea406cf1 100644
--- a/plugins/org.eclipse.dd.dsf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dd.dsf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Debug Services Framework Core
 Bundle-Vendor: Eclipse.org
-Bundle-SymbolicName: org.eclipse.dd.dsf
+Bundle-SymbolicName: org.eclipse.dd.dsf;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.dd.dsf.DsfPlugin
 Bundle-Localization: plugin