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 89f7641f6..f0a9be082 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
@@ -796,12 +796,15 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     
@@ -1029,198 +1032,199 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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-other-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
index b32329d7b..f0df7b6a9 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
@@ -797,12 +797,15 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     
@@ -1030,202 +1033,202 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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-same-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
index b8e269f87..144e9ee48 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
@@ -386,7 +386,7 @@
     <ccm_cms.content_items_aud object_id="10200" 
                                rev="0"
                                item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
-                               version="DRAFT" 
+                               version="DRAFT"
                                content_type_id="20100"/>
     <ccm_cms.content_items_aud object_id="99200" 
                                rev="0"
@@ -796,12 +796,15 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     
@@ -1029,204 +1032,202 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+    <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"
+                          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"
+    <ccm_core.permissions permission_id="5020"
+                          uuid="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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-create-contentitem-with-workflow.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml
index 9b3701f24..0ef590480 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
@@ -733,15 +733,19 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="930930"
+                                        uuid="5bf07fbe-e55c-4e84-b904-4df9492d78f6"
                                         task_id="140100" 
                                         role_id="3200" />
     
@@ -1004,237 +1008,238 @@
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
- uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
- uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
+                          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"
+                          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"
- uuid="ed993396-2435-4018-b2bc-1c18f2383093"
+                          uuid="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="411010" 
+                          uuid="9f51e17b-a470-40be-a595-7c502ba98b2d"
                           granted_privilege="categorize_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1242,6 +1247,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="412020" 
+                          uuid="3a3bf46a-e312-48a8-8425-0a062ae06ad2"
                           granted_privilege="create_new_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1249,6 +1255,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="413030" 
+                          uuid="eab5b7f1-19f5-43bd-b4b5-0a86bdaed9cf"
                           granted_privilege="edit_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1256,6 +1263,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="414040" 
+                          uuid="f1fd2140-609a-44d1-9417-91f77814d5c1"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1263,6 +1271,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="415050" 
+                          uuid="7203ecfe-52f4-48c4-a62f-7dccde92ecb5"
                           granted_privilege="preview_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1270,6 +1279,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="421010" 
+                          uuid="9bc02ffa-af06-462b-95dd-ec760ed2d5a2"
                           granted_privilege="categorize_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1277,6 +1287,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="422020" 
+                          uuid="f7b981c7-d1c9-49b9-bbc5-75dffc4d4120"
                           granted_privilege="create_new_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1284,6 +1295,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="423030" 
+                          uuid="c3fae3b8-074e-4bcc-a4e1-b715b56dc69c"
                           granted_privilege="edit_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1291,6 +1303,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="424040" 
+                          uuid="607269b2-406c-4e06-8dc1-064e730bc60a"
                           granted_privilege="approve_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1298,6 +1311,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="425050" 
+                          uuid="02479ee7-920e-4c36-b0ed-743f4e718e79"
                           granted_privilege="delete_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1305,6 +1319,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="426060" 
+                          uuid="fce7ed30-2508-4e29-9e38-e2d1d0a6d486"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1312,6 +1327,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="427070" 
+                          uuid="432dc396-1d35-408d-a970-98057baf644f"
                           granted_privilege="preview_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1319,6 +1335,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="436060" 
+                          uuid="cf541962-db05-46b1-81e4-062136c7c1cb"
                           granted_privilege="categorize_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1326,6 +1343,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="437070" 
+                          uuid="c31d4bba-e97a-4004-ad59-2760d95b5ef6"
                           granted_privilege="create_new_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1333,6 +1351,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="438080" 
+                          uuid="445b2673-8f2e-4238-b964-a373030dabe4"
                           granted_privilege="edit_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1340,6 +1359,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="439090" 
+                          uuid="238c6e47-ee0a-4493-b732-cb6166d38b41"
                           granted_privilege="approve_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1347,6 +1367,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="440000" 
+                          uuid="616771fd-728f-4917-b840-891bd11e700d"
                           granted_privilege="publish_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1354,6 +1375,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="441010" 
+                          uuid="44528795-f633-4dec-a10e-9a7535bd0a76"
                           granted_privilege="delete_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1361,6 +1383,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="442020" 
+                          uuid="ef823ccf-72b6-4cfe-9ae4-02d313323374"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1368,6 +1391,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="443030" 
+                          uuid="bdce3d29-5cbb-4d8a-96cc-a3d6f4dcd8c1"
                           granted_privilege="preview_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1375,6 +1399,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="451010" 
+                          uuid="758f6bbd-6d41-477e-9e36-6f6595f04f29"
                           granted_privilege="categorize_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1382,6 +1407,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="452020" 
+                          uuid="79372753-a7f3-4796-bd0f-a78de617977c"
                           granted_privilege="create_new_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1389,6 +1415,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="453030" 
+                          uuid="86490236-b168-4ea6-b01a-009d7c17a8eb"
                           granted_privilege="edit_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1396,6 +1423,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="454040" 
+                          uuid="9fe0e3a0-cc40-46a1-8efd-37e9b39a26cd"
                           granted_privilege="approve_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1403,6 +1431,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="455050" 
+                          uuid="be265f54-767b-4f43-9216-a3b3c90f73e9"
                           granted_privilege="publish_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1410,6 +1439,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="456060" 
+                          uuid="668072ca-85b6-47b9-b1f1-07b5e0a00eff"
                           granted_privilege="delete_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1417,6 +1447,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="457070" 
+                          uuid="c81b49eb-6e87-4c4c-9ae3-cc8de03b9e35"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1424,6 +1455,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="458080" 
+                          uuid="fecaf0ec-77ee-4fbc-a590-c0d1eb0514c2"
                           granted_privilege="preview_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1431,6 +1463,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="461010" 
+                          uuid="d081cd2a-9831-4dca-9840-1a3eabd5215c"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           grantee_id="3600" 
@@ -1438,6 +1471,4 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
 
-
-    
 </dataset>
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 78fa04a40..2b65b7dc9 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
@@ -746,18 +746,23 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="910910"
+                                        uuid="85d2f8df-ae30-4de4-832f-1205e1cea2b1"
                                         task_id="140100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920920"
+                                        uuid="cdcfbc75-0c83-4484-b6ef-e39494f0aa21"
                                         task_id="140200" 
                                         role_id="3300" />
     
@@ -1020,237 +1025,238 @@
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
- uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
- uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
+                          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"
+                          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"
- uuid="ed993396-2435-4018-b2bc-1c18f2383093"
+                          uuid="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           granted_privilege="view_published_items" 
                           object_id="2300" 
                           grantee_id="3600" 
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="411010" 
+                          uuid="9f51e17b-a470-40be-a595-7c502ba98b2d"
                           granted_privilege="categorize_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1258,6 +1264,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="412020" 
+                          uuid="3a3bf46a-e312-48a8-8425-0a062ae06ad2"
                           granted_privilege="create_new_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1265,6 +1272,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="413030" 
+                          uuid="eab5b7f1-19f5-43bd-b4b5-0a86bdaed9cf"
                           granted_privilege="edit_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1272,6 +1280,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="414040" 
+                          uuid="f1fd2140-609a-44d1-9417-91f77814d5c1"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1279,6 +1288,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="415050" 
+                          uuid="7203ecfe-52f4-48c4-a62f-7dccde92ecb5"
                           granted_privilege="preview_items" 
                           object_id="12100" 
                           grantee_id="3200" 
@@ -1286,6 +1296,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="421010" 
+                          uuid="9bc02ffa-af06-462b-95dd-ec760ed2d5a2"
                           granted_privilege="categorize_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1293,6 +1304,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="422020" 
+                          uuid="f7b981c7-d1c9-49b9-bbc5-75dffc4d4120"
                           granted_privilege="create_new_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1300,6 +1312,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="423030" 
+                          uuid="c3fae3b8-074e-4bcc-a4e1-b715b56dc69c"
                           granted_privilege="edit_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1307,6 +1320,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="424040" 
+                          uuid="607269b2-406c-4e06-8dc1-064e730bc60a"
                           granted_privilege="approve_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1314,6 +1328,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="425050" 
+                          uuid="02479ee7-920e-4c36-b0ed-743f4e718e79"
                           granted_privilege="delete_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1321,6 +1336,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="426060" 
+                          uuid="fce7ed30-2508-4e29-9e38-e2d1d0a6d486"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1328,6 +1344,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="427070" 
+                          uuid="432dc396-1d35-408d-a970-98057baf644f"
                           granted_privilege="preview_items" 
                           object_id="12100" 
                           grantee_id="3300" 
@@ -1335,6 +1352,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="436060" 
+                          uuid="cf541962-db05-46b1-81e4-062136c7c1cb"
                           granted_privilege="categorize_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1342,6 +1360,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="437070" 
+                          uuid="c31d4bba-e97a-4004-ad59-2760d95b5ef6"
                           granted_privilege="create_new_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1349,6 +1368,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="438080" 
+                          uuid="445b2673-8f2e-4238-b964-a373030dabe4"
                           granted_privilege="edit_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1356,6 +1376,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="439090" 
+                          uuid="238c6e47-ee0a-4493-b732-cb6166d38b41"
                           granted_privilege="approve_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1363,6 +1384,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="440000" 
+                          uuid="616771fd-728f-4917-b840-891bd11e700d"
                           granted_privilege="publish_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1370,6 +1392,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="441010" 
+                          uuid="44528795-f633-4dec-a10e-9a7535bd0a76"
                           granted_privilege="delete_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1377,6 +1400,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="442020" 
+                          uuid="ef823ccf-72b6-4cfe-9ae4-02d313323374"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1384,6 +1408,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="443030" 
+                          uuid="bdce3d29-5cbb-4d8a-96cc-a3d6f4dcd8c1"
                           granted_privilege="preview_items" 
                           object_id="12100" 
                           grantee_id="3400" 
@@ -1391,6 +1416,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="451010" 
+                          uuid="758f6bbd-6d41-477e-9e36-6f6595f04f29"
                           granted_privilege="categorize_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1398,6 +1424,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="452020" 
+                          uuid="79372753-a7f3-4796-bd0f-a78de617977c"
                           granted_privilege="create_new_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1405,6 +1432,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="453030" 
+                          uuid="86490236-b168-4ea6-b01a-009d7c17a8eb"
                           granted_privilege="edit_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1412,6 +1440,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="454040" 
+                          uuid="9fe0e3a0-cc40-46a1-8efd-37e9b39a26cd"
                           granted_privilege="approve_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1419,6 +1448,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="455050" 
+                          uuid="be265f54-767b-4f43-9216-a3b3c90f73e9"
                           granted_privilege="publish_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1426,6 +1456,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="456060" 
+                          uuid="668072ca-85b6-47b9-b1f1-07b5e0a00eff"
                           granted_privilege="delete_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1433,6 +1464,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="457070" 
+                          uuid="c81b49eb-6e87-4c4c-9ae3-cc8de03b9e35"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1440,6 +1472,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="458080" 
+                          uuid="fecaf0ec-77ee-4fbc-a590-c0d1eb0514c2"
                           granted_privilege="preview_items" 
                           object_id="12100" 
                           grantee_id="3500" 
@@ -1447,6 +1480,7 @@ uuid="829e8dae-dcc3-4c6c-afcc-1b32f3715dcd"
                           inherited="true" 
                           inherited_from_id="2100" />
     <ccm_core.permissions permission_id="461010" 
+                          uuid="d081cd2a-9831-4dca-9840-1a3eabd5215c"
                           granted_privilege="view_published_items" 
                           object_id="12100" 
                           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 417897450..544ea54aa 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
@@ -671,12 +671,15 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     
@@ -904,198 +907,199 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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" 
+                          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"
+                          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"
+    <ccm_core.permissions permission_id="5020"
+                          uuid="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
index 29eab2183..6cef2f0ec 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
@@ -564,7 +564,7 @@
                        rev="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
-       uuid="04c1ad3b-3e76-4dbe-a939-2b6ed96e0420"
+                              uuid="04c1ad3b-3e76-4dbe-a939-2b6ed96e0420"
                               category_id="2120" 
                               object_id="10100" 
                               category_order="1" 
@@ -672,12 +672,15 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     
@@ -898,7 +901,6 @@
                           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" 
@@ -906,198 +908,199 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          uuid="18e70529-95b5-40f8-ad4e-7bb45744360f"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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-publish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
index bee639b59..217cd85cf 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
@@ -797,12 +797,15 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     
@@ -1030,199 +1033,199 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+    <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"
+                          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"
+    <ccm_core.permissions permission_id="5020"
+                          uuid="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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 c9224fd23..c70264103 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
@@ -730,12 +730,15 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     
@@ -963,199 +966,199 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          uuid="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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 17459481a..7acead5cd 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
@@ -672,12 +672,15 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     
@@ -905,203 +908,202 @@
                           grantee_id="3200" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          uuid="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
index 9b0066dd1..27dd91945 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
@@ -671,12 +671,15 @@
                         name="info_content_reader" />
     
     <ccm_core.workflow_task_assignments task_assignment_id="910"
+                                        uuid="8eb4c5ca-c572-49ba-8d96-83be6df758ab"
                                         task_id="100100" 
                                         role_id="3200" />
     <ccm_core.workflow_task_assignments task_assignment_id="920"
+                                        uuid="3f0da7fb-1b73-4062-bab5-0f62fa79baf8"
                                         task_id="100100" 
                                         role_id="3300" />
     <ccm_core.workflow_task_assignments task_assignment_id="930"
+                                        uuid="02a58b59-1a73-4dae-978c-d1a48420f34e"
                                         task_id="110100" 
                                         role_id="3200" />
     
@@ -939,231 +942,231 @@
                           creation_date="2016-07-15"
                           inherited="false" />
     <ccm_core.permissions permission_id="4720" 
-uuid="7f2f120d-6fcd-40ca-8b14-acce1c24ea54"
+                          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"
+                          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"
+                          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"
+                          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"
- uuid="cf563a0d-3452-46b0-bc57-77cb35927696"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
- uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
+                          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"
+                          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"
- uuid="834a0fd4-7a58-467d-9e72-6c898fab8324"
+                          uuid="d0f11c96-a1cb-4360-a23f-51787a4b692e"
                           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"
+                          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"
+                          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"
+                          uuid="209c1c1a-20b5-4559-ad33-94017cc53b48"
                           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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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"
+                          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/ContentTypeRepositoryTest/after-delete.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentTypeRepositoryTest/after-delete.xml
index a19a5bb6c..a571eb747 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentTypeRepositoryTest/after-delete.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentTypeRepositoryTest/after-delete.xml
@@ -138,16 +138,22 @@
                               type="folder" />
     
     <ccm_core.ccm_roles role_id="6001"
+                        uuid="29d48664-5b72-4a2e-89d0-e58ed931fdf4"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="6002"
+                        uuid="14f420e5-bf06-459e-bdd8-61c2556a7801"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="6003"
+                        uuid="7f6a44fa-6d73-4546-a9a5-acd0ae29078b"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="6004"
+                        uuid="f8a581c4-7e0f-4f9c-966a-412c345c8236"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="6005"
+                        uuid="30cc7c6f-641e-4071-b003-2f899c3bb9aa"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="6006"
+                        uuid="347d2d2f-7715-41a4-8d77-2ebddff7492c"
                         name="info_content_reader" />
 
     <ccm_cms.content_section_roles role_id="6001" 
@@ -164,171 +170,205 @@
                                    section_id="1001" />
 
     <ccm_core.permissions permission_id="7001" 
+                          uuid="6458daba-131c-4736-83f4-2bbd6c3c2545"
                           granted_privilege="categorize_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="7002" 
+    <ccm_core.permissions permission_id="7002"
+                          uuid="66ef194f-33ef-4acf-855c-dc35b1095a00" 
                           granted_privilege="create_new_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7003" 
+                          uuid="58a2de66-ae09-4535-9686-fda5dea975bc" 
                           granted_privilege="edit_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7004" 
+                          uuid="ebe02d88-ef20-4d91-800a-16d275688f84" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7005" 
+                          uuid="8d732903-2f6c-4ea6-8432-c8d435ae4eab" 
                           granted_privilege="preview_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="7006" 
+    <ccm_core.permissions permission_id="7006"
+                          uuid="d268fa2c-9ab7-4578-bfa4-e37cd4c503bf"  
                           granted_privilege="categorize_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7007" 
+                          uuid="dac82ce6-d685-4008-a810-c8eebd3c9997" 
                           granted_privilege="create_new_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7008" 
+                          uuid="862ed2de-ba8a-4c4b-a5be-d2ff9e030000" 
                           granted_privilege="edit_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7009" 
+                          uuid="24693515-0e84-4c9d-962d-e17092bed630" 
                           granted_privilege="approve_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7010" 
+                          uuid="090c4495-9bbb-4b4f-85c0-e91def4af22c"
                           granted_privilege="delete_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7011" 
+                          uuid="a9055591-5a48-4b00-a504-d112cdb22f07" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7012" 
+                          uuid="ecbbb1cf-2389-44cc-af17-00ea2d072d94" 
                           granted_privilege="preview_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7013" 
+                          uuid="64f65565-882b-45d9-bab5-a8dc2dd76b58" 
                           granted_privilege="administer_roles" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7014" 
+                          uuid="a6f3ea24-e613-4b2f-bd83-edab0571e5aa" 
                           granted_privilege="administer_workflow" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7015" 
+                          uuid="9b3a6c36-085e-42fc-9e47-e7f0c6f2ca0f" 
                           granted_privilege="administer_lifecyles" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7016" 
+                          uuid="cb71fd0b-8a65-49fe-b3bb-d01e7ca11420" 
                           granted_privilege="administer_categories" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7017" 
+                          uuid="d55f539c-a6b3-4369-9616-c33446d505bf" 
                           granted_privilege="administer_content_types" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7018" 
+                          uuid="7840a327-e1e0-4aa3-8e6a-6023cb7c8ef9" 
                           granted_privilege="categorize_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7019" 
+                          uuid="dedeaf64-d612-4f51-9ff0-d23f48669a09" 
                           granted_privilege="create_new_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7020" 
+                          uuid="73b2fd1f-d2a2-45a6-8234-981e9ede3601" 
                           granted_privilege="edit_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7021" 
+                          uuid="cf55cc10-c9f7-4f6f-be26-c2c0832fdf79" 
                           granted_privilege="approve_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7022" 
+                          uuid="115a894b-7604-42cc-9b63-f8d033925f67" 
                           granted_privilege="publish_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7023" 
+                          uuid="a9ee30f0-0507-45d8-b85d-0cde804adf00" 
                           granted_privilege="delete_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7024" 
+                          uuid="6c16b566-b806-47ef-b3e0-50f2c6452b88" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7025" 
+                          uuid="fab928c2-670b-4f9e-b61d-40b981d4bfa6" 
                           granted_privilege="preview_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7026" 
+                          uuid="b7723f21-0d17-47b7-9d69-8ba98980aba2" 
                           granted_privilege="categorize_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7027" 
+                          uuid="ac101984-6144-4328-81f4-9c1ae4d7f823" 
                           granted_privilege="create_new_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7028" 
                           granted_privilege="edit_items" 
+                          uuid="853a3dd9-8b9e-4228-bdd5-cb10b997a0fd" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7029" 
+                          uuid="2fe36a93-eb8e-437c-9112-89ae545cd5ce" 
                           granted_privilege="approve_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7030" 
+                          uuid="69cd56d1-5346-4032-a2ec-7bd29d3f6dc2" 
                           granted_privilege="publish_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7031" 
+                          uuid="c862dd21-62f3-46ee-864d-cf50ea9f5388" 
                           granted_privilege="delete_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7032" 
+                          uuid="be7043f8-91ef-4b56-b3f1-e7780fba956d" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="7033" 
+    <ccm_core.permissions permission_id="7033"
+                          uuid="946df3e2-94b7-47f3-9678-31b6724aa257"  
                           granted_privilege="preview_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7034" 
+                          uuid="f955d77a-431b-4478-bb0f-da87b29a132e" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6006" 
@@ -336,4 +376,3 @@
 
 
 </dataset>
-
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentTypeRepositoryTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentTypeRepositoryTest/data.xml
index 5a8a3bd09..859e8f1ec 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentTypeRepositoryTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentTypeRepositoryTest/data.xml
@@ -148,6 +148,7 @@
                               type="folder" />
     
     <ccm_core.parties party_id="8001" 
+                      uuid="1d1a088e-ab06-4619-b331-62a41ef15d8f"
                       name = "public-user" />
     
     <ccm_core.users party_id="8001"
@@ -160,16 +161,22 @@
                     password_reset_required="false" />
     
     <ccm_core.ccm_roles role_id="6001"
+                        uuid="29d48664-5b72-4a2e-89d0-e58ed931fdf4"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="6002"
+                        uuid="14f420e5-bf06-459e-bdd8-61c2556a7801"
                         name="info_author" />
     <ccm_core.ccm_roles role_id="6003"
+                        uuid="7f6a44fa-6d73-4546-a9a5-acd0ae29078b"
                         name="info_editor" />
     <ccm_core.ccm_roles role_id="6004"
+                        uuid="f8a581c4-7e0f-4f9c-966a-412c345c8236"
                         name="info_manager" />
     <ccm_core.ccm_roles role_id="6005"
+                        uuid="30cc7c6f-641e-4071-b003-2f899c3bb9aa"
                         name="info_publisher" />
     <ccm_core.ccm_roles role_id="6006"
+                        uuid="347d2d2f-7715-41a4-8d77-2ebddff7492c"
                         name="info_content_reader" />
 
     <ccm_cms.content_section_roles role_id="6001" 
@@ -186,171 +193,205 @@
                                    section_id="1001" />
 
     <ccm_core.permissions permission_id="7001" 
+                          uuid="6458daba-131c-4736-83f4-2bbd6c3c2545"
                           granted_privilege="categorize_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="7002" 
+    <ccm_core.permissions permission_id="7002"
+                          uuid="66ef194f-33ef-4acf-855c-dc35b1095a00" 
                           granted_privilege="create_new_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7003" 
+                          uuid="58a2de66-ae09-4535-9686-fda5dea975bc" 
                           granted_privilege="edit_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7004" 
+                          uuid="ebe02d88-ef20-4d91-800a-16d275688f84" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7005" 
+                          uuid="8d732903-2f6c-4ea6-8432-c8d435ae4eab" 
                           granted_privilege="preview_items" 
                           object_id="2001" 
                           grantee_id="6002" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="7006" 
+    <ccm_core.permissions permission_id="7006"
+                          uuid="d268fa2c-9ab7-4578-bfa4-e37cd4c503bf"  
                           granted_privilege="categorize_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7007" 
+                          uuid="dac82ce6-d685-4008-a810-c8eebd3c9997" 
                           granted_privilege="create_new_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7008" 
+                          uuid="862ed2de-ba8a-4c4b-a5be-d2ff9e030000" 
                           granted_privilege="edit_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7009" 
+                          uuid="24693515-0e84-4c9d-962d-e17092bed630" 
                           granted_privilege="approve_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7010" 
+                          uuid="090c4495-9bbb-4b4f-85c0-e91def4af22c"
                           granted_privilege="delete_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7011" 
+                          uuid="a9055591-5a48-4b00-a504-d112cdb22f07" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7012" 
+                          uuid="ecbbb1cf-2389-44cc-af17-00ea2d072d94" 
                           granted_privilege="preview_items" 
                           object_id="2001" 
                           grantee_id="6003" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7013" 
+                          uuid="64f65565-882b-45d9-bab5-a8dc2dd76b58" 
                           granted_privilege="administer_roles" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7014" 
+                          uuid="a6f3ea24-e613-4b2f-bd83-edab0571e5aa" 
                           granted_privilege="administer_workflow" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7015" 
+                          uuid="9b3a6c36-085e-42fc-9e47-e7f0c6f2ca0f" 
                           granted_privilege="administer_lifecyles" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7016" 
+                          uuid="cb71fd0b-8a65-49fe-b3bb-d01e7ca11420" 
                           granted_privilege="administer_categories" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7017" 
+                          uuid="d55f539c-a6b3-4369-9616-c33446d505bf" 
                           granted_privilege="administer_content_types" 
                           object_id="1001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7018" 
+                          uuid="7840a327-e1e0-4aa3-8e6a-6023cb7c8ef9" 
                           granted_privilege="categorize_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7019" 
+                          uuid="dedeaf64-d612-4f51-9ff0-d23f48669a09" 
                           granted_privilege="create_new_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7020" 
+                          uuid="73b2fd1f-d2a2-45a6-8234-981e9ede3601" 
                           granted_privilege="edit_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7021" 
+                          uuid="cf55cc10-c9f7-4f6f-be26-c2c0832fdf79" 
                           granted_privilege="approve_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7022" 
+                          uuid="115a894b-7604-42cc-9b63-f8d033925f67" 
                           granted_privilege="publish_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7023" 
+                          uuid="a9ee30f0-0507-45d8-b85d-0cde804adf00" 
                           granted_privilege="delete_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7024" 
+                          uuid="6c16b566-b806-47ef-b3e0-50f2c6452b88" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7025" 
+                          uuid="fab928c2-670b-4f9e-b61d-40b981d4bfa6" 
                           granted_privilege="preview_items" 
                           object_id="2001" 
                           grantee_id="6004" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7026" 
+                          uuid="b7723f21-0d17-47b7-9d69-8ba98980aba2" 
                           granted_privilege="categorize_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7027" 
+                          uuid="ac101984-6144-4328-81f4-9c1ae4d7f823" 
                           granted_privilege="create_new_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7028" 
                           granted_privilege="edit_items" 
+                          uuid="853a3dd9-8b9e-4228-bdd5-cb10b997a0fd" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7029" 
+                          uuid="2fe36a93-eb8e-437c-9112-89ae545cd5ce" 
                           granted_privilege="approve_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7030" 
+                          uuid="69cd56d1-5346-4032-a2ec-7bd29d3f6dc2" 
                           granted_privilege="publish_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7031" 
+                          uuid="c862dd21-62f3-46ee-864d-cf50ea9f5388" 
                           granted_privilege="delete_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7032" 
+                          uuid="be7043f8-91ef-4b56-b3f1-e7780fba956d" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
-    <ccm_core.permissions permission_id="7033" 
+    <ccm_core.permissions permission_id="7033"
+                          uuid="946df3e2-94b7-47f3-9678-31b6724aa257"  
                           granted_privilege="preview_items" 
                           object_id="2001" 
                           grantee_id="6005" 
                           creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="7034" 
+                          uuid="f955d77a-431b-4478-bb0f-da87b29a132e" 
                           granted_privilege="view_published_items" 
                           object_id="2001" 
                           grantee_id="6006"