diff --git a/ccm-cms-types-baseContact/sql/ccm-cms-types-baseContact/postgres-create.sql b/ccm-cms-types-baseContact/sql/ccm-cms-types-baseContact/postgres-create.sql
new file mode 100644
index 000000000..a733590e2
--- /dev/null
+++ b/ccm-cms-types-baseContact/sql/ccm-cms-types-baseContact/postgres-create.sql
@@ -0,0 +1,3 @@
+begin;
+\i ddl/postgres/create.sql
+end;
\ No newline at end of file
diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrganizationalUnit.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrganizationalUnit.java
index 1a9b850a9..e20eb31cd 100644
--- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrganizationalUnit.java
+++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrganizationalUnit.java
@@ -18,12 +18,18 @@
  */
 package com.arsdigita.cms.contenttypes;
 
+import com.arsdigita.bebop.Page;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.cms.CMS;
+import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentPage;
+import com.arsdigita.cms.ExtraXMLGenerator;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.util.Assert;
+import com.arsdigita.xml.Element;
 import java.math.BigDecimal;
 import org.apache.log4j.Logger;
 
@@ -31,7 +37,7 @@ import org.apache.log4j.Logger;
  *
  * @author Jens Pelzetter <jens@jp-digital.de>
  */
-public class OrganizationalUnit extends ContentPage {
+public class OrganizationalUnit extends ContentPage implements ExtraXMLGenerator {
 
     private final static Logger logger = Logger.getLogger(OrganizationalUnit.class);
 
@@ -45,6 +51,7 @@ public class OrganizationalUnit extends ContentPage {
 
     public OrganizationalUnit() {
         super(BASE_DATA_OBJECT_TYPE);
+        extraXMLGenerators.add(this);
     }
 
     public OrganizationalUnit(BigDecimal id) throws DataObjectNotFoundException {
@@ -53,14 +60,17 @@ public class OrganizationalUnit extends ContentPage {
 
     public OrganizationalUnit(OID id) throws DataObjectNotFoundException {
         super(id);
+        extraXMLGenerators.add(this);
     }
 
     public OrganizationalUnit(DataObject obj) {
         super(obj);
+        extraXMLGenerators.add(this);
     }
 
     public OrganizationalUnit(String type) {
         super(type);
+        extraXMLGenerators.add(this);
     }
 
     /* accessors ***************************************************/
@@ -113,5 +123,15 @@ public class OrganizationalUnit extends ContentPage {
     @Override
     public String getBaseDataObjectType() {
         return BASE_DATA_OBJECT_TYPE;
+    }    
+
+    public void generateXML(ContentItem item, Element element, PageState state) {
+        Element members = element.newChildElement("cms:organizationalunitMembersPanel", CMS.CMS_XML_NS);
+
+        
+    }
+
+    public void addGlobalStateParams(Page p) {
+
     }
 }
diff --git a/ccm-cms-types-person/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Person.xml b/ccm-cms-types-person/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Person.xml
index 5eaa52b33..406d6d0be 100644
--- a/ccm-cms-types-person/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Person.xml
+++ b/ccm-cms-types-person/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Person.xml
@@ -20,7 +20,7 @@
 	  descriptionBundle="com.arsdigita.cms.contenttypes.PersonResources"
 	  component="com.arsdigita.cms.contenttypes.ui.PersonPropertiesStep" 
 	  ordering="1"/>
-      
+
       <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
     </ctd:authoring-kit>
     
diff --git a/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/Person.java b/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/Person.java
index 2446fdc2d..e7e3630f1 100644
--- a/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/Person.java
+++ b/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/Person.java
@@ -20,7 +20,6 @@
 package com.arsdigita.cms.contenttypes;
 
 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;
@@ -39,7 +38,7 @@ public class Person extends ContentPage {
     public static final String SURNAME = "surname";
     public static final String GIVENNAME = "givenname";
     public static final String TITLEPRE = "titlepre";
-    public static final String TITLEPOST = "titlepost";
+    public static final String TITLEPOST = "titlepost";    
     /** Data object type for this domain object */
     public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.Person";
     private static final PersonConfig s_config = new PersonConfig();
@@ -109,5 +108,5 @@ public class Person extends ContentPage {
      }
      public void setTitlePost(String titlePost) {
          set(TITLEPOST, titlePost);
-     }
+     }     
 }
diff --git a/ccm-cms-types-person/web/static/content-types/com/arsdigita/cms/contenttypes/Person.xsl b/ccm-cms-types-person/web/static/content-types/com/arsdigita/cms/contenttypes/Person.xsl
index 3f366cbcc..b442a8ff2 100644
--- a/ccm-cms-types-person/web/static/content-types/com/arsdigita/cms/contenttypes/Person.xsl
+++ b/ccm-cms-types-person/web/static/content-types/com/arsdigita/cms/contenttypes/Person.xsl
@@ -10,21 +10,19 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Person']"
 		mode="cms:CT_graphics"
 		name="cms:CT_graphics_com_arsdigita_cms_contenttypes_Person">
-    <xsl:if test="./surname and ./givenName">
+    <!-- <xsl:if test="./surname and ./givenName"> -->
       <p>
-        <xsl:value-of select="./titlepre"/> <xsl:value-of select="./givenname"/> <xsl:value-of select="./surname"/> <xsl:value-of select="./titlepost"/>
+        <xsl:value-of select="./titlepre"/>&nbsp;<xsl:value-of select="./givenname"/>&nbsp;<xsl:value-of select="./surname"/>&nbsp;<xsl:value-of select="./titlepost"/>
       </p>      
-    </xsl:if>
+      <!-- </xsl:if> -->
   </xsl:template>
 
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Person']"
 		mode="cms:CT_text"
 		name="cms:CT_text_com_arsdigita_cms_contenttypes_Person">
-    <xsl:if test="./surname and ./givenName">
       <p>
         <xsl:value-of select="./titlepre"/> <xsl:value-of select="./givenname"/> <xsl:value-of select="./surname"/> <xsl:value-of select="./titlepost"/>
       </p>      
-    </xsl:if>
     
   </xsl:template>