diff --git a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl
new file mode 100644
index 000000000..e6a094a82
--- /dev/null
+++ b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl
@@ -0,0 +1,9 @@
+model com.arsdigita.cms.contenttypes;
+
+import com.arsdigita.cms.ContentPage;
+
+object type OrganizationRole extends ContentPage {
+       String[1..1] rolename = ct_genericorganization_roles.rolename VARCHAR(512);
+
+       reference key (ct_genericorganization_roles.role_id);
+}
\ No newline at end of file
diff --git a/ccm-cms-types-genericorganization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/GenericOrganization.xml b/ccm-cms-types-genericorganization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/GenericOrganization.xml
new file mode 100644
index 000000000..911e3b201
--- /dev/null
+++ b/ccm-cms-types-genericorganization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/GenericOrganization.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xrd:adapters xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules" 
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	      xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
+  <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
+       <xrd:adapter objectType="com.arsdigita.cms.contenttypes.OrganizationRole"
+		    extends="com.arsdigita.cms.ContentPage" 
+		    traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
+	      <xrd:attributes rule="exclude">
+	      </xrd:attributes>
+	      
+	      <xrd:associations rule="include">
+		<xrd:property name="/object/rolename"/>	
+	      </xrd:associations>
+	      
+       </xrd:adapter>
+
+       <xrd:adapter objectType="com.arsdigita.cms.contenttypes.GenericOrganization" 
+		    extends="com.arsdigita.cms.TextPage" 
+		    traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
+	 <xrd:attributes rule="exclude">
+	   <xrd:property name="/object/roles/id"/>
+	   <xrd:property name="/object/roles/defaultDomainClass"/>
+	   <xrd:property name="/object/roles/objectType"/>
+	   <xrd:property name="/object/roles/displayName"/>
+	   <xrd:property name="/object/roles/isDeleted"/>
+	   <xrd:property name="/object/roles/ancestors"/>
+	   <xrd:property name="/object/roles/version"/>
+	   <xrd:property name="/object/roles/name"/>
+	   <xrd:property name="/object/roles/language"/>
+	 </xrd:attributes>
+	 <xrd:associations rule="include">
+	   <xrd:property name="/object/organizationroles"/>
+	 </xrd:associations>
+       </xrd:adapter>
+  </xrd:context>
+
+  <xrd:context name="com.arsdigita.cms.search.ContentPageMetadataProvider">
+    <xrd:adapter objectType="com.arsdigita.cms.contenttypes.GenericOrganization" extends="com.arsdigita.cms.ContentItem" traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/roles/id"/>
+        <xrd:property name="/object/roles/defaultDomainClass"/>
+        <xrd:property name="/object/roles/objectType"/>
+        <xrd:property name="/object/roles/displayName"/>
+        <xrd:property name="/object/roles/isDeleted"/>
+        <xrd:property name="/object/roles/ancestors"/>
+        <xrd:property name="/object/roles/version"/>
+        <xrd:property name="/object/roles/name"/>
+        <xrd:property name="/object/roles/language"/>
+      </xrd:attributes>
+
+    </xrd:adapter>
+  </xrd:context>
+
+  <xrd:context name="com.arsdigita.cms.contenttypes.OrganizationRoleMetadataProvider">
+    <xrd:adapter objectType="com.arsdigita.cms.contenttypes.OrganizationRole" 
+      traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/objectType"/>
+        <xrd:property name="/object/displayName"/>
+        <xrd:property name="/object/isDeleted"/>
+        <xrd:property name="/object/ancestors"/>
+        <xrd:property name="/object/version"/>
+        <xrd:property name="/object/name"/>
+        <xrd:property name="/object/language"/>
+
+      </xrd:attributes>
+      <xrd:associations rule="include">
+        <xrd:property name="/object/text"/>
+      </xrd:associations>
+    </xrd:adapter>
+  </xrd:context>
+  
+</xrd:adapters>
\ No newline at end of file
diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/genericorganization/RoleEditForm.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/genericorganization/RoleEditForm.java
index 9321b3bb5..5436164fc 100644
--- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/genericorganization/RoleEditForm.java
+++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/genericorganization/RoleEditForm.java
@@ -13,7 +13,6 @@ import com.arsdigita.bebop.event.FormProcessListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.event.FormSubmissionListener;
 import com.arsdigita.bebop.form.TextField;
-import com.arsdigita.bebop.parameters.BigDecimalParameter;
 import com.arsdigita.bebop.parameters.NotNullValidationListener;
 import com.arsdigita.bebop.parameters.TrimmedStringParameter;
 import com.arsdigita.cms.ItemSelectionModel;
@@ -143,6 +142,10 @@ public class RoleEditForm extends Form {
             }
 
             role.setRolename((String)data.get(OrganizationRole.ROLENAME));
+
+            if(m_container != null) {
+                m_container.onlyShowComponent(state, GenericOrganizationViewRoles.ROLES_TABLE + m_container.getTypeIdStr());
+            }
         }
     }