diff --git a/ccm-cms-types-baseAddress/pdl/com/arsdigita/content-types/BaseAddress.pdl b/ccm-cms-types-baseAddress/pdl/com/arsdigita/content-types/BaseAddress.pdl
index f9299b601..fd70eff04 100644
--- a/ccm-cms-types-baseAddress/pdl/com/arsdigita/content-types/BaseAddress.pdl
+++ b/ccm-cms-types-baseAddress/pdl/com/arsdigita/content-types/BaseAddress.pdl
@@ -11,6 +11,6 @@ object type BaseAddress extends ContentItem {
     String [0..1] state = ct_baseAddresses.state VARCHAR(200);
     String [0..1] isoCountryCode = ct_baseAddresses.isoCountryCode VARCHAR(2);
 
-    reference key ( ct_baseAddress.address_id );
+    reference key ( ct_baseAddresses.address_id );
 }
 
diff --git a/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/oracle-se-create.sql b/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/oracle-se-create.sql
deleted file mode 100755
index 733784c1c..000000000
--- a/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/oracle-se-create.sql
+++ /dev/null
@@ -1,22 +0,0 @@
---
--- Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved.
---
--- This library is free software; you can redistribute it and/or
--- modify it under the terms of the GNU Lesser General Public License
--- as published by the Free Software Foundation; either version 2.1 of
--- the License, or (at your option) any later version.
---
--- This library is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--- Lesser General Public License for more details.
---
--- You should have received a copy of the GNU Lesser General Public
--- License along with this library; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---
--- $Id: oracle-se-create.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/17 23:15:09 $
-@ ddl/oracle-se/create.sql
-
-@ ddl/oracle-se/deferred.sql
diff --git a/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/postgres-create.sql b/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/postgres-create.sql
deleted file mode 100755
index 7ea108389..000000000
--- a/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/postgres-create.sql
+++ /dev/null
@@ -1,23 +0,0 @@
---
--- Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved.
---
--- This library is free software; you can redistribute it and/or
--- modify it under the terms of the GNU Lesser General Public License
--- as published by the Free Software Foundation; either version 2.1 of
--- the License, or (at your option) any later version.
---
--- This library is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--- Lesser General Public License for more details.
---
--- You should have received a copy of the GNU Lesser General Public
--- License along with this library; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---
--- $Id: postgres-create.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/17 23:15:09 $
-begin;
-\i ddl/postgres/create.sql
-\i ddl/postgres/deferred.sql
-end;
diff --git a/ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml b/ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml
new file mode 100644
index 000000000..8c99f5d9e
--- /dev/null
+++ b/ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" 
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+		   xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
+
+  <ctd:content-type
+      label="BaseAddress"
+      description="A basic Address type"
+      objectType="com.arsdigita.cms.contenttypes.BaseAddress"
+      classname="com.arsdigita.cms.contenttypes.BaseAddress">
+    
+    <ctd:authoring-kit 
+	createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
+     
+      <ctd:authoring-step 
+	  labelKey="baseAddress.authoring.basic_properties.title" 
+	  labelBundle="com.arsdigita.cms.contenttypes.BaseAddressResources"
+	  descriptionKey="baseAddress.authoring.basic_properties.description" 
+	  descriptionBundle="com.arsdigita.cms.contenttypes.BaseAddressResources"
+	  component="com.arsdigita.cms.contenttypes.ui.BaseAddressPropertiesStep" 
+	  ordering="1"/>
+      
+      <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
+    </ctd:authoring-kit>
+    
+  </ctd:content-type>
+</ctd:content-types>
diff --git a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java
index e3e03e12e..f36d0e560 100755
--- a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java
+++ b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java
@@ -21,7 +21,7 @@ package com.arsdigita.cms.contenttypes;
 
 import com.arsdigita.globalization.LocaleNegotiator;
 import com.arsdigita.cms.ContentType;
-import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.ContentPage;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
@@ -43,7 +43,7 @@ import java.util.Locale;
  * 
  * @author Sören Bernstein
  **/
-public class BaseAddress extends ContentItem {
+public class BaseAddress extends ContentPage {
 
     /** PDL property name for address */
     public static final String ADDRESS = "address";