diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIAggregateType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIAggregateType.java
new file mode 100644
index 00000000000..e200e6c88a5
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIAggregateType.java
@@ -0,0 +1,19 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIAggregateType extends ICDIType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIAggregateValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIAggregateValue.java
new file mode 100644
index 00000000000..1d67fbe0add
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIAggregateValue.java
@@ -0,0 +1,21 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.ICDIValue;
+
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIAggregateValue extends ICDIValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIArrayType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIArrayType.java
new file mode 100644
index 00000000000..f667d39f400
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIArrayType.java
@@ -0,0 +1,19 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIArrayType extends ICDIDerivedType {
+
+	int getDimension();
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIArrayValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIArrayValue.java
new file mode 100644
index 00000000000..fd7682ebfdf
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIArrayValue.java
@@ -0,0 +1,16 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents a value of a array type.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDIArrayValue extends ICDIDerivedValue {
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBoolType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBoolType.java
new file mode 100644
index 00000000000..f76346e20e4
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBoolType.java
@@ -0,0 +1,13 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+/**
+ */
+public interface ICDIBoolType extends ICDIIntegralType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBoolValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBoolValue.java
new file mode 100644
index 00000000000..fb11988f82f
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBoolValue.java
@@ -0,0 +1,12 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+/**
+ */
+public interface ICDIBoolValue extends ICDIIntegralValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDICharType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDICharType.java
new file mode 100644
index 00000000000..744f1f4c4f3
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDICharType.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDICharType extends ICDIIntegralType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDICharValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDICharValue.java
new file mode 100644
index 00000000000..e4d0a3ccbbc
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDICharValue.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the value of a variable.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDICharValue extends ICDIIntegralValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDerivedType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDerivedType.java
new file mode 100644
index 00000000000..6d1b417b3a4
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDerivedType.java
@@ -0,0 +1,20 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIDerivedType extends ICDIType {
+
+	ICDIType getComponentType();
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDerivedValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDerivedValue.java
new file mode 100644
index 00000000000..46fe292746a
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDerivedValue.java
@@ -0,0 +1,21 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.ICDIValue;
+
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIDerivedValue extends ICDIValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDoubleType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDoubleType.java
new file mode 100644
index 00000000000..a12cbd733b1
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDoubleType.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIDoubleType extends ICDIFloatingPointType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDoubleValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDoubleValue.java
new file mode 100644
index 00000000000..365864d5726
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIDoubleValue.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the value of a variable.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDIDoubleValue extends ICDIFloatingPointValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIEnumType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIEnumType.java
new file mode 100644
index 00000000000..b63085487b2
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIEnumType.java
@@ -0,0 +1,12 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+/**
+ */
+public interface ICDIEnumType extends ICDIIntegralType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIEnumValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIEnumValue.java
new file mode 100644
index 00000000000..9bec0f2fa8a
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIEnumValue.java
@@ -0,0 +1,13 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+/**
+ */
+public interface ICDIEnumValue extends ICDIIntegralValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatType.java
new file mode 100644
index 00000000000..fd8afd872b2
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatType.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIFloatType extends ICDIFloatingPointType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatValue.java
new file mode 100644
index 00000000000..e590f123c6e
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatValue.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the value of a variable.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDIFloatValue extends ICDIFloatingPointValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatingPointType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatingPointType.java
new file mode 100644
index 00000000000..7b367486877
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatingPointType.java
@@ -0,0 +1,23 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIFloatingPointType extends ICDIType {
+
+	boolean isImaginary();
+
+	boolean isComplex();
+
+	boolean isLong();
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatingPointValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatingPointValue.java
new file mode 100644
index 00000000000..841a3d31d1c
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFloatingPointValue.java
@@ -0,0 +1,21 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.ICDIValue;
+
+
+/**
+ * 
+ * Represents the value of a variable.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDIFloatingPointValue extends ICDIValue {
+
+	// Implement type conversion here
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFunctionType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFunctionType.java
new file mode 100644
index 00000000000..41030464bfb
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFunctionType.java
@@ -0,0 +1,19 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIFunctionType extends ICDIDerivedType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFunctionValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFunctionValue.java
new file mode 100644
index 00000000000..32885f68b22
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIFunctionValue.java
@@ -0,0 +1,19 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIFunctionValue extends ICDIDerivedValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntType.java
new file mode 100644
index 00000000000..24118d1cd20
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntType.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIIntType extends ICDIIntegralType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntValue.java
new file mode 100644
index 00000000000..0ae289b7d41
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntValue.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the value of a variable.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDIIntValue extends ICDIIntegralValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntegralType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntegralType.java
new file mode 100644
index 00000000000..6a0e763accc
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntegralType.java
@@ -0,0 +1,19 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIIntegralType extends ICDIType{
+
+	boolean isUnsigned();
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntegralValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntegralValue.java
new file mode 100644
index 00000000000..fa440f5093b
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIIntegralValue.java
@@ -0,0 +1,21 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.ICDIValue;
+
+
+/**
+ * 
+ * Represents the value of a variable.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDIIntegralValue extends ICDIValue {
+
+	// Implement type conversion here
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongLongType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongLongType.java
new file mode 100644
index 00000000000..55d387d7ba6
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongLongType.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDILongLongType extends ICDIIntegralType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongLongValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongLongValue.java
new file mode 100644
index 00000000000..8fce24ba8f0
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongLongValue.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the value of a variable.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDILongLongValue extends ICDIIntegralValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongType.java
new file mode 100644
index 00000000000..466055700be
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongType.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDILongType extends ICDIIntegralType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongValue.java
new file mode 100644
index 00000000000..84bf70d9ef8
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDILongValue.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the value of a variable.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDILongValue extends ICDIIntegralValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIPointerType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIPointerType.java
new file mode 100644
index 00000000000..bdebe06cd92
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIPointerType.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIPointerType extends ICDIDerivedType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIPointerValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIPointerValue.java
new file mode 100644
index 00000000000..447b5e714a5
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIPointerValue.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIPointerValue extends ICDIDerivedValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIReferenceType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIReferenceType.java
new file mode 100644
index 00000000000..5a3ea8938b1
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIReferenceType.java
@@ -0,0 +1,13 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ */
+public interface ICDIReferenceType extends ICDIDerivedType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIReferenceValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIReferenceValue.java
new file mode 100644
index 00000000000..b1f0ab96060
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIReferenceValue.java
@@ -0,0 +1,12 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ */
+public interface ICDIReferenceValue extends ICDIDerivedValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIShortType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIShortType.java
new file mode 100644
index 00000000000..450a9d6605f
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIShortType.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIShortType extends ICDIIntegralType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIShortValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIShortValue.java
new file mode 100644
index 00000000000..b4c26116040
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIShortValue.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the value of a variable.
+ * 
+ * @since April 15, 2003
+ */
+public interface ICDIShortValue extends ICDIIntegralValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIStructType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIStructType.java
new file mode 100644
index 00000000000..25d820f37e5
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIStructType.java
@@ -0,0 +1,23 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIStructType extends ICDIAggregateType {
+
+	boolean isClass();
+
+	boolean isStruct();
+
+	boolean isUnion();
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIStructValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIStructValue.java
new file mode 100644
index 00000000000..5169aa99dea
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIStructValue.java
@@ -0,0 +1,18 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIStructValue extends ICDIAggregateValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIType.java
new file mode 100644
index 00000000000..6b2472ec253
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIType.java
@@ -0,0 +1,31 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIType {
+
+	/**
+	 * Returns the name.
+	 * 
+	 * @return  the name of the data type
+	 * @throws CDIException if this method fails.
+	 */
+	String getTypeName();
+
+	/**
+	 * Returns a more desciptive name.
+	 * @return
+	 */
+	String getDetailTypeName();	
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIVoidType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIVoidType.java
new file mode 100644
index 00000000000..15ca9347fbd
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIVoidType.java
@@ -0,0 +1,19 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+
+
+/**
+ * 
+ * Represents the type of a variable.
+ * 
+ * @since Apr 15, 2003
+ */
+public interface ICDIVoidType extends ICDIType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIWCharType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIWCharType.java
new file mode 100644
index 00000000000..a9c042fa2f4
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIWCharType.java
@@ -0,0 +1,13 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+/**
+ */
+public interface ICDIWCharType extends ICDIIntegralType {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIWCharValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIWCharValue.java
new file mode 100644
index 00000000000..93db900fd58
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIWCharValue.java
@@ -0,0 +1,12 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+package org.eclipse.cdt.debug.core.cdi.model.type;
+
+/**
+ */
+public interface ICDIWCharValue extends ICDIIntegralValue {
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/AggregateType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/AggregateType.java
new file mode 100644
index 00000000000..8481295f4ff
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/AggregateType.java
@@ -0,0 +1,17 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIAggregateType;
+
+/**
+ */
+public abstract class AggregateType extends Type implements ICDIAggregateType {
+
+	public AggregateType(String typename) {
+		super(typename);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java
new file mode 100644
index 00000000000..12e46a9d3f0
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java
@@ -0,0 +1,36 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIArrayType;
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType;
+
+/**
+ */
+public class ArrayType extends DerivedType implements ICDIArrayType {
+
+	/**
+	 * @param typename
+	 */
+	public ArrayType(String typename) {
+		super(typename);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIArrayType#getComponentType()
+	 */
+	public ICDIType getComponentType() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIArrayType#getDimension()
+	 */
+	public int getDimension() {
+		return 0;
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolType.java
new file mode 100644
index 00000000000..29175de12b6
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolType.java
@@ -0,0 +1,25 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIBoolType;
+
+/**
+ */
+public class BoolType extends IntegralType implements ICDIBoolType {
+
+	/**
+	 * @param typename
+	 */
+	public BoolType(String typename) {
+		this(typename, false);
+	}
+
+	public BoolType(String typename, boolean usigned) {
+		super(typename, usigned);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java
new file mode 100644
index 00000000000..2320715eb6a
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIBoolValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class BoolValue extends IntegralValue implements ICDIBoolValue {
+
+	/**
+	 * @param v
+	 */
+	public BoolValue(Variable v) {
+		super(v);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharType.java
new file mode 100644
index 00000000000..6e4086d7efa
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharType.java
@@ -0,0 +1,24 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDICharType;
+
+/**
+ */
+public class CharType extends IntegralType implements ICDICharType {
+
+	/**
+	 * @param typename
+	 */
+	public CharType(String typename) {
+		this(typename, false);
+	}
+
+	public CharType(String typename, boolean usigned) {
+		super(typename, usigned);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharValue.java
new file mode 100644
index 00000000000..0cac662d221
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharValue.java
@@ -0,0 +1,31 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.CDIException;
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDICharValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class CharValue extends IntegralValue implements ICDICharValue {
+
+	/**
+	 * @param v
+	 */
+	public CharValue(Variable v) {
+		super(v);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDICharValue#getValue()
+	 */
+	public char getValue() throws CDIException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/DerivedType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/DerivedType.java
new file mode 100644
index 00000000000..0609e52adc4
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/DerivedType.java
@@ -0,0 +1,26 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIDerivedType;
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType;
+
+/**
+ */
+public abstract class DerivedType extends Type implements ICDIDerivedType {
+
+	public DerivedType(String typename) {
+		super(typename);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIDerivedType#getComponentType()
+	 */
+	public ICDIType getComponentType() {
+		return null;
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleType.java
new file mode 100644
index 00000000000..c64f5872ac7
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleType.java
@@ -0,0 +1,24 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIDoubleType;
+
+/**
+ */
+public class DoubleType extends FloatingPointType implements ICDIDoubleType {
+
+	/**
+	 * @param typename
+	 */
+	public DoubleType(String typename) {
+		this(typename, false, false, false);
+	}
+
+	public DoubleType(String typename, boolean isComplex, boolean isImg, boolean isLong) {
+		super(typename, isComplex, isImg, isLong);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleValue.java
new file mode 100644
index 00000000000..b6a506a7c34
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleValue.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIDoubleValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class DoubleValue extends FloatingPointValue implements ICDIDoubleValue {
+
+	/**
+	 * @param Variable
+	 */
+	public DoubleValue(Variable v) {
+		super(v);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumType.java
new file mode 100644
index 00000000000..76b56de05cd
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumType.java
@@ -0,0 +1,25 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIEnumType;
+
+/**
+ */
+public class EnumType extends IntegralType implements ICDIEnumType {
+
+	/**
+	 * @param typename
+	 */
+	public EnumType(String typename) {
+		this(typename, false);
+	}
+
+	public EnumType(String typename, boolean usigned) {
+		super(typename, usigned);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumValue.java
new file mode 100644
index 00000000000..bb331280a5e
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumValue.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIEnumValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class EnumValue extends IntegralValue implements ICDIEnumValue {
+
+	/**
+	 * @param v
+	 */
+	public EnumValue(Variable v) {
+		super(v);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatType.java
new file mode 100644
index 00000000000..2687c859612
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatType.java
@@ -0,0 +1,24 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatType;
+
+/**
+ */
+public class FloatType extends FloatingPointType implements ICDIFloatType {
+
+	/**
+	 * @param typename
+	 */
+	public FloatType(String typename) {
+		this(typename, false, false);
+	}
+
+	public FloatType(String typename, boolean isComplex, boolean isImg) {
+		super(typename, isComplex, isImg, false);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatValue.java
new file mode 100644
index 00000000000..cbf05077a7f
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatValue.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class FloatValue extends FloatingPointValue implements ICDIFloatValue {
+
+	/**
+	 * @param Variable
+	 */
+	public FloatValue(Variable v) {
+		super(v);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java
new file mode 100644
index 00000000000..e5514dfdf97
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java
@@ -0,0 +1,46 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType;
+
+/**
+ */
+public abstract class FloatingPointType extends Type implements ICDIFloatingPointType {
+
+	boolean complex;
+	boolean imaginary;
+	boolean islong;
+
+	public FloatingPointType(String typename, boolean comp, boolean img, boolean l) {
+		super(typename);
+		complex = comp;
+		imaginary = img;
+		islong = l;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType#isComplex()
+	 */
+	public boolean isComplex() {
+		return complex;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType#isImaginary()
+	 */
+	public boolean isImaginary() {
+		return imaginary;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType#isLong()
+	 */
+	public boolean isLong() {
+		return islong;
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java
new file mode 100644
index 00000000000..f8cdfe28ebd
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java
@@ -0,0 +1,23 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Value;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public abstract class FloatingPointValue extends Value implements ICDIFloatingPointValue {
+
+	/**
+	 * @param v
+	 */
+	public FloatingPointValue(Variable v) {
+		super(v);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java
new file mode 100644
index 00000000000..86be411e8d5
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java
@@ -0,0 +1,17 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIFunctionType;
+
+/**
+ */
+public class FunctionType extends DerivedType implements ICDIFunctionType {
+
+	public FunctionType(String typename) {
+		super(typename);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IncompleteType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IncompleteType.java
new file mode 100644
index 00000000000..3d7212ba54d
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IncompleteType.java
@@ -0,0 +1,20 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+
+/**
+ */
+public class IncompleteType extends Type {
+
+	/**
+	 * @param name
+	 */
+	public IncompleteType(String name) {
+		super(name);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntType.java
new file mode 100644
index 00000000000..373189f6c49
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntType.java
@@ -0,0 +1,25 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIIntType;
+
+/**
+ */
+public class IntType extends IntegralType implements ICDIIntType {
+
+	/**
+	 * @param typename
+	 */
+	public IntType(String typename) {
+		this(typename, false);
+	}
+
+	public IntType(String typename, boolean usigned) {
+		super(typename, usigned);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntValue.java
new file mode 100644
index 00000000000..5006ff4f38a
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntValue.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIIntValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class IntValue extends IntegralValue implements ICDIIntValue {
+
+	/**
+	 * @param v
+	 */
+	public IntValue(Variable v) {
+		super(v);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java
new file mode 100644
index 00000000000..f120f07376e
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java
@@ -0,0 +1,28 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIIntegralType;
+
+/**
+ */
+public abstract class IntegralType extends Type implements ICDIIntegralType {
+
+	boolean unSigned;
+
+	public IntegralType(String typename, boolean usigned) {
+		super(typename);
+		unSigned = usigned;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralType#isUnsigned()
+	 */
+	public boolean isUnsigned() {
+		return unSigned;
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java
new file mode 100644
index 00000000000..46359233f96
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java
@@ -0,0 +1,92 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.CDIException;
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIIntegralValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Value;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public abstract class IntegralValue extends Value implements ICDIIntegralValue {
+
+	/**
+	 * @param v
+	 */
+	public IntegralValue(Variable v) {
+		super(v);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#longValue()
+	 */
+	public long longValue() throws CDIException {
+		long value = 0;
+		String valueString = getValueString();
+		int space = valueString.indexOf(' ');
+		if (space != -1) {
+			valueString = valueString.substring(0, space).trim();
+		}
+		try {
+			value = Long.decode(valueString).longValue();
+		} catch (NumberFormatException e) {
+		}
+		return value;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#longValue()
+	 */
+	public int intValue() throws CDIException {
+		int value = 0;
+		String valueString = getValueString();
+		int space = valueString.indexOf(' ');
+		if (space != -1) {
+			valueString = valueString.substring(0, space).trim();
+		}
+		try {
+			value = Integer.decode(valueString).intValue();
+		} catch (NumberFormatException e) {
+		}
+		return value;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#shortValue()
+	 */
+	public short shortValue() throws CDIException {
+		short value = 0;
+		String valueString = getValueString();
+		int space = valueString.indexOf(' ');
+		if (space != -1) {
+			valueString = valueString.substring(0, space).trim();
+		}
+		try {
+			value = Short.decode(valueString).shortValue();
+		} catch (NumberFormatException e) {
+		}
+		return value;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#byteValue()
+	 */
+	public int byteValue() throws CDIException {
+		byte value = 0;
+		String valueString = getValueString();
+		int space = valueString.indexOf(' ');
+		if (space != -1) {
+			valueString = valueString.substring(0, space).trim();
+		}
+		try {
+			value = Byte.decode(valueString).byteValue();
+		} catch (NumberFormatException e) {
+		}
+		return value;
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongType.java
new file mode 100644
index 00000000000..ae58e99ba13
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongType.java
@@ -0,0 +1,25 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDILongLongType;
+
+/**
+ */
+public class LongLongType extends IntegralType implements ICDILongLongType {
+
+	/**
+	 * @param typename
+	 */
+	public LongLongType(String typename) {
+		this(typename, false);
+	}
+
+	public LongLongType(String typename, boolean usigned) {
+		super(typename, usigned);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongValue.java
new file mode 100644
index 00000000000..e2a89fbc562
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongValue.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDILongLongValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class LongLongValue extends IntegralValue implements ICDILongLongValue {
+
+	/**
+	 * @param v
+	 */
+	public LongLongValue(Variable v) {
+		super(v);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongType.java
new file mode 100644
index 00000000000..e6c551806a4
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongType.java
@@ -0,0 +1,24 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDILongType;
+
+/**
+ */
+public class LongType extends IntegralType implements ICDILongType {
+
+	/**
+	 * @param typename
+	 */
+	public LongType(String typename) {
+		this(typename, false);
+	}
+
+	public LongType(String typename, boolean usigned) {
+		super(typename, usigned);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongValue.java
new file mode 100644
index 00000000000..86253e4b8a7
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongValue.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDILongValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class LongValue extends IntegralValue implements ICDILongValue {
+
+	/**
+	 * @param v
+	 */
+	public LongValue(Variable v) {
+		super(v);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java
new file mode 100644
index 00000000000..e33695409bf
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java
@@ -0,0 +1,17 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIPointerType;
+
+/**
+ */
+public class PointerType extends DerivedType implements ICDIPointerType {
+
+	public PointerType(String typename) {
+		super(typename);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java
new file mode 100644
index 00000000000..89dcd6be2eb
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java
@@ -0,0 +1,21 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIReferenceType;
+
+/**
+ */
+public class ReferenceType extends DerivedType implements ICDIReferenceType {
+
+	/**
+	 * @param name
+	 */
+	public ReferenceType(String name) {
+		super(name);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortType.java
new file mode 100644
index 00000000000..29ceee4054e
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortType.java
@@ -0,0 +1,24 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIShortType;
+
+/**
+ */
+public class ShortType extends IntegralType implements ICDIShortType {
+
+	/**
+	 * @param typename
+	 */
+	public ShortType(String typename) {
+		this(typename, false);
+	}
+
+	public ShortType(String typename, boolean usigned) {
+		super(typename, usigned);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortValue.java
new file mode 100644
index 00000000000..2d8ce4e9375
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortValue.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIShortValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class ShortValue extends IntegralValue implements ICDIShortValue {
+
+	/**
+	 * @param v
+	 */
+	public ShortValue(Variable v) {
+		super(v);
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java
new file mode 100644
index 00000000000..143181d5601
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java
@@ -0,0 +1,44 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType;
+
+/**
+ */
+public class StructType extends AggregateType implements ICDIStructType {
+
+	/**
+	 * @param typename
+	 */
+	public StructType(String typename) {
+		super(typename);
+	}
+
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType#isClass()
+	 */
+	public boolean isClass() {
+		return getDetailTypeName().startsWith("class");
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType#isStruct()
+	 */
+	public boolean isStruct() {
+		return getDetailTypeName().startsWith("struct");
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType#isUnion()
+	 */
+	public boolean isUnion() {
+		return getDetailTypeName().startsWith("union");
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java
new file mode 100644
index 00000000000..b867d6b6e24
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java
@@ -0,0 +1,42 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType;
+
+/**
+ */
+public abstract class Type implements ICDIType {
+
+	String typename;
+	String detailName;
+
+	public Type(String name) {
+		typename = name;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIType#getTypeName()
+	 */
+	public String getTypeName() {
+		return typename;
+	}
+
+	public void setDetailTypeName(String name) {
+		detailName = name;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIType#getDetailTypeName()
+	 */
+	public String getDetailTypeName() {
+		if (detailName == null) {
+			return getTypeName();
+		}
+		return detailName;
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/VoidType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/VoidType.java
new file mode 100644
index 00000000000..6900c015f26
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/VoidType.java
@@ -0,0 +1,17 @@
+/*
+ * (c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIVoidType;
+
+/**
+ */
+public class VoidType extends Type implements ICDIVoidType {
+
+	public VoidType(String typename) {
+		super(typename);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharType.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharType.java
new file mode 100644
index 00000000000..f80351667e2
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharType.java
@@ -0,0 +1,26 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIWCharType;
+
+/**
+ */
+public class WCharType extends IntegralType implements ICDIWCharType {
+
+	/**
+	 * @param typename
+	 */
+	public WCharType(String typename) {
+		this(typename, false);
+	}
+
+	public WCharType(String typename, boolean usigned) {
+		super(typename, usigned);
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharValue.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharValue.java
new file mode 100644
index 00000000000..27bfcbdee99
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharValue.java
@@ -0,0 +1,32 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.mi.core.cdi.model.type;
+
+import org.eclipse.cdt.debug.core.cdi.CDIException;
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIWCharValue;
+import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
+
+/**
+ */
+public class WCharValue extends IntegralValue implements ICDIWCharValue {
+
+	/**
+	 * @param v
+	 */
+	public WCharValue(Variable v) {
+		super(v);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDICharValue#getValue()
+	 */
+	public char getValue() throws CDIException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+}