diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-add-language.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-add-language.xml
index 709d38c4a..d9c5dc1a5 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-add-language.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-add-language.xml
@@ -427,16 +427,22 @@
                               type="folder" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_cms.content_section_roles role_id="3100" 
@@ -453,171 +459,205 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-normalize.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-normalize.xml
index e6172862a..b2a7a3034 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-normalize.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-normalize.xml
@@ -417,16 +417,22 @@
                               type="folder" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_cms.content_section_roles role_id="3100" 
@@ -443,171 +449,205 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-remove-language.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-remove-language.xml
index e6dfd5385..7965f8504 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-remove-language.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-remove-language.xml
@@ -401,16 +401,22 @@
                               type="folder" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_cms.content_section_roles role_id="3100" 
@@ -427,171 +433,205 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/data.xml
index 30b03a755..953e1ff1a 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/data.xml
@@ -378,16 +378,22 @@
                               type="folder" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_cms.content_section_roles role_id="3100" 
@@ -404,171 +410,205 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
index 7ab94d814..89f7641f6 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
@@ -340,17 +340,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -777,16 +777,22 @@
                              attachment_list_id="510020" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -813,286 +819,343 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4810" 
+ uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5000" 
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
@@ -1103,55 +1166,64 @@
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
 
 </dataset>
-
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
index 219620fa6..b32329d7b 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
@@ -341,17 +341,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -778,16 +778,22 @@
                              attachment_list_id="510020" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -814,276 +820,331 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4810" 
+ uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
@@ -1094,6 +1155,7 @@
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
@@ -1104,51 +1166,61 @@
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
index 96f64b3f6..b8e269f87 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
@@ -340,17 +340,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -777,16 +777,22 @@
                              attachment_list_id="510020" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -813,196 +819,235 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
@@ -1013,141 +1058,169 @@
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5000" 
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5020" 
+ uuid="ed993396-2435-4018-b2bc-1c18f2383093"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml
index 9b9d2c85e..9b3701f24 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml
@@ -354,17 +354,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -714,16 +714,22 @@
                              attachment_list_id="510010" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -753,408 +759,476 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
-    <ccm_core.permissions permission_id="4810" 
+    <ccm_core.permissions permission_id="4810"
+ uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
-    <ccm_core.permissions permission_id="5000" 
+    <ccm_core.permissions permission_id="5000"
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
-    <ccm_core.permissions permission_id="5020" 
+    <ccm_core.permissions permission_id="5020"
+ uuid="ed993396-2435-4018-b2bc-1c18f2383093"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
index 03509b670..78fa04a40 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
@@ -367,17 +367,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -727,16 +727,22 @@
                              attachment_list_id="510010" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -769,408 +775,476 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
-    <ccm_core.permissions permission_id="4810" 
+    <ccm_core.permissions permission_id="4810"
+ uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
-    <ccm_core.permissions permission_id="5000" 
+    <ccm_core.permissions permission_id="5000"
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
-    <ccm_core.permissions permission_id="5020" 
+    <ccm_core.permissions permission_id="5020"
+ uuid="ed993396-2435-4018-b2bc-1c18f2383093"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
index aff8afd48..417897450 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
@@ -319,17 +319,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -652,16 +652,22 @@
                              attachment_list_id="510010" />
 
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -688,196 +694,235 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
@@ -888,145 +933,172 @@
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="5000" 
+    <ccm_core.permissions permission_id="5000"
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324" 
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5020" 
+ uuid="ed993396-2435-4018-b2bc-1c18f2383093"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
 
 </dataset>
-
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
index 44d134621..29eab2183 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
@@ -319,17 +319,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -653,16 +653,22 @@
                              attachment_list_id="510010" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -689,197 +695,236 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
 
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
@@ -890,146 +935,172 @@
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5000" 
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5020" 
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
 
 </dataset>
-
-
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
index 6d54cef68..bee639b59 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
@@ -340,17 +340,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -778,16 +778,22 @@
                              attachment_list_id="510020" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -814,341 +820,409 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4810" 
+ uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5000" 
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5020" 
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
index fafc104ad..c9224fd23 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
@@ -333,17 +333,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -711,16 +711,22 @@
                              attachment_list_id="510010" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -747,341 +753,409 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="4810" 
+    <ccm_core.permissions permission_id="4810"
+ uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="5000" 
+    <ccm_core.permissions permission_id="5000"
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="5020" 
+    <ccm_core.permissions permission_id="5020"
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
index bc3888857..17459481a 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
@@ -323,17 +323,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -653,16 +653,22 @@
                              attachment_list_id="510010" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -689,341 +695,409 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="4810" 
+    <ccm_core.permissions permission_id="4810"
+ uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="5000" 
+    <ccm_core.permissions permission_id="5000"
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="5020" 
+    <ccm_core.permissions permission_id="5020"
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
index a067584de..9b0066dd1 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
@@ -319,17 +319,17 @@
     <ccm_cms.content_types object_id="20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20200" 
                            content_item_class="org.librecms.contenttypes.News" 
                            content_section_id="1100" 
-                           default_workflow="-100" 
+                           default_workflow="100" 
                            default_lifecycle_id="200" />
     <ccm_cms.content_types object_id="20300" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="1200" 
-                           default_workflow="-120" 
+                           default_workflow="120" 
                            default_lifecycle_id="220" />
     
     <ccm_cms.content_items object_id="10100" 
@@ -652,16 +652,22 @@
                              attachment_list_id="510010" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
@@ -688,408 +694,476 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4710" 
+                          uuid="c028d82d-aeed-4d3f-9ac2-fbff77095daa"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4720" 
+uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4730" 
+uuid="2be7c09b-62cd-4f10-b9d7-35ae3cf950f6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4740" 
+uuid="4e00a25c-cb54-46d9-bc36-fbf3e2c59a24"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4750" 
+uuid="4a41e591-7bb8-4211-a07f-d6750a70a0e4"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"
                           inherited="false" />
-    <ccm_core.permissions permission_id="4810" 
+    <ccm_core.permissions permission_id="4810"
+ uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4820" 
+uuid="1adc43f2-4d66-4434-8c89-9f20638af016"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4830" 
+uuid="c12d6501-d5ea-4abc-9473-bd510baf72c2"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4840" 
+uuid="a4ebe703-4e9e-4890-b1b0-d753ff5ee663"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4850" 
+uuid="521d47e0-a57e-4c06-8be3-3da3fff989c3"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4860" 
+uuid="d3ea3c88-ef3b-499d-bc67-e6cefe760c68"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4870" 
+uuid="a4285a7d-38c6-43e6-8cd5-a60da8689f22"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4910" 
+uuid="067c45d2-9491-4138-8491-a0158772b194"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4920" 
+uuid="a2299bda-c3ad-457c-993d-b8cba3413d39"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4930" 
+uuid="c88a2f5e-297c-4b97-8e3c-523757982b50"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4940" 
+uuid="1af6d262-40b6-4eac-b048-ea7c083fb1b7"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4950" 
+uuid="d88cef70-8a7d-4880-9f0d-f2e92710df63"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4960" 
+uuid="434c1b94-c005-4f21-a2e2-49b943827701"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4970" 
+uuid="921f5c69-124e-4df0-9f68-5f20ad62bcf5"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4980" 
+uuid="fd940884-5c29-4ae6-a08d-a4f7e3e237b6"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4990" 
+uuid="df11e96d-32ab-479e-9ad4-4eee8f474960"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
-    <ccm_core.permissions permission_id="5000" 
+    <ccm_core.permissions permission_id="5000"
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5010" 
+uuid="3f6658cc-40ef-4f96-a9ad-0285d277a5ed"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
-    <ccm_core.permissions permission_id="5020" 
+    <ccm_core.permissions permission_id="5020"
+ uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5030" 
+uuid="afd380e5-c8e1-4387-9bb1-e5c36fee77df"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5110" 
+uuid="4a395994-5c4a-4fcf-8e7b-e1725cedc970"
                           granted_privilege="categorize_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5120" 
+uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
                           granted_privilege="create_new_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5130" 
+uuid="2b89b636-564e-497c-9246-f07ec943e935"
                           granted_privilege="edit_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5140" 
+uuid="eeb6e334-96f9-41a8-b7f3-66ba0af63aaa"
                           granted_privilege="approve_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5150" 
+uuid="378e6f16-a8a1-4950-b74e-4198bdcec88d"
                           granted_privilege="publish_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5160" 
+uuid="fcce867f-c443-4485-83e5-57c183b61450"
                           granted_privilege="delete_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5170" 
+uuid="45936f2e-b855-427f-bdb5-87f14f2bf46c"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5180" 
+uuid="972df108-98f9-4d9d-8f20-8fd6487ac194"
                           granted_privilege="preview_items" 
                           object_id="2300" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="5210" 
+uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemRepositoryTest/after-save.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemRepositoryTest/after-save.xml
index b53c5086d..190ba0eab 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemRepositoryTest/after-save.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemRepositoryTest/after-save.xml
@@ -338,16 +338,22 @@
                               type="folder" />
     
     <ccm_core.ccm_roles role_id="3100"
+                        uuid="05306ce9-c4bd-4a03-9737-b836d0db94bf"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="3200"
+                        uuid="43e8d5d3-1509-4dbe-99d7-6c8a213e4705"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="3300"
+                        uuid="b5b48475-4d58-4646-be95-44b1fafb0136"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="3400"
+                        uuid="7a818326-0f1b-4aba-9a2e-9cbe9db7618a"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="3500"
+                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_cms.content_section_roles role_id="3100" 
@@ -364,414 +370,496 @@
                                    section_id="1100" />
     
     <ccm_core.permissions permission_id="4110" 
+                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41101" 
+                          uuid="9f21f550-b291-459f-998a-fe7af3fe33ed"
                           granted_privilege="categorize_items" 
                           object_id="10100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41102" 
+                          uuid="298c84b1-64b8-449e-99d0-b4332ed3da26"
                           granted_privilege="categorize_items" 
                           object_id="10200" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41103" 
+                          uuid="582e5e87-2407-4367-85f9-c7b38624b465"
                           granted_privilege="categorize_items" 
                           object_id="10300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41104" 
+                          uuid="4d8e8ad6-3b38-4ab1-8c46-8cdf0e326676"
                           granted_privilege="categorize_items" 
                           object_id="10400" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4120" 
+                          uuid="f91b1f8e-1c60-43a8-9606-493f79f96bc9"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41201" 
+                          uuid="bd562b41-b07c-4033-9229-0169cf53ab91"
                           granted_privilege="create_new_items" 
                           object_id="10100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41202" 
+                          uuid="0c2808ab-b80b-4529-9391-13e7426f8ff8"
                           granted_privilege="create_new_items" 
                           object_id="10200" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41203" 
+                          uuid="8f42b266-7fbe-43e7-abbe-fafba229c8a4"
                           granted_privilege="create_new_items" 
                           object_id="10300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41204" 
+                          uuid="6c2a3ef2-395c-4322-b1b3-674566586b77"
                           granted_privilege="create_new_items" 
                           object_id="10400" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4130" 
+                          uuid="cbbebcc5-520e-435e-b164-98d9cc4130e3"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41301" 
+                          uuid="43b07edb-c824-4eb1-9989-c45211f03735"
                           granted_privilege="edit_items" 
                           object_id="10100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41302" 
+                          uuid="827822b8-c127-475d-a87e-cf1a9f21a1ce"
                           granted_privilege="edit_items" 
                           object_id="10200" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41303" 
+                          uuid="b3961e11-28fb-4f32-92e4-a4c74abaac2c"
                           granted_privilege="edit_items" 
                           object_id="10300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41304" 
+                          uuid="d6b80364-4ef9-4735-ad9a-7df7bb878245"
                           granted_privilege="edit_items" 
                           object_id="10400" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41401" 
+                          uuid="082d66cd-0d53-49e3-9799-3a22a0294c09"
                           granted_privilege="view_published_items" 
                           object_id="10100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41402" 
+                          uuid="a5a365ee-bf1c-4a04-bfee-970d6cc3a0af"
                           granted_privilege="view_published_items" 
                           object_id="10200" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41403" 
+                          uuid="80636d3e-2988-458b-b273-ebd3a29a8744"
                           granted_privilege="view_published_items" 
                           object_id="10300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41404" 
+                          uuid="6519b9c2-7500-438f-b9da-d449eaf70ce6"
                           granted_privilege="view_published_items" 
                           object_id="10400" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4151" 
+                          uuid="90c6bc39-9298-4514-9eaa-a346ab5daf4e"
                           granted_privilege="preview_items" 
                           object_id="10100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41502" 
+                          uuid="fb6bc3a6-70e7-448d-b86c-ff43f78100d9"
                           granted_privilege="preview_items" 
                           object_id="10200" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41503" 
+                          uuid="4f665850-0d47-448d-8c18-921b08ec9e29"
                           granted_privilege="preview_items" 
                           object_id="10300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41504" 
+                          uuid="ab1b890c-1798-4c32-88b0-564d0d0688f9"
                           granted_privilege="preview_items" 
                           object_id="10400" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42101" 
+                          uuid="0e799cba-d019-4890-9299-08915810bb54"
                           granted_privilege="categorize_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42102" 
+                          uuid="23b8bdea-8fc0-4029-b20b-52f23b6d4b1a"
                           granted_privilege="categorize_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42103" 
+                          uuid="b05359d5-ee6c-4b38-9900-5554ea57ed80"
                           granted_privilege="categorize_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="42104" 
+    <ccm_core.permissions permission_id="42104"
+                          uuid="9678a19b-83be-4ebc-976c-6c2eb0598e5c"
                           granted_privilege="categorize_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42201" 
+                          uuid="505c8a07-ba22-470a-bb75-05dda4944d3c"
                           granted_privilege="create_new_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42202" 
+                          uuid="47d6db19-072e-4e13-b61e-66ef2c32b870"
                           granted_privilege="create_new_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42203" 
+                          uuid="5e778b29-ba2d-45d5-bdc5-33ea9409a469"
                           granted_privilege="create_new_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="422014" 
+                          uuid="b550a408-fb6a-484a-a40c-1347a0e3335d"
                           granted_privilege="create_new_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42301" 
+                          uuid="fef3cbcf-bd3e-40fa-97ea-3d20af48dd3d"
                           granted_privilege="edit_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="42302" 
+    <ccm_core.permissions permission_id="42302"
+                          uuid="8b2f252a-4e24-4492-94c2-1ea786bf96b4"
                           granted_privilege="edit_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42303" 
+                          uuid="bde3b937-0303-401a-820e-772934897ce6"
                           granted_privilege="edit_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42304" 
+                          uuid="750267f6-51b6-404f-a767-d5b4b18250d2"
                           granted_privilege="edit_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42401" 
+                          uuid="bf928ed7-b3e2-45ad-b03a-a58ffbb93b1a"
                           granted_privilege="approve_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42402" 
+                          uuid="ca44f345-5f11-45ff-a702-083c9b818e3b"
                           granted_privilege="approve_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42403" 
+                          uuid="5f3d258b-9890-470b-8f1a-7093ea7bf66b"
                           granted_privilege="approve_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42404" 
+                          uuid="0136c026-37e5-4175-80d0-0a2b0c9ba7b1"
                           granted_privilege="approve_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42501" 
+                          uuid="25b8ad88-9d7b-4058-802c-0874d1dde6fc"
                           granted_privilege="delete_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42502" 
+                          uuid="1e6f5976-6043-43f2-86d8-586625b16d98"
                           granted_privilege="delete_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="42503" 
+    <ccm_core.permissions permission_id="42503"
+                          uuid="da666da9-c82b-4911-8e5d-c83432ab86dd"
                           granted_privilege="delete_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42504" 
+                          uuid="fd9a0c54-3a75-4f19-b99a-cd571359e222"
                           granted_privilege="delete_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42601" 
+                          uuid="3558ebb9-e555-4672-87e1-a34b8e9217d4"
                           granted_privilege="view_published_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42602" 
+                          uuid="54856337-774e-4b82-9d15-20a3a0279fef"
                           granted_privilege="view_published_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42603" 
+                          uuid="2ae26132-e492-440a-8f6a-accd0c74d256"
                           granted_privilege="view_published_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42604" 
+                          uuid="3d40de42-0225-48d3-8b6a-50a16d9b6cc4"
                           granted_privilege="view_published_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42701" 
+                          uuid="7688b7e0-12b5-46a1-877b-a61874846a6e"
                           granted_privilege="preview_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42702" 
+                          uuid="504faade-6146-4801-921d-f1b67cab3f4b"
                           granted_privilege="preview_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42703" 
+                          uuid="6e83c7f7-7295-4f7f-a93e-dd301ffe96bd"
                           granted_privilege="preview_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42704" 
+                          uuid="2220e72f-74d7-4e96-854c-e3457c7cf537"
                           granted_privilege="preview_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"/>
-    
+
 </dataset>
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemRepositoryTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemRepositoryTest/data.xml
index 1e14b1d41..27b291621 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemRepositoryTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemRepositoryTest/data.xml
@@ -317,7 +317,7 @@
                         uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="3600"
-                        uuid="e7c2a956-1474-40cb-8e98-1507276a3c35"
+                        uuid="0f974f3c-21c8-49f3-a8f5-bad09c7d8cd6"
                         name="info_content_reader" />
     
     <ccm_cms.content_section_roles role_id="3100" 
@@ -340,7 +340,7 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41101" 
-                          uuid="8c80497c-06bf-425e-b36d-c40c3665aa42"
+                          uuid="9f21f550-b291-459f-998a-fe7af3fe33ed"
                           granted_privilege="categorize_items" 
                           object_id="10100" 
                           grantee_id="3200" 
@@ -418,354 +418,409 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41304" 
-    
+                          uuid="d6b80364-4ef9-4735-ad9a-7df7bb878245"
                           granted_privilege="edit_items" 
                           object_id="10400" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4140" 
-    
+                          uuid="f9f95642-3b8d-4635-95c7-5fe393704940"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41401" 
-
+                          uuid="082d66cd-0d53-49e3-9799-3a22a0294c09"
                           granted_privilege="view_published_items" 
                           object_id="10100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41402" 
-
+                          uuid="a5a365ee-bf1c-4a04-bfee-970d6cc3a0af"
                           granted_privilege="view_published_items" 
                           object_id="10200" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41403" 
-
+                          uuid="80636d3e-2988-458b-b273-ebd3a29a8744"
                           granted_privilege="view_published_items" 
                           object_id="10300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41404" 
-
+                          uuid="6519b9c2-7500-438f-b9da-d449eaf70ce6"
                           granted_privilege="view_published_items" 
                           object_id="10400" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4150" 
-
+                          uuid="0ee9a7ab-d18c-47ea-bc92-84cf7dcb0e9a"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4151" 
-
+                          uuid="90c6bc39-9298-4514-9eaa-a346ab5daf4e"
                           granted_privilege="preview_items" 
                           object_id="10100" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41502" 
-
+                          uuid="fb6bc3a6-70e7-448d-b86c-ff43f78100d9"
                           granted_privilege="preview_items" 
                           object_id="10200" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41503" 
+                          uuid="4f665850-0d47-448d-8c18-921b08ec9e29"
                           granted_privilege="preview_items" 
                           object_id="10300" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="41504" 
-
+                          uuid="ab1b890c-1798-4c32-88b0-564d0d0688f9"
                           granted_privilege="preview_items" 
                           object_id="10400" 
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4210" 
-
+                          uuid="397528ca-ea02-41fa-824b-6406b4ce02e8"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42101" 
-
+                          uuid="0e799cba-d019-4890-9299-08915810bb54"
                           granted_privilege="categorize_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42102" 
-
+                          uuid="23b8bdea-8fc0-4029-b20b-52f23b6d4b1a"
                           granted_privilege="categorize_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42103" 
+                          uuid="b05359d5-ee6c-4b38-9900-5554ea57ed80"
                           granted_privilege="categorize_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="42104" 
+    <ccm_core.permissions permission_id="42104"
+                          uuid="9678a19b-83be-4ebc-976c-6c2eb0598e5c"
                           granted_privilege="categorize_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4220" 
+                          uuid="50f06c95-3d68-44dd-a047-98fe55ee1cbb"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42201" 
+                          uuid="505c8a07-ba22-470a-bb75-05dda4944d3c"
                           granted_privilege="create_new_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42202" 
+                          uuid="47d6db19-072e-4e13-b61e-66ef2c32b870"
                           granted_privilege="create_new_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42203" 
+                          uuid="5e778b29-ba2d-45d5-bdc5-33ea9409a469"
                           granted_privilege="create_new_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="422014" 
+                          uuid="b550a408-fb6a-484a-a40c-1347a0e3335d"
                           granted_privilege="create_new_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4230" 
+                          uuid="4936305c-58e4-4126-91ce-5366d1aea1e1"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42301" 
+                          uuid="fef3cbcf-bd3e-40fa-97ea-3d20af48dd3d"
                           granted_privilege="edit_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="42302" 
+    <ccm_core.permissions permission_id="42302"
+                          uuid="8b2f252a-4e24-4492-94c2-1ea786bf96b4"
                           granted_privilege="edit_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42303" 
+                          uuid="bde3b937-0303-401a-820e-772934897ce6"
                           granted_privilege="edit_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42304" 
+                          uuid="750267f6-51b6-404f-a767-d5b4b18250d2"
                           granted_privilege="edit_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4240" 
+                          uuid="b6426db0-ab19-443c-82ee-15549e74c35f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42401" 
+                          uuid="bf928ed7-b3e2-45ad-b03a-a58ffbb93b1a"
                           granted_privilege="approve_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42402" 
+                          uuid="ca44f345-5f11-45ff-a702-083c9b818e3b"
                           granted_privilege="approve_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42403" 
+                          uuid="5f3d258b-9890-470b-8f1a-7093ea7bf66b"
                           granted_privilege="approve_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42404" 
+                          uuid="0136c026-37e5-4175-80d0-0a2b0c9ba7b1"
                           granted_privilege="approve_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4250" 
+                          uuid="97aa5da1-746c-4152-9c93-13a79bd96c31"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42501" 
+                          uuid="25b8ad88-9d7b-4058-802c-0874d1dde6fc"
                           granted_privilege="delete_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42502" 
+                          uuid="1e6f5976-6043-43f2-86d8-586625b16d98"
                           granted_privilege="delete_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="42503" 
+    <ccm_core.permissions permission_id="42503"
+                          uuid="da666da9-c82b-4911-8e5d-c83432ab86dd"
                           granted_privilege="delete_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42504" 
+                          uuid="fd9a0c54-3a75-4f19-b99a-cd571359e222"
                           granted_privilege="delete_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4260" 
+                          uuid="6d8ba5f5-3e22-4faf-9b83-6a1c5c2febe3"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42601" 
+                          uuid="3558ebb9-e555-4672-87e1-a34b8e9217d4"
                           granted_privilege="view_published_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42602" 
+                          uuid="54856337-774e-4b82-9d15-20a3a0279fef"
                           granted_privilege="view_published_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42603" 
+                          uuid="2ae26132-e492-440a-8f6a-accd0c74d256"
                           granted_privilege="view_published_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42604" 
+                          uuid="3d40de42-0225-48d3-8b6a-50a16d9b6cc4"
                           granted_privilege="view_published_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4270" 
+                          uuid="73f3a230-8140-4345-804c-30b2eac41ecf"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42701" 
+                          uuid="7688b7e0-12b5-46a1-877b-a61874846a6e"
                           granted_privilege="preview_items" 
                           object_id="10100" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42702" 
+                          uuid="504faade-6146-4801-921d-f1b67cab3f4b"
                           granted_privilege="preview_items" 
                           object_id="10200" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42703" 
+                          uuid="6e83c7f7-7295-4f7f-a93e-dd301ffe96bd"
                           granted_privilege="preview_items" 
                           object_id="10300" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="42704" 
+                          uuid="2220e72f-74d7-4e96-854c-e3457c7cf537"
                           granted_privilege="preview_items" 
                           object_id="10400" 
                           grantee_id="3300" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4310" 
+                          uuid="a628c41c-9660-4694-a564-a612e610f12f"
                           granted_privilege="administer_roles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4320" 
+                          uuid="1ec289e4-cddc-40fc-9b37-2c68182ec5a4"
                           granted_privilege="administer_workflow" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4330" 
+                          uuid="222b1f73-5b49-44b2-adf0-6b3df8bb73ae"
                           granted_privilege="administer_lifecyles" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4340" 
+                          uuid="f4a5b342-2af2-4746-a79e-066d5804c159"
                           granted_privilege="administer_categories" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4350" 
+                          uuid="d2916d75-13ef-403c-a9af-230e95bb0b75"
                           granted_privilege="administer_content_types" 
                           object_id="1100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4360" 
+                          uuid="28f1aa31-ea5a-4230-8feb-741d250f1dc9"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4370" 
+                          uuid="5709ab82-97df-4814-8edd-280085a9677c"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4380" 
+                          uuid="fcc8a969-23df-4a38-8a5b-c8b6a16ccb23"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4390" 
+                          uuid="c7b00372-7c27-494e-bed3-7e778c77ed7f"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4400" 
+                          uuid="4aa17af1-ce04-4ef5-8050-93ad438cf388"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4410" 
+                          uuid="af800838-0f1d-4ee2-a18c-6179fd55befd"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4420" 
+                          uuid="ab8efd64-418a-462c-b320-a25e4355d7cc"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4430" 
+                          uuid="dcaec3fb-bf03-44f5-aca5-c32fec86b254"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3400" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4510" 
+                          uuid="3c73ef0b-72bf-48dc-b97c-2d8a55757a6e"
                           granted_privilege="categorize_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4520" 
+                          uuid="3721a3cf-846b-44a1-b286-750b72cf7c6d"
                           granted_privilege="create_new_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4530" 
+                          uuid="b6da8929-27e9-45ff-a1fd-75d4e1c56690"
                           granted_privilege="edit_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4540" 
+                          uuid="b3f8f871-f11e-46ee-9e63-c815e1541812"
                           granted_privilege="approve_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4550" 
+                          uuid="a2647d86-3683-4899-b32c-3c61a60d7c6b"
                           granted_privilege="publish_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4560" 
+                          uuid="a5aadac6-21ed-4487-bbb5-32c4c436ef50"
                           granted_privilege="delete_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4570" 
+                          uuid="c0cd8339-cb2c-4827-9ed9-422c432e608f"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4580" 
+                          uuid="bbdfb26c-eb52-4ccc-a01c-60465b9a5a75"
                           granted_privilege="preview_items" 
                           object_id="2100" 
                           grantee_id="3500" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4610" 
+                          uuid="c220babb-aa57-4863-832c-67faa49ce040"
                           granted_privilege="view_published_items" 
                           object_id="2100" 
                           grantee_id="3600"