diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
index 5fc4ddc8a..96f2bd498 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
@@ -601,5 +601,4 @@ public class ContentItemManagerTest {
     // isDraft
     // getLiveVersion
     // getDraftVersion
-    // getPendingVersions?
 }
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 274cdbccd..aeec0ce82 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
@@ -104,6 +104,9 @@
     <ccm_core.ccm_objects object_id="-10200"
                           display_name="article2"
                           uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-99200"
+                          display_name="article2"
+                          uuid="ad8aaec6-1a0d-4e4f-a1e1-8b7bdc3014a4" />
     <ccm_core.ccm_objects object_id="-10400"
                           display_name="news1"
                           uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
@@ -210,6 +213,9 @@
     <ccm_cms.content_items object_id="-10500" 
                            version="DRAFT"
                            content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-99200" 
+                           version="LIVE"
+                           content_type_id="-20100" />
     
     <ccm_cms.content_item_names object_id="-10100" 
                                 locale="en" 
@@ -226,6 +232,9 @@
     <ccm_cms.content_item_names object_id="-10500" 
                                 locale="en" 
                                 localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-99200" 
+                                 locale="en" 
+                                 localized_value="article2" />
     
     <ccm_cms.content_item_titles object_id="-10100" 
                                  locale="en" 
@@ -242,6 +251,9 @@
     <ccm_cms.content_item_titles object_id="-10500" 
                                  locale="en" 
                                  localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-99200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
     
     <ccm_cms.content_type_labels object_id="-20100"
                                  locale="en" 
@@ -254,6 +266,7 @@
     <ccm_cms.articles object_id="-10200" />
     <ccm_cms.articles object_id="-10300" />
     <ccm_cms.articles object_id="-10500" />
+    <ccm_cms.articles object_id="-99200" />
     
     <ccm_cms.article_texts 
         object_id="-10100"
@@ -271,6 +284,11 @@
         object_id="-10500"
         locale="en" 
         localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-99200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    
     
     <ccm_cms.news object_id="-10400"
                   news_date="2016-08-08" 
@@ -316,6 +334,13 @@
                               object_order="1" 
                               category_index="false"
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98200" 
+                              category_id="-2100" 
+                              object_id="-99200" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
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 829565188..a8a7fba87 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
@@ -104,6 +104,9 @@
     <ccm_core.ccm_objects object_id="-10200"
                           display_name="article2"
                           uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-99200"
+                          display_name="article2"
+                          uuid="ad8aaec6-1a0d-4e4f-a1e1-8b7bdc3014a4" />
     <ccm_core.ccm_objects object_id="-10400"
                           display_name="news1"
                           uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
@@ -117,6 +120,7 @@
                           display_name="article1_copy1" 
                           uuid="12b63933-3167-4dc5-9b55-726a727c55b1" />
     
+    
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
                          name="info_root" 
@@ -210,6 +214,10 @@
     <ccm_cms.content_items object_id="-10500" 
                            version="DRAFT"
                            content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-99200" 
+                           version="LIVE"
+                           content_type_id="-20100" />
+
     
     <ccm_cms.content_item_names object_id="-10100" 
                                 locale="en" 
@@ -226,7 +234,10 @@
     <ccm_cms.content_item_names object_id="-10500" 
                                 locale="en" 
                                 localized_value="article1" />
-    
+    <ccm_cms.content_item_names object_id="-99200" 
+                                locale="en" 
+                                localized_value="article2" />
+          
     <ccm_cms.content_item_titles object_id="-10100" 
                                  locale="en" 
                                  localized_value="Article 1" />
@@ -242,6 +253,9 @@
     <ccm_cms.content_item_titles object_id="-10500" 
                                  locale="en" 
                                  localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-99200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
     
     <ccm_cms.content_type_labels object_id="-20100"
                                  locale="en" 
@@ -254,6 +268,7 @@
     <ccm_cms.articles object_id="-10200" />
     <ccm_cms.articles object_id="-10300" />
     <ccm_cms.articles object_id="-10500" />
+    <ccm_cms.articles object_id="-99200" />
     
     <ccm_cms.article_texts 
         object_id="-10100"
@@ -271,6 +286,11 @@
         object_id="-10500"
         locale="en" 
         localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-99200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    
     
     <ccm_cms.news object_id="-10400"
                   news_date="2016-08-08" 
@@ -316,6 +336,13 @@
                               object_order="1" 
                               category_index="false"
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98200" 
+                              category_id="-2100" 
+                              object_id="-99200" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
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 b99c95878..0dea48d4f 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
@@ -127,6 +127,9 @@
     <ccm_core.ccm_objects object_id="-10200"
                           display_name="article2"
                           uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-99200"
+                          display_name="article2"
+                          uuid="ad8aaec6-1a0d-4e4f-a1e1-8b7bdc3014a4" />
     <ccm_core.ccm_objects object_id="-10400"
                           display_name="news1"
                           uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
@@ -235,6 +238,9 @@
                            version="DRAFT"
                            content_type_id="-20100" 
                            workflow_id="-120" />
+    <ccm_cms.content_items object_id="-99200" 
+                           version="LIVE"
+                           content_type_id="-20100" />
     
     <ccm_cms.content_item_names object_id="-10100" 
                                 locale="en" 
@@ -251,6 +257,9 @@
     <ccm_cms.content_item_names object_id="-11100" 
                                 locale="en" 
                                 localized_value="new-article" />
+    <ccm_cms.content_item_names object_id="-99200" 
+                                locale="en" 
+                                localized_value="article2" />
     
     <ccm_cms.content_item_titles object_id="-10100" 
                                  locale="en" 
@@ -264,9 +273,9 @@
     <ccm_cms.content_item_titles object_id="-10400" 
                                  locale="en" 
                                  localized_value="News 1" />
-    <!--<ccm_cms.content_item_titles object_id="-11100" 
-    locale="en" 
-    localized_value="new-article" />-->
+    <ccm_cms.content_item_titles object_id="-99200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
     
     <ccm_cms.content_type_labels object_id="-20100"
                                  locale="en" 
@@ -279,6 +288,7 @@
     <ccm_cms.articles object_id="-10200" />
     <ccm_cms.articles object_id="-10300" />
     <ccm_cms.articles object_id="-11100" />
+    <ccm_cms.articles object_id="-99200" />
     
     <ccm_cms.article_texts 
         object_id="-10100"
@@ -292,6 +302,10 @@
         object_id="-10300"
         locale="en" 
         localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-99200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
     
     <ccm_cms.news object_id="-10400"
                   news_date="2016-08-08" 
@@ -337,6 +351,13 @@
                               object_order="1" 
                               category_index="false"
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98200" 
+                              category_id="-2100" 
+                              object_id="-99200" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
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 21856f77e..82d3edd5a 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
@@ -109,12 +109,12 @@
                         finished="false"
                         definition_id="-200" />
     
-    <ccm_cms.lifecyle_phases phase_id="-300100" 
-                             started="false" 
-                             finished="false" />
-    <ccm_cms.lifecyle_phases phase_id="-300200" 
-                             started="false" 
-                             finished="false" />-->
+<ccm_cms.lifecyle_phases phase_id="-300100" 
+    started="false" 
+    finished="false" />
+<ccm_cms.lifecyle_phases phase_id="-300200" 
+    started="false" 
+    finished="false" />-->
     
     <ccm_core.ccm_objects object_id="-1100"
                           display_name="info"
@@ -140,6 +140,9 @@
     <ccm_core.ccm_objects object_id="-10200"
                           display_name="article2"
                           uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-99200"
+                          display_name="article2"
+                          uuid="ad8aaec6-1a0d-4e4f-a1e1-8b7bdc3014a4" />
     <ccm_core.ccm_objects object_id="-10400"
                           display_name="news1"
                           uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
@@ -248,6 +251,9 @@
                            version="DRAFT"
                            content_type_id="-20100" 
                            workflow_id="-120" />
+    <ccm_cms.content_items object_id="-99200" 
+                           version="LIVE"
+                           content_type_id="-20100" />
     
     <ccm_cms.content_item_names object_id="-10100" 
                                 locale="en" 
@@ -264,6 +270,9 @@
     <ccm_cms.content_item_names object_id="-11100" 
                                 locale="en" 
                                 localized_value="new-article" />
+    <ccm_cms.content_item_names object_id="-99200" 
+                                locale="en" 
+                                localized_value="article2" />
     
     <ccm_cms.content_item_titles object_id="-10100" 
                                  locale="en" 
@@ -277,9 +286,9 @@
     <ccm_cms.content_item_titles object_id="-10400" 
                                  locale="en" 
                                  localized_value="News 1" />
-    <!--<ccm_cms.content_item_titles object_id="-11100" 
+    <ccm_cms.content_item_titles object_id="-99200" 
                                  locale="en" 
-                                 localized_value="new-article" />-->
+                                 localized_value="Article 2" />
     
     <ccm_cms.content_type_labels object_id="-20100"
                                  locale="en" 
@@ -292,6 +301,7 @@
     <ccm_cms.articles object_id="-10200" />
     <ccm_cms.articles object_id="-10300" />
     <ccm_cms.articles object_id="-11100" />
+    <ccm_cms.articles object_id="-99200" />
     
     <ccm_cms.article_texts 
         object_id="-10100"
@@ -305,6 +315,11 @@
         object_id="-10300"
         locale="en" 
         localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-99200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    
     
     <ccm_cms.news object_id="-10400"
                   news_date="2016-08-08" 
@@ -350,6 +365,13 @@
                               object_order="1" 
                               category_index="false"
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98200" 
+                               category_id="-2100" 
+                               object_id="-99200" 
+                               category_order="1" 
+                               object_order="2" 
+                               category_index="false" 
+                               type="folder" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
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 dda48ec87..6c8fe2b4e 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
@@ -104,6 +104,9 @@
     <ccm_core.ccm_objects object_id="-10200"
                           display_name="article2"
                           uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-99200"
+                          display_name="article2"
+                          uuid="ad8aaec6-1a0d-4e4f-a1e1-8b7bdc3014a4" />
     <ccm_core.ccm_objects object_id="-10400"
                           display_name="news1"
                           uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
@@ -204,6 +207,9 @@
     <ccm_cms.content_items object_id="-10400" 
                            version="DRAFT"
                            content_type_id="-20200" />
+    <ccm_cms.content_items object_id="-99200" 
+                           version="LIVE"
+                           content_type_id="-20100" />
     
     <ccm_cms.content_item_names object_id="-10100" 
                                 locale="en" 
@@ -217,6 +223,9 @@
     <ccm_cms.content_item_names object_id="-10400" 
                                 locale="en" 
                                 localized_value="news1" />
+    <ccm_cms.content_item_names object_id="-99200" 
+                                locale="en" 
+                                localized_value="article2" />
     
     <ccm_cms.content_item_titles object_id="-10100" 
                                  locale="en" 
@@ -230,6 +239,9 @@
     <ccm_cms.content_item_titles object_id="-10400" 
                                  locale="en" 
                                  localized_value="News 1" />
+    <ccm_cms.content_item_titles object_id="-99200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
     
     <ccm_cms.content_type_labels object_id="-20100"
                                  locale="en" 
@@ -241,6 +253,7 @@
     <ccm_cms.articles object_id="-10100" />
     <ccm_cms.articles object_id="-10200" />
     <ccm_cms.articles object_id="-10300" />
+    <ccm_cms.articles object_id="-99200" />
     
     <ccm_cms.article_texts 
         object_id="-10100"
@@ -254,6 +267,10 @@
         object_id="-10300"
         locale="en" 
         localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-99200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
     
     <ccm_cms.news object_id="-10400"
                   news_date="2016-08-08" 
@@ -292,6 +309,13 @@
                               object_order="4" 
                               category_index="false" 
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98200" 
+                                  category_id="-2100" 
+                                  object_id="-99200" 
+                                  category_order="1" 
+                                  object_order="2" 
+                                  category_index="false" 
+                                  type="folder" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
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 92908515d..8a61312d4 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
@@ -104,6 +104,9 @@
     <ccm_core.ccm_objects object_id="-10200"
                           display_name="article2"
                           uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-99200"
+                          display_name="article2"
+                          uuid="ad8aaec6-1a0d-4e4f-a1e1-8b7bdc3014a4" />
     <ccm_core.ccm_objects object_id="-10400"
                           display_name="news1"
                           uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
@@ -204,6 +207,9 @@
     <ccm_cms.content_items object_id="-10400" 
                            version="DRAFT"
                            content_type_id="-20200" />
+    <ccm_cms.content_items object_id="-99200" 
+                           version="LIVE"
+                           content_type_id="-20100" />
     
     <ccm_cms.content_item_names object_id="-10100" 
                                 locale="en" 
@@ -217,6 +223,9 @@
     <ccm_cms.content_item_names object_id="-10400" 
                                 locale="en" 
                                 localized_value="news1" />
+    <ccm_cms.content_item_names object_id="-99200" 
+                                locale="en" 
+                                localized_value="article2" />
     
     <ccm_cms.content_item_titles object_id="-10100" 
                                  locale="en" 
@@ -230,6 +239,9 @@
     <ccm_cms.content_item_titles object_id="-10400" 
                                  locale="en" 
                                  localized_value="News 1" />
+    <ccm_cms.content_item_titles object_id="-99200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
     
     <ccm_cms.content_type_labels object_id="-20100"
                                  locale="en" 
@@ -241,6 +253,7 @@
     <ccm_cms.articles object_id="-10100" />
     <ccm_cms.articles object_id="-10200" />
     <ccm_cms.articles object_id="-10300" />
+    <ccm_cms.articles object_id="-99200" />
     
     <ccm_cms.article_texts 
         object_id="-10100"
@@ -254,6 +267,10 @@
         object_id="-10300"
         locale="en" 
         localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-99200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
     
     <ccm_cms.news object_id="-10400"
                   news_date="2016-08-08" 
@@ -292,6 +309,13 @@
                               object_order="4" 
                               category_index="false" 
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98200" 
+                              category_id="-2100" 
+                              object_id="-99200" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
index e1134b4da..f196fccee 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
@@ -99,8 +99,6 @@ public class CcmObject implements Identifiable, Serializable {
      *
      */
     @Column(name = "UUID", unique = true)
-    //@GeneratedValue(generator="uuid", strategy = GenerationType.AUTO)
-    //@GenericGenerator(name = "uuid", strategy = "uuid2")
     @NotNull
     @XmlElement(name = "uuid")
     private String uuid;