diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml
new file mode 100644
index 0000000000..07e035e4df
--- /dev/null
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+    
+    <!--  Assignable Capabilities -->
+    
+    <bean id="rmCreateAndAssociateSelectionListsCapability" 
+    	  parent="declarativeCapability">
+    	<property name="name" value="CreateAndAssociateSelectionLists"/>
+   		<property name="permission" value="CreateAndAssociateSelectionLists"/>
+    </bean>
+                
+    <bean id="rmEditSelectionListsCapability" 
+		  parent="declarativeCapability">
+		<property name="name" value="EditSelectionLists" />
+		<property name="permission" value="EditSelectionLists" />
+	</bean>	 
+
+    <!--  Non-Assignable Capabilities -->
+    
+    <bean id="rmListAdmin" 
+    	  parent="compositeCapability">
+        <property name="name" value="ListAdmin"/>
+    	<property name="private" value="true"/>    	
+    	<property name="capabilities">
+    		<list>
+    			<ref bean="rmCreateAndAssociateSelectionListsCapability"/>
+    			<ref bean="rmEditSelectionListsCapability"/>    			   			
+    		</list>
+    	</property>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
index 6562f36cc8..127bd49f6b 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
@@ -23,6 +23,7 @@
    				<entry key="capabilityCondition.filling" value="true"/>
    				<entry key="capabilityCondition.frozen" value="false"/>   				
    				<entry key="capabilityCondition.declared" value="true"/>
+   				<entry key="capabilityCondition.cutoff" value="false"/>
    			</map>
    		</property>
     </bean>
@@ -98,8 +99,7 @@
    			<map>
    				<entry key="capabilityCondition.filling" value="true"/>
    				<entry key="capabilityCondition.cutoff" value="false"/>
-   				<entry key="capabilityCondition.frozen" value="false"/>   				
-   				<entry key="capabilityCondition.closed" value="false"/>   				   				
+   				<entry key="capabilityCondition.frozen" value="false"/>   				   				
    				<entry key="capabilityCondition.declared" value="false"/>
    			</map>
    		</property>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
index 47d20b61d5..6a96bc9641 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
@@ -66,12 +66,6 @@
    		</property>
     </bean>
     
-    <bean id="rmCreateAndAssociateSelectionListsCapability" 
-    	  parent="declarativeCapability">
-    	<property name="name" value="CreateAndAssociateSelectionLists"/>
-   		<property name="permission" value="CreateAndAssociateSelectionLists"/>
-    </bean>
-    
     <bean id="rmCreateModifyDestroyClassificationGuidesCapability" 
           parent="declarativeCapability">
     	<property name="name" value="CreateModifyDestroyClassificationGuides"/>
@@ -162,12 +156,6 @@
 		<property name="permission" value="DisplayRightsReport" />
 	</bean>
     
-    <bean id="rmEditSelectionListsCapability" 
-		  parent="declarativeCapability">
-		<property name="name" value="EditSelectionLists" />
-		<property name="permission" value="EditSelectionLists" />
-	</bean>	 
-    
     <bean id="rmMakeOptionalPropertiesMandatoryCapability" 
 		  parent="declarativeCapability">
 		<property name="name" value="MakeOptionalParametersMandatory" />
@@ -294,6 +282,9 @@
     <!-- Audit capabilities -->
     <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml"/>
     
+    <!-- List capabilities -->
+    <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml"/>
+    
     <!-- Group capabilities -->
     <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml"/>  
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java
index e133a4c1b3..ce923d79a0 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java
@@ -43,6 +43,9 @@ public class CompositeCapability extends DeclarativeCapability
         this.capabilities = capabilities;
     }
     
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCapability#evaluateImpl(org.alfresco.service.cmr.repository.NodeRef)
+     */
     @Override
     public int evaluateImpl(NodeRef nodeRef)
     {   
@@ -66,6 +69,11 @@ public class CompositeCapability extends DeclarativeCapability
         return result;
     }
     
+    /**
+     * If a target capability is specified then we evaluate that.  Otherwise we combine the results of the provided capabilities.
+     * 
+     * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCapability#evaluate(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
+     */
     @Override
     public int evaluate(NodeRef source, NodeRef target)
     {
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java
index 130b12849a..2ece0c8ea7 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java
@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 
 /**
- * Update properties capability
+ * Update properties capability.
  * 
  * @author andyh
  */