diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index d309d376637..698598f4f59 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-07 Alain Magloire
+	New interfaces to Target.
+	* ICDITarget.java
+	* ICDIBreakpointManagement.java
+
 2004-09-03 Mikhail Khodjaiants
 	Made global variables persistent.
 	* CDIDebugModel.java
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpointManagement.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpointManagement.java
new file mode 100644
index 00000000000..09dce5286c2
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpointManagement.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.cdt.debug.core.cdi.model;
+
+import org.eclipse.cdt.debug.core.cdi.CDIException;
+import org.eclipse.cdt.debug.core.cdi.ICDICondition;
+import org.eclipse.cdt.debug.core.cdi.ICDILocation;
+
+/**
+ * Breapoints action on the Target.
+ * 
+ */
+public interface ICDIBreakpointManagement {
+	
+	ICDIBreakpoint[] getBreakpoints() throws CDIException;
+
+	ICDILocationBreakpoint setLocationBreakpoint(int type, ICDILocation location,
+		ICDICondition condition, String threadId, boolean deferred) throws CDIException;		
+
+	ICDIWatchpoint setWatchpoint(int type, int watchType, String expression,
+		ICDICondition condition) throws CDIException;
+
+	void deleteBreakpoints(ICDIBreakpoint[] breakpoints) throws CDIException;
+
+	void deleteAllBreakpoints() throws CDIException;
+
+//	ICDIExceptionBreakpoint setExceptionBreakpoint(String clazz, boolean stopOnThrow, boolean stopOnCatch) throws CDIException;
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
index 513c960df56..6be28d88cf5 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
@@ -12,6 +12,7 @@
 package org.eclipse.cdt.debug.core.cdi.model;
 
 import org.eclipse.cdt.debug.core.cdi.CDIException;
+import org.eclipse.cdt.debug.core.cdi.ICDICondition;
 import org.eclipse.cdt.debug.core.cdi.ICDILocation;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
 
@@ -22,7 +23,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDISession;
  * 
  * @since Jul 8, 2002
  */
-public interface ICDITarget extends ICDIObject {
+public interface ICDITarget extends ICDIBreakpointManagement, ICDIObject {
 	/**
 	 * Returns the debug session this target is contained in.
 	 * 
@@ -212,4 +213,20 @@ public interface ICDITarget extends ICDIObject {
 	 * @throws CDIException if this method fails.  Reasons include:
 	 */
 	ICDIThread getCurrentThread() throws CDIException;
+
+	/**
+	 * Return a ICDICondition
+	 */
+	ICDICondition createCondition(int ignoreCount, String expression);
+
+	/**
+	 * Returns a ICDILocation
+	 */
+	ICDILocation createLocation(String file, String function, int line);
+
+	/**
+	 * Returns a ICDILocation
+	 */
+	ICDILocation createLocation(long address);
+
 }