diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml
index 22fc29574..7a5339754 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml
@@ -251,62 +251,112 @@
     
     <ccm_core.permissions permission_id="-4110" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4160"
+                          granted_privilege="use_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4170"
+                          granted_privilege="create_new_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4180"
+                          granted_privilege="edit_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4190"
+                          granted_privilege="view_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4191"
+                          granted_privilege="delete_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4280" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4281" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4282" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4283" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4284" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4310" 
@@ -336,87 +386,142 @@
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4441" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4442" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4443" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4444" 
+                          granted_privilege="view_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4445" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4591" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4592" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4593" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4594" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4595" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4620" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
                           grantee_id="-3600" 
                           creation_date="2016-07-15"/>
     
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml
index b5772acec..90242f0ac 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml
@@ -212,62 +212,112 @@
     
     <ccm_core.permissions permission_id="-4110" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4160"
+                              granted_privilege="use_asset"
+                              object_id="-1100"
+                              grantee_id="-3200"
+                              creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4170"
+                          granted_privilege="create_new_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4180"
+                          granted_privilege="edit_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4190"
+                          granted_privilege="view_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4191"
+                          granted_privilege="delete_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4280" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4281" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4282" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4283" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4284" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4310" 
@@ -297,102 +347,157 @@
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4441" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4442" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4443" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4444" 
+                          granted_privilege="view_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4445" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4591" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4592" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4593" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4594" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4595" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4620" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
                           grantee_id="-3600" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-40000" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3700" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-41000" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3700" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-42000" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3700" 
                           creation_date="2016-07-15"/>
     
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml
index 13acbdfd6..221adce07 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml
@@ -285,233 +285,388 @@
     
     <ccm_core.permissions permission_id="-4110" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4160"
+                          granted_privilege="use_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4170"
+                          granted_privilege="create_new_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4180"
+                          granted_privilege="edit_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4190"
+                          granted_privilege="view_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4191"
+                          granted_privilege="delete_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4280" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4281" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4282" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4283" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4284" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4310" 
                           granted_privilege="administer_roles" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4320" 
                           granted_privilege="administer_workflow" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4330" 
                           granted_privilege="administer_lifecyles" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4340" 
                           granted_privilege="administer_categories" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4350" 
                           granted_privilege="administer_content_types" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
-    
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4441" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4442" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4443" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4444" 
+                          granted_privilege="view_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4445" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4591" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4592" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4593" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4594" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4595" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3600" 
                           creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4620" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    
     <ccm_core.permissions permission_id="-41100" 
                           granted_privilege="categorize_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-41200" 
                           granted_privilege="create_new_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-41300" 
                           granted_privilege="edit_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-41400" 
                           granted_privilege="view_published_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-41500" 
                           granted_privilege="preview_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41600" 
+                          granted_privilege="use_asset" 
+                          object_id="-1200" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41610" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1200" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41620" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1200" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41630" 
+                          granted_privilege="view_asset" 
+                          object_id="-1200" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41640" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1200" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-42100" 
                           granted_privilege="categorize_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-42200" 
                           granted_privilege="create_new_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-42300" 
                           granted_privilege="edit_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-42400" 
                           granted_privilege="approve_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-42500" 
                           granted_privilege="delete_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-42600" 
                           granted_privilege="view_published_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-42700" 
                           granted_privilege="preview_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42810" 
+                          granted_privilege="use_asset" 
+                          object_id="-1200" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42820" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1200" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42830" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1200" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42840" 
+                          granted_privilege="view_asset" 
+                          object_id="-1200" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42850" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1200" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-43100" 
@@ -541,7 +696,7 @@
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-43600" 
                           granted_privilege="categorize_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-43700" 
@@ -551,77 +706,132 @@
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-43800" 
                           granted_privilege="edit_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-43900" 
                           granted_privilege="approve_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-44000" 
                           granted_privilege="publish_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-44100" 
                           granted_privilege="delete_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-44200" 
                           granted_privilege="view_published_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-44300" 
                           granted_privilege="preview_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-44410" 
+                          granted_privilege="use_asset" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-44420" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-44430" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-44440" 
+                          granted_privilege="view_asset" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-44450" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1200" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-45100" 
                           granted_privilege="categorize_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-45200" 
                           granted_privilege="create_new_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-45300" 
                           granted_privilege="edit_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-45400" 
                           granted_privilege="approve_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-45500" 
                           granted_privilege="publish_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-45600" 
                           granted_privilege="delete_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-45700" 
                           granted_privilege="view_published_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-45800" 
                           granted_privilege="preview_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45910" 
+                          granted_privilege="use_asset" 
+                          object_id="-1200" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45920" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1200" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45930" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1200" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45950" 
+                          granted_privilege="view_asset" 
+                          object_id="-1200" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45960" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1200" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-46100" 
                           granted_privilege="view_published_items" 
-                          object_id="-2300" 
+                          object_id="-1200" 
+                          grantee_id="-36000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-46200" 
+                          granted_privilege="view_asset" 
+                          object_id="-1200" 
                           grantee_id="-36000" 
                           creation_date="2016-07-15"/>
 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml
index 7e7f0924d..8534b4dae 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml
@@ -232,62 +232,112 @@
     
     <ccm_core.permissions permission_id="-4110" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4160"
+                          granted_privilege="use_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4170"
+                          granted_privilege="create_new_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4180"
+                          granted_privilege="edit_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4190"
+                          granted_privilege="view_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4191"
+                          granted_privilege="delete_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>    
+    <ccm_core.permissions permission_id="-4280" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4281" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4282" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4283" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4284" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4310" 
@@ -317,87 +367,142 @@
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4441" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4442" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4443" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4444" 
+                          granted_privilege="view_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4445" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4591" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4592" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4593" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4594" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4595" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4620" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
                           grantee_id="-3600" 
                           creation_date="2016-07-15"/>
     
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml
index c6113512a..2dfa7b9c2 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml
@@ -240,62 +240,112 @@
     
     <ccm_core.permissions permission_id="-4110" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4160"
+                          granted_privilege="use_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4170"
+                          granted_privilege="create_new_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4180"
+                          granted_privilege="edit_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4190"
+                          granted_privilege="view_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4191"
+                          granted_privilege="delete_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+        <ccm_core.permissions permission_id="-4280" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4281" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4282" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4283" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4284" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4310" 
@@ -325,47 +375,77 @@
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4441" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4442" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4443" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4444" 
+                          granted_privilege="view_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4445" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4620" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
                           grantee_id="-3600" 
                           creation_date="2016-07-15"/>
     
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml
index 3b3a2946b..9c9572c7d 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml
@@ -209,62 +209,112 @@
     
     <ccm_core.permissions permission_id="-4110" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4160"
+                          granted_privilege="use_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4170"
+                          granted_privilege="create_new_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4180"
+                          granted_privilege="edit_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4190"
+                          granted_privilege="view_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4191"
+                          granted_privilege="delete_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4280" 
+                              granted_privilege="use_asset" 
+                              object_id="-1100" 
+                              grantee_id="-3300" 
+                              creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4281" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4282" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4283" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4284" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4310" 
@@ -294,87 +344,142 @@
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4441" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4442" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4443" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4444" 
+                          granted_privilege="view_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4445" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4591" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4592" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4593" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4594" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4595" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4620" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
                           grantee_id="-3600" 
                           creation_date="2016-07-15"/>
     
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
index 816ad6a9b..5a893922c 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
@@ -243,62 +243,112 @@
     
     <ccm_core.permissions permission_id="-4110" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4120" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4130" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4140" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4150" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3200" 
                           creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4160"
+                          granted_privilege="use_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4170"
+                          granted_privilege="create_new_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4180"
+                          granted_privilege="edit_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4190"
+                          granted_privilege="view_asset"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
+    <ccm_core.permissions permission_id="-4191"
+                          granted_privilege="delete_assets"
+                          object_id="-1100"
+                          grantee_id="-3200"
+                          creation_date="2016-07-15" />
     <ccm_core.permissions permission_id="-4210" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4220" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4230" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4240" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4250" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4260" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4270" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4280" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4281" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4282" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4283" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4284" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4310" 
@@ -328,87 +378,142 @@
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4360" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4370" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4380" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4390" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4410" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4420" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4430" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4441" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4442" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4443" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4444" 
+                          granted_privilege="view_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4445" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4510" 
                           granted_privilege="categorize_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4520" 
                           granted_privilege="create_new_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4530" 
                           granted_privilege="edit_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4540" 
                           granted_privilege="approve_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4550" 
                           granted_privilege="publish_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4560" 
                           granted_privilege="delete_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4570" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4580" 
                           granted_privilege="preview_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4591" 
+                          granted_privilege="use_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4592" 
+                          granted_privilege="create_new_assets" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4593" 
+                          granted_privilege="edit_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4594" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4595" 
+                          granted_privilege="delete_assets" 
+                          object_id="-1100" 
                           grantee_id="-3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4610" 
                           granted_privilege="view_published_items" 
-                          object_id="-2100" 
+                          object_id="-1100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4620" 
+                          granted_privilege="view_asset" 
+                          object_id="-1100" 
                           grantee_id="-3600" 
                           creation_date="2016-07-15"/>