diff --git a/ccm-cms/src/main/java/org/librecms/assets/AssetManager.java b/ccm-cms/src/main/java/org/librecms/assets/AssetManager.java
index 817315ea8..a61d61e31 100644
--- a/ccm-cms/src/main/java/org/librecms/assets/AssetManager.java
+++ b/ccm-cms/src/main/java/org/librecms/assets/AssetManager.java
@@ -50,8 +50,18 @@ import org.librecms.contentsection.privileges.AssetPrivileges;
 import java.util.Objects;
 
 import org.libreccm.categorization.ObjectNotAssignedToCategoryException;
+import org.libreccm.l10n.LocalizedString;
 import org.librecms.contentsection.FolderType;
 
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Set;
+
 import static org.librecms.CmsConstants.*;
 
 /**
@@ -165,33 +175,33 @@ public class AssetManager {
         final Asset asset,
         @RequiresPrivilege(AssetPrivileges.CREATE_NEW)
         final Folder targetFolder) {
-        
+
         if (asset == null) {
             throw new IllegalArgumentException("No asset to move provided.");
         }
-        
+
         if (targetFolder == null) {
             throw new IllegalArgumentException("No target folder specified.");
         }
-        
+
         if (targetFolder.getType() != FolderType.ASSETS_FOLDER) {
             throw new IllegalArgumentException(String.format(
                 "The provided target folder %s is not an asset folder.",
                 Objects.toString(targetFolder)));
         }
-        
+
         final Optional<Folder> currentFolder = getAssetFolder(asset);
-        
+
         if (currentFolder.isPresent()) {
             try {
-                categoryManager.removeObjectFromCategory(asset, 
+                categoryManager.removeObjectFromCategory(asset,
                                                          currentFolder.get());
-            } catch(ObjectNotAssignedToCategoryException ex) {
+            } catch (ObjectNotAssignedToCategoryException ex) {
                 throw new UncheckedWrapperException(ex);
             }
         }
-        
-        categoryManager.addObjectToCategory(asset, 
+
+        categoryManager.addObjectToCategory(asset,
                                             targetFolder,
                                             CATEGORIZATION_TYPE_FOLDER);
     }
@@ -201,13 +211,182 @@ public class AssetManager {
      *
      * @param asset        The {@link Asset} to copy.
      * @param targetFolder The folder to which the {@link Asset} is copied.
+     *
+     * @return The copy of the {@code asset}.
      */
     @Transactional(Transactional.TxType.REQUIRED)
     @AuthorizationRequired
-    public void copy(final Asset asset,
-                     @RequiresPrivilege(AssetPrivileges.CREATE_NEW)
-                     final Folder targetFolder) {
-        throw new UnsupportedOperationException("Not implemented yet.");
+    @SuppressWarnings("unchecked")
+    public Asset copy(final Asset asset,
+                      @RequiresPrivilege(AssetPrivileges.CREATE_NEW)
+                      final Folder targetFolder) {
+
+        if (asset == null) {
+            throw new IllegalArgumentException("No asset to copy.");
+        }
+
+        if (targetFolder == null) {
+            throw new IllegalArgumentException("No target folder provided.");
+        }
+
+        if (targetFolder.getType() != FolderType.ASSETS_FOLDER) {
+            throw new IllegalArgumentException(String.format(
+                "The provided target folder %s is not an asset folder.",
+                Objects.toString(targetFolder)));
+        }
+
+        final Asset copy;
+        try {
+            copy = asset.getClass().newInstance();
+        } catch (InstantiationException | IllegalAccessException ex) {
+            throw new UncheckedWrapperException(ex);
+        }
+
+        final BeanInfo beanInfo;
+        try {
+            beanInfo = Introspector.getBeanInfo(asset.getClass());
+        } catch (IntrospectionException ex) {
+            throw new UncheckedWrapperException(ex);
+        }
+
+        for (final PropertyDescriptor propertyDescriptor : beanInfo
+            .getPropertyDescriptors()) {
+            if (propertyIsExcluded(propertyDescriptor.getName())) {
+                continue;
+            }
+
+            final Class<?> propType = propertyDescriptor.getPropertyType();
+            final Method readMethod = propertyDescriptor.getReadMethod();
+            final Method writeMethod = propertyDescriptor.getWriteMethod();
+
+            if (writeMethod == null) {
+                continue;
+            }
+
+            if (LocalizedString.class.equals(propType)) {
+                final LocalizedString source;
+                final LocalizedString target;
+                try {
+                    source = (LocalizedString) readMethod.invoke(asset);
+                    target = (LocalizedString) readMethod.invoke(copy);
+                } catch (IllegalAccessException
+                         | IllegalArgumentException
+                         | InvocationTargetException ex) {
+                    throw new RuntimeException(ex);
+                }
+
+                source.getAvailableLocales().forEach(
+                    locale -> target.addValue(locale,
+                                              source.getValue(locale)));
+            } else if (propType != null
+                           && propType.isAssignableFrom(Asset.class)) {
+
+                final Asset linkedAsset;
+                try {
+                    linkedAsset = (Asset) readMethod.invoke(asset);
+                } catch (IllegalAccessException
+                         | IllegalArgumentException
+                         | InvocationTargetException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+
+                try {
+                    writeMethod.invoke(copy, linkedAsset);
+                } catch (IllegalAccessException
+                         | IllegalArgumentException
+                         | InvocationTargetException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+            } else if (propType != null
+                           && propType.isAssignableFrom(List.class)) {
+                final List<Object> source;
+                final List<Object> target;
+                try {
+                    source = (List<Object>) readMethod.invoke(asset);
+                    target = (List<Object>) readMethod.invoke(copy);
+                } catch (IllegalAccessException
+                         | IllegalArgumentException
+                         | InvocationTargetException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+
+                target.addAll(source);
+            } else if (propType != null
+                           && propType.isAssignableFrom(Map.class)) {
+                final Map<Object, Object> source;
+                final Map<Object, Object> target;
+
+                try {
+                    source = (Map<Object, Object>) readMethod.invoke(asset);
+                    target = (Map<Object, Object>) readMethod.invoke(copy);
+                } catch (IllegalAccessException
+                         | IllegalArgumentException
+                         | InvocationTargetException ex) {
+                    throw new RuntimeException(ex);
+                }
+
+                source.forEach((key, value) -> target.put(key, value));
+            } else if (propType != null
+                           && propType.isAssignableFrom(Set.class)) {
+                final Set<Object> source;
+                final Set<Object> target;
+
+                try {
+                    source = (Set<Object>) readMethod.invoke(asset);
+                    target = (Set<Object>) readMethod.invoke(copy);
+                } catch (IllegalAccessException
+                         | IllegalArgumentException
+                         | InvocationTargetException ex) {
+                    throw new RuntimeException(ex);
+                }
+
+                target.addAll(source);
+            } else {
+                final Object value;
+                try {
+                    value = readMethod.invoke(asset);
+                    writeMethod.invoke(copy, value);
+                } catch (IllegalAccessException
+                         | IllegalArgumentException
+                         | InvocationTargetException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+            }
+        }
+
+        if (targetFolder.equals(getAssetFolder(asset).orElse(null))) {
+            final long number = assetRepo.countFilterByFolderAndName(
+                targetFolder, String.format("%s_copy",
+                                            asset.getDisplayName()));
+            final long index = number + 1;
+            copy.setDisplayName(String.format("%s_copy%d",
+                                              copy.getDisplayName(),
+                                              index));
+        }
+
+        assetRepo.save(asset);
+        
+        categoryManager.addObjectToCategory(copy,
+                                            targetFolder,
+                                            CATEGORIZATION_TYPE_FOLDER);
+
+        return asset;
+    }
+
+    private boolean propertyIsExcluded(final String name) {
+        final String[] excluded = new String[]{"objectId",
+                                               "uuid",
+                                               "categories",
+                                               "itemAttachments"};
+
+        boolean result = false;
+        for (final String current : excluded) {
+            if (current.equals(name)) {
+                result = true;
+            }
+        }
+
+        return result;
     }
 
     /**
diff --git a/ccm-cms/src/main/java/org/librecms/assets/BinaryAsset.java b/ccm-cms/src/main/java/org/librecms/assets/BinaryAsset.java
index 4af597560..2804567a6 100644
--- a/ccm-cms/src/main/java/org/librecms/assets/BinaryAsset.java
+++ b/ccm-cms/src/main/java/org/librecms/assets/BinaryAsset.java
@@ -44,7 +44,7 @@ import static org.librecms.CmsConstants.*;
 
 /**
  * Base class for all assets storing binary information, like videos.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Entity
@@ -56,13 +56,13 @@ public class BinaryAsset extends Asset implements Serializable {
 
     @Embedded
     @AssociationOverride(
-            name = "values",
-            joinTable = @JoinTable(name = "BINARY_ASSET_DESCRIPTIONS",
-                                   schema = DB_SCHEMA,
-                                   joinColumns = {
-                                       @JoinColumn(name = "ASSET_ID")
-                                   }
-            )
+        name = "values",
+        joinTable = @JoinTable(name = "BINARY_ASSET_DESCRIPTIONS",
+                               schema = DB_SCHEMA,
+                               joinColumns = {
+                                   @JoinColumn(name = "ASSET_ID")
+                               }
+        )
     )
     private LocalizedString description;
 
@@ -85,6 +85,7 @@ public class BinaryAsset extends Asset implements Serializable {
     public BinaryAsset() {
         super();
         description = new LocalizedString();
+        data = new byte[]{};
     }
 
     public LocalizedString getDescription() {
@@ -112,12 +113,21 @@ public class BinaryAsset extends Asset implements Serializable {
     }
 
     public byte[] getData() {
-        return Arrays.copyOf(data, data.length);
+        if (data == null) {
+            return new byte[]{};
+        } else {
+            return Arrays.copyOf(data, data.length);
+        }
     }
 
     public void setData(final byte[] data) {
-        this.data = Arrays.copyOf(data, data.length);
-        size = data.length;
+        if (data == null) {
+            this.data = new byte[]{};
+            size = this.data.length;
+        } else {
+            this.data = Arrays.copyOf(data, data.length);
+            size = data.length;
+        }
     }
 
     public long getSize() {
@@ -181,13 +191,14 @@ public class BinaryAsset extends Asset implements Serializable {
     @Override
     public String toString(final String data) {
         return super.toString(String.format(", description = %s, "
-                                                    + "fileName = \"%s\", "
-                                                    + "mimeType = \"%s\", "
-                                                    + "size = %d%s",
+                                                + "fileName = \"%s\", "
+                                                + "mimeType = \"%s\", "
+                                                + "size = %d%s",
                                             Objects.toString(description),
                                             fileName,
                                             Objects.toString(mimeType),
                                             size,
                                             data));
     }
+
 }
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
index 9f6faa606..6bbf6817d 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
@@ -325,6 +325,7 @@ public class ContentItemManager {
         final ContentItem item,
         @RequiresPrivilege(ItemPrivileges.CREATE_NEW)
         final Folder targetFolder) {
+        
         if (item == null) {
             throw new IllegalArgumentException("The item to copy can't be null.");
         }
@@ -511,7 +512,7 @@ public class ContentItemManager {
             } else {
                 final Object value;
                 try {
-                    value = readMethod.invoke(item);
+                    value = readMethod.invoke(draftItem);
                     writeMethod.invoke(copy, value);
                 } catch (IllegalAccessException
                          | IllegalArgumentException
diff --git a/ccm-cms/src/test/java/org/librecms/assets/AssetManagerTest.java b/ccm-cms/src/test/java/org/librecms/assets/AssetManagerTest.java
index cbc01c48b..fc15f3121 100644
--- a/ccm-cms/src/test/java/org/librecms/assets/AssetManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/assets/AssetManagerTest.java
@@ -319,10 +319,10 @@ public class AssetManagerTest {
     public void moveAssetToOtherFolder() {
         final Asset asset = assetRepo.findById(-900L);
         assertThat(asset, is(not(nullValue())));
-        
+
         final Folder folder = folderRepo.findById(-410L);
         assertThat(folder, is(not(nullValue())));
-        
+
         assetManager.move(asset, folder);
     }
 
@@ -344,10 +344,10 @@ public class AssetManagerTest {
     public void moveAssetToFolderInOtherContentSection() {
         final Asset asset = assetRepo.findById(-900L);
         assertThat(asset, is(not(nullValue())));
-        
+
         final Folder folder = folderRepo.findById(-1600L);
         assertThat(folder, is(not(nullValue())));
-        
+
         assetManager.move(asset, folder);
     }
 
@@ -363,10 +363,12 @@ public class AssetManagerTest {
     @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveAssetNull() {
+        final Asset asset = null;
+
         final Folder folder = folderRepo.findById(-410L);
         assertThat(folder, is(not(nullValue())));
-        
-        assetManager.move(null, folder);
+
+        assetManager.move(asset, folder);
     }
 
     /**
@@ -383,8 +385,10 @@ public class AssetManagerTest {
     public void moveAssetTargetFolderIsNull() {
         final Asset asset = assetRepo.findById(-900L);
         assertThat(asset, is(not(nullValue())));
-        
-        assetManager.move(asset, null);
+
+        final Folder targetFolder = null;
+
+        assetManager.move(asset, targetFolder);
     }
 
     /**
@@ -401,10 +405,10 @@ public class AssetManagerTest {
     public void moveAssetTargetFolderIsNotAssetFolder() {
         final Asset asset = assetRepo.findById(-900L);
         assertThat(asset, is(not(nullValue())));
-        
+
         final Folder folder = folderRepo.findById(-200L);
         assertThat(folder, is(not(nullValue())));
-        
+
         assetManager.move(asset, folder);
     }
 
@@ -419,9 +423,21 @@ public class AssetManagerTest {
         value = "datasets/org/librecms/assets/AssetManagerTest/"
                     + "after-copy-to-other-folder.xml",
         excludeColumns = {"object_id",
-                          "uuid"})
+                          "uuid",
+                          "asset_id",
+                          "id",
+                          "timestamp",
+                          "rev",
+                          "categorization_id",
+                          "object_order"})
     public void copyAssetToOtherFolder() {
-        fail();
+        final Asset asset = assetRepo.findById(-1100L);
+        assertThat(asset, is(not(nullValue())));
+
+        final Folder targetFolder = folderRepo.findById(-400L);
+        assertThat(targetFolder, is(not(nullValue())));
+
+        assetManager.copy(asset, targetFolder);
     }
 
     /**
@@ -435,9 +451,22 @@ public class AssetManagerTest {
         value = "datasets/org/librecms/assets/AssetManagerTest/"
                     + "after-copy-to-same-folder.xml",
         excludeColumns = {"object_id",
-                          "uuid"})
+                          "uuid",
+                          "asset_id",
+                          "id",
+                          "timestamp",
+                          "rev",
+                          "categorization_id",
+                          "object_order"})
     public void copyAssetToSameFolder() {
-        fail();
+        final Asset asset = assetRepo.findById(-1100L);
+        assertThat(asset, is(not(nullValue())));
+
+        final Folder targetFolder = folderRepo.findById(-420L);
+        assertThat(targetFolder, is(not(nullValue())));
+
+        assetManager.copy(asset, targetFolder);
+        assetManager.copy(asset, targetFolder);
     }
 
     /**
@@ -452,9 +481,21 @@ public class AssetManagerTest {
         value = "datasets/org/librecms/assets/AssetManagerTest/"
                     + "after-copy-to-other-contentsection.xml",
         excludeColumns = {"object_id",
-                          "uuid"})
+                          "uuid",
+                          "asset_id",
+                          "id",
+                          "timestamp",
+                          "rev",
+                          "categorization_id",
+                          "object_order"})
     public void copyAssetToOtherContentSection() {
-        fail();
+        final Asset asset = assetRepo.findById(-1100L);
+        assertThat(asset, is(not(nullValue())));
+
+        final Folder targetFolder = folderRepo.findById(-1600L);
+        assertThat(targetFolder, is(not(nullValue())));
+
+        assetManager.copy(asset, targetFolder);
     }
 
     /**
@@ -469,7 +510,12 @@ public class AssetManagerTest {
     @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void copyAssetNull() {
-        fail();
+        final Asset asset = null;
+
+        final Folder targetFolder = folderRepo.findById(-420L);
+        assertThat(targetFolder, is(not(nullValue())));
+
+        assetManager.copy(asset, targetFolder);
     }
 
     /**
@@ -484,7 +530,12 @@ public class AssetManagerTest {
     @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void copyAssetTargetFolderIsNull() {
-        fail();
+        final Asset asset = assetRepo.findById(-1100L);
+        assertThat(asset, is(not(nullValue())));
+
+        final Folder targetFolder = null;
+
+        assetManager.copy(asset, targetFolder);
     }
 
     /**
@@ -499,7 +550,13 @@ public class AssetManagerTest {
     @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void copyAssetTargetFolderIsNotAssetFolder() {
-        fail();
+        final Asset asset = assetRepo.findById(-1100L);
+        assertThat(asset, is(not(nullValue())));
+
+        final Folder targetFolder = folderRepo.findById(-200L);
+        assertThat(targetFolder, is(not(nullValue())));
+
+        assetManager.copy(asset, targetFolder);
     }
 
     /**
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-contentsection.xml b/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-contentsection.xml
index ffc0a3b5a..502f93033 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-contentsection.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-contentsection.xml
@@ -10,6 +10,8 @@
     
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="1"
+                            timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
                           display_name="info"
@@ -23,6 +25,12 @@
     <ccm_core.ccm_objects object_id="-400"
                           display_name="media"
                           uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-410" 
+                          display_name="images"
+                          uuid="713d857d-dd0e-4fc5-85d6-d85d25279a10" />
+    <ccm_core.ccm_objects object_id="-420" 
+                          display_name="downloads"
+                          uuid="9d89913d-759e-4de9-b2fb-c6f58e55de09" />
     <ccm_core.ccm_objects object_id="-500"
                           display_name="data"
                           uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
@@ -65,6 +73,9 @@
     <ccm_core.ccm_objects object_id="-1700"
                           display_name="data"
                           uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    <ccm_core.ccm_objects object_id="-1800"
+                          display_name="catalog.pdf"
+                          uuid="00000000-0000-0000-0000-000000000000" />
     
     <ccm_core.ccm_objects_aud object_id="-600"
                               rev="0"
@@ -94,6 +105,10 @@
                               rev="0"
                               revtype="0"
                               display_name="orphan.png" />
+    <ccm_core.ccm_objects_aud object_id="-1800"
+                              rev="1"
+                              revtype="0"
+                              display_name="catalog.pdf" />
 
     <ccm_core.categories object_id="-200" 
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
@@ -111,13 +126,31 @@
                          category_order="1"/>
     <ccm_core.categories object_id="-400"
                          unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         parent_category_id="-300"
                          name="media" 
                          enabled="true" 
                          visible="true" 
                          abstract_category="false" 
                          category_order="1"/>
+    <ccm_core.categories object_id="-410"
+                         unique_id="713d857d-dd0e-4fc5-85d6-d85d25279a10"
+                         parent_category_id="-400"
+                         name="images"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-420"
+                         unique_id="9d89913d-759e-4de9-b2fb-c6f58e55de09"
+                         parent_category_id="-400"
+                         name="downloads"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
     <ccm_core.categories object_id="-500" 
                          unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         parent_category_id="-300"
                          name="data" 
                          enabled="true" 
                          visible="true" 
@@ -139,6 +172,7 @@
                          category_order="1" />
     <ccm_core.categories object_id="-1600" 
                          unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         parent_category_id="-1500"
                          name="media"
                          enabled="true"
                          visible="true"
@@ -146,6 +180,7 @@
                          category_order="1"    />
     <ccm_core.categories object_id="-1700" 
                          unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         parent_category_id="-1500"
                          name="data"
                          enabled="true"
                          visible="true"
@@ -161,6 +196,12 @@
     <ccm_core.category_titles object_id="-400"
                               locale="en"
                               localized_value="media" />
+    <ccm_core.category_titles object_id="-410"
+                              locale="en"
+                              localized_value="images" />
+    <ccm_core.category_titles object_id="-420"
+                              locale="en"
+                              localized_value="downloads" />
     <ccm_core.category_titles object_id="-500"
                               locale="en"
                               localized_value="data" />
@@ -196,6 +237,10 @@
                      type="ASSETS_FOLDER" />
     <ccm_cms.folders object_id="-400"
                      type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-410"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-420"
+                     type="ASSETS_FOLDER" />
     <ccm_cms.folders object_id="-500"
                      type="ASSETS_FOLDER" />
     <ccm_cms.folders object_id="-1400"
@@ -222,6 +267,10 @@
                                         content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-400" 
                                         content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-410" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-420" 
+                                        content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-500" 
                                         content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-1400" 
@@ -248,6 +297,7 @@
     <ccm_cms.assets object_id="-1000" />
     <ccm_cms.assets object_id="-1100" />
     <ccm_cms.assets object_id="-1150" />
+    <ccm_cms.assets object_id="-1800" />
     
     <ccm_cms.assets_aud object_id="-700" 
                         rev="0" />
@@ -261,6 +311,8 @@
                         rev="0" />
     <ccm_cms.assets_aud object_id="-1150" 
                         rev="0" />
+    <ccm_cms.assets_aud object_id="-1800" 
+                        rev="1" />
     
     <ccm_cms.asset_titles asset_id="-700" 
                           localized_value="header.png" 
@@ -275,11 +327,14 @@
                           localized_value="product1-datasheet.pdf" 
                           locale="en" />
     <ccm_cms.asset_titles asset_id="-1100" 
-                          localized_value="catelog.pdf" 
+                          localized_value="catalog.pdf" 
                           locale="en" />
     <ccm_cms.asset_titles asset_id="-1150" 
                           localized_value="orphan.pdf" 
                           locale="en" />
+    <ccm_cms.asset_titles asset_id="-1800" 
+                          localized_value="catalog.pdf" 
+                          locale="en" />
     
     <ccm_cms.binary_assets object_id="-700" 
                            filename="header.png" 
@@ -305,6 +360,10 @@
                            filename="orphan.png" 
                            mime_type="image/png" 
                            data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1800" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
     
     <ccm_cms.binary_assets_aud object_id="-700" 
                                rev="0"
@@ -325,7 +384,7 @@
                                rev="0"
                                filename="product1-datasheet.pdf"
                                mime_type="application/pdf"
-                               data_size="0"    />
+                               data_size="0" />
     <ccm_cms.binary_assets_aud object_id="-1100" 
                                rev="0"
                                filename="catalog.pdf" 
@@ -336,6 +395,11 @@
                                filename="orphan.png" 
                                mime_type="image/png"
                                data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1800" 
+                               rev="1"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
     
     <ccm_cms.images object_id="-700" 
                     height="0"
@@ -369,11 +433,14 @@
     
     <ccm_cms.files object_id="-1000" />
     <ccm_cms.files object_id="-1100" />
+    <ccm_cms.files object_id="-1800" />
     
     <ccm_cms.files_aud object_id="-1000" 
                        rev="0" />
     <ccm_cms.files_aud object_id="-1100" 
                        rev="0" />
+    <ccm_cms.files_aud object_id="-1800" 
+                       rev="1" />
     
     <ccm_cms.asset_titles_aud asset_id="-700" 
                               rev="0"
@@ -398,9 +465,18 @@
     <ccm_cms.asset_titles_aud asset_id="-1100" 
                               rev="0"
                               revtype="0"
-                              localized_value="catelog.pdf" 
+                              localized_value="catalog.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1150" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="orphan.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1800" 
+                              rev="1"
+                              revtype="0"
+                              localized_value="catalog.pdf" 
                               locale="en" />
-
     
     <ccm_cms.content_items_aud object_id="-600" 
                                rev="0"
@@ -454,14 +530,14 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30200" 
-                              category_id="-400" 
+                              category_id="-410" 
                               object_id="-700" 
                               category_order="1" 
                               object_order="2" 
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30300" 
-                              category_id="-400" 
+                              category_id="-410" 
                               object_id="-800" 
                               category_order="1" 
                               object_order="3" 
@@ -475,12 +551,19 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30600" 
-                              category_id="-400" 
+                              category_id="-420" 
                               object_id="-1100" 
                               category_order="1" 
                               object_order="6" 
                               category_index="false"
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-30700" 
+                              category_id="-1600" 
+                              object_id="-1800" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
     
     <ccm_cms.attachment_lists list_id="-40100"
                               name="images"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-folder.xml
index ffc0a3b5a..0cdc09008 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-folder.xml
@@ -10,6 +10,8 @@
     
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="1"
+                            timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
                           display_name="info"
@@ -23,6 +25,12 @@
     <ccm_core.ccm_objects object_id="-400"
                           display_name="media"
                           uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-410" 
+                          display_name="images"
+                          uuid="713d857d-dd0e-4fc5-85d6-d85d25279a10" />
+    <ccm_core.ccm_objects object_id="-420" 
+                          display_name="downloads"
+                          uuid="9d89913d-759e-4de9-b2fb-c6f58e55de09" />
     <ccm_core.ccm_objects object_id="-500"
                           display_name="data"
                           uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
@@ -65,6 +73,9 @@
     <ccm_core.ccm_objects object_id="-1700"
                           display_name="data"
                           uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    <ccm_core.ccm_objects object_id="-1800"
+                          display_name="catalog.pdf"
+                          uuid="00000000-0000-0000-0000-000000000000" />
     
     <ccm_core.ccm_objects_aud object_id="-600"
                               rev="0"
@@ -94,6 +105,10 @@
                               rev="0"
                               revtype="0"
                               display_name="orphan.png" />
+    <ccm_core.ccm_objects_aud object_id="-1800"
+                              rev="1"
+                              revtype="0"
+                              display_name="catalog.pdf" />
 
     <ccm_core.categories object_id="-200" 
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
@@ -111,13 +126,31 @@
                          category_order="1"/>
     <ccm_core.categories object_id="-400"
                          unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         parent_category_id="-300"
                          name="media" 
                          enabled="true" 
                          visible="true" 
                          abstract_category="false" 
                          category_order="1"/>
+    <ccm_core.categories object_id="-410"
+                         unique_id="713d857d-dd0e-4fc5-85d6-d85d25279a10"
+                         parent_category_id="-400"
+                         name="images"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-420"
+                         unique_id="9d89913d-759e-4de9-b2fb-c6f58e55de09"
+                         parent_category_id="-400"
+                         name="downloads"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
     <ccm_core.categories object_id="-500" 
                          unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         parent_category_id="-300"
                          name="data" 
                          enabled="true" 
                          visible="true" 
@@ -139,6 +172,7 @@
                          category_order="1" />
     <ccm_core.categories object_id="-1600" 
                          unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         parent_category_id="-1500"
                          name="media"
                          enabled="true"
                          visible="true"
@@ -146,6 +180,7 @@
                          category_order="1"    />
     <ccm_core.categories object_id="-1700" 
                          unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         parent_category_id="-1500"
                          name="data"
                          enabled="true"
                          visible="true"
@@ -161,6 +196,12 @@
     <ccm_core.category_titles object_id="-400"
                               locale="en"
                               localized_value="media" />
+    <ccm_core.category_titles object_id="-410"
+                              locale="en"
+                              localized_value="images" />
+    <ccm_core.category_titles object_id="-420"
+                              locale="en"
+                              localized_value="downloads" />
     <ccm_core.category_titles object_id="-500"
                               locale="en"
                               localized_value="data" />
@@ -196,6 +237,10 @@
                      type="ASSETS_FOLDER" />
     <ccm_cms.folders object_id="-400"
                      type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-410"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-420"
+                     type="ASSETS_FOLDER" />
     <ccm_cms.folders object_id="-500"
                      type="ASSETS_FOLDER" />
     <ccm_cms.folders object_id="-1400"
@@ -222,6 +267,10 @@
                                         content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-400" 
                                         content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-410" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-420" 
+                                        content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-500" 
                                         content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-1400" 
@@ -248,6 +297,7 @@
     <ccm_cms.assets object_id="-1000" />
     <ccm_cms.assets object_id="-1100" />
     <ccm_cms.assets object_id="-1150" />
+    <ccm_cms.assets object_id="-1800" />
     
     <ccm_cms.assets_aud object_id="-700" 
                         rev="0" />
@@ -261,6 +311,8 @@
                         rev="0" />
     <ccm_cms.assets_aud object_id="-1150" 
                         rev="0" />
+    <ccm_cms.assets_aud object_id="-1800" 
+                        rev="1" />
     
     <ccm_cms.asset_titles asset_id="-700" 
                           localized_value="header.png" 
@@ -275,11 +327,14 @@
                           localized_value="product1-datasheet.pdf" 
                           locale="en" />
     <ccm_cms.asset_titles asset_id="-1100" 
-                          localized_value="catelog.pdf" 
+                          localized_value="catalog.pdf" 
                           locale="en" />
     <ccm_cms.asset_titles asset_id="-1150" 
                           localized_value="orphan.pdf" 
                           locale="en" />
+    <ccm_cms.asset_titles asset_id="-1800" 
+                          localized_value="catalog.pdf" 
+                          locale="en" />
     
     <ccm_cms.binary_assets object_id="-700" 
                            filename="header.png" 
@@ -305,6 +360,10 @@
                            filename="orphan.png" 
                            mime_type="image/png" 
                            data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1800" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
     
     <ccm_cms.binary_assets_aud object_id="-700" 
                                rev="0"
@@ -325,7 +384,7 @@
                                rev="0"
                                filename="product1-datasheet.pdf"
                                mime_type="application/pdf"
-                               data_size="0"    />
+                               data_size="0" />
     <ccm_cms.binary_assets_aud object_id="-1100" 
                                rev="0"
                                filename="catalog.pdf" 
@@ -336,6 +395,11 @@
                                filename="orphan.png" 
                                mime_type="image/png"
                                data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1800" 
+                               rev="1"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
     
     <ccm_cms.images object_id="-700" 
                     height="0"
@@ -369,11 +433,14 @@
     
     <ccm_cms.files object_id="-1000" />
     <ccm_cms.files object_id="-1100" />
+    <ccm_cms.files object_id="-1800" />
     
     <ccm_cms.files_aud object_id="-1000" 
                        rev="0" />
     <ccm_cms.files_aud object_id="-1100" 
                        rev="0" />
+    <ccm_cms.files_aud object_id="-1800" 
+                       rev="1" />
     
     <ccm_cms.asset_titles_aud asset_id="-700" 
                               rev="0"
@@ -398,9 +465,18 @@
     <ccm_cms.asset_titles_aud asset_id="-1100" 
                               rev="0"
                               revtype="0"
-                              localized_value="catelog.pdf" 
+                              localized_value="catalog.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1150" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="orphan.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1800" 
+                              rev="1"
+                              revtype="0"
+                              localized_value="catalog.pdf" 
                               locale="en" />
-
     
     <ccm_cms.content_items_aud object_id="-600" 
                                rev="0"
@@ -454,14 +530,14 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30200" 
-                              category_id="-400" 
+                              category_id="-410" 
                               object_id="-700" 
                               category_order="1" 
                               object_order="2" 
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30300" 
-                              category_id="-400" 
+                              category_id="-410" 
                               object_id="-800" 
                               category_order="1" 
                               object_order="3" 
@@ -475,12 +551,19 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30600" 
-                              category_id="-400" 
+                              category_id="-420" 
                               object_id="-1100" 
                               category_order="1" 
                               object_order="6" 
                               category_index="false"
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-30700" 
+                              category_id="-400" 
+                              object_id="-1800" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
     
     <ccm_cms.attachment_lists list_id="-40100"
                               name="images"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-same-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-same-folder.xml
index ffc0a3b5a..8771e2044 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-same-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-same-folder.xml
@@ -10,6 +10,8 @@
     
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="1"
+                            timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
                           display_name="info"
@@ -23,6 +25,12 @@
     <ccm_core.ccm_objects object_id="-400"
                           display_name="media"
                           uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-410" 
+                          display_name="images"
+                          uuid="713d857d-dd0e-4fc5-85d6-d85d25279a10" />
+    <ccm_core.ccm_objects object_id="-420" 
+                          display_name="downloads"
+                          uuid="9d89913d-759e-4de9-b2fb-c6f58e55de09" />
     <ccm_core.ccm_objects object_id="-500"
                           display_name="data"
                           uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
@@ -65,6 +73,12 @@
     <ccm_core.ccm_objects object_id="-1700"
                           display_name="data"
                           uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    <ccm_core.ccm_objects object_id="-1800"
+                          display_name="catalog.pdf_copy1"
+                          uuid="00000000-0000-0000-0000-000000000000" />
+    <ccm_core.ccm_objects object_id="-1900"
+                          display_name="catalog.pdf_copy2"
+                          uuid="00000000-0000-0000-0000-000000000001" />
     
     <ccm_core.ccm_objects_aud object_id="-600"
                               rev="0"
@@ -94,6 +108,14 @@
                               rev="0"
                               revtype="0"
                               display_name="orphan.png" />
+    <ccm_core.ccm_objects_aud object_id="-1800"
+                              rev="1"
+                              revtype="0"
+                              display_name="catalog.pdf_copy1" />
+    <ccm_core.ccm_objects_aud object_id="-1900"
+                              rev="1"
+                              revtype="0"
+                              display_name="catalog.pdf_copy2" />
 
     <ccm_core.categories object_id="-200" 
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
@@ -111,13 +133,31 @@
                          category_order="1"/>
     <ccm_core.categories object_id="-400"
                          unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         parent_category_id="-300"
                          name="media" 
                          enabled="true" 
                          visible="true" 
                          abstract_category="false" 
                          category_order="1"/>
+    <ccm_core.categories object_id="-410"
+                         unique_id="713d857d-dd0e-4fc5-85d6-d85d25279a10"
+                         parent_category_id="-400"
+                         name="images"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-420"
+                         unique_id="9d89913d-759e-4de9-b2fb-c6f58e55de09"
+                         parent_category_id="-400"
+                         name="downloads"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
     <ccm_core.categories object_id="-500" 
                          unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         parent_category_id="-300"
                          name="data" 
                          enabled="true" 
                          visible="true" 
@@ -139,6 +179,7 @@
                          category_order="1" />
     <ccm_core.categories object_id="-1600" 
                          unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         parent_category_id="-1500"
                          name="media"
                          enabled="true"
                          visible="true"
@@ -146,6 +187,7 @@
                          category_order="1"    />
     <ccm_core.categories object_id="-1700" 
                          unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         parent_category_id="-1500"
                          name="data"
                          enabled="true"
                          visible="true"
@@ -161,6 +203,12 @@
     <ccm_core.category_titles object_id="-400"
                               locale="en"
                               localized_value="media" />
+    <ccm_core.category_titles object_id="-410"
+                              locale="en"
+                              localized_value="images" />
+    <ccm_core.category_titles object_id="-420"
+                              locale="en"
+                              localized_value="downloads" />
     <ccm_core.category_titles object_id="-500"
                               locale="en"
                               localized_value="data" />
@@ -196,6 +244,10 @@
                      type="ASSETS_FOLDER" />
     <ccm_cms.folders object_id="-400"
                      type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-410"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-420"
+                     type="ASSETS_FOLDER" />
     <ccm_cms.folders object_id="-500"
                      type="ASSETS_FOLDER" />
     <ccm_cms.folders object_id="-1400"
@@ -222,6 +274,10 @@
                                         content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-400" 
                                         content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-410" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-420" 
+                                        content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-500" 
                                         content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-1400" 
@@ -248,6 +304,8 @@
     <ccm_cms.assets object_id="-1000" />
     <ccm_cms.assets object_id="-1100" />
     <ccm_cms.assets object_id="-1150" />
+    <ccm_cms.assets object_id="-1800" />
+    <ccm_cms.assets object_id="-1900" />
     
     <ccm_cms.assets_aud object_id="-700" 
                         rev="0" />
@@ -261,6 +319,10 @@
                         rev="0" />
     <ccm_cms.assets_aud object_id="-1150" 
                         rev="0" />
+    <ccm_cms.assets_aud object_id="-1800" 
+                        rev="1" />
+    <ccm_cms.assets_aud object_id="-1900" 
+                        rev="1" />
     
     <ccm_cms.asset_titles asset_id="-700" 
                           localized_value="header.png" 
@@ -275,11 +337,17 @@
                           localized_value="product1-datasheet.pdf" 
                           locale="en" />
     <ccm_cms.asset_titles asset_id="-1100" 
-                          localized_value="catelog.pdf" 
+                          localized_value="catalog.pdf" 
                           locale="en" />
     <ccm_cms.asset_titles asset_id="-1150" 
                           localized_value="orphan.pdf" 
                           locale="en" />
+    <ccm_cms.asset_titles asset_id="-1800" 
+                          localized_value="catalog.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1900" 
+                          localized_value="catalog.pdf" 
+                          locale="en" />
     
     <ccm_cms.binary_assets object_id="-700" 
                            filename="header.png" 
@@ -305,6 +373,14 @@
                            filename="orphan.png" 
                            mime_type="image/png" 
                            data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1800" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1900" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
     
     <ccm_cms.binary_assets_aud object_id="-700" 
                                rev="0"
@@ -325,7 +401,7 @@
                                rev="0"
                                filename="product1-datasheet.pdf"
                                mime_type="application/pdf"
-                               data_size="0"    />
+                               data_size="0" />
     <ccm_cms.binary_assets_aud object_id="-1100" 
                                rev="0"
                                filename="catalog.pdf" 
@@ -336,6 +412,16 @@
                                filename="orphan.png" 
                                mime_type="image/png"
                                data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1800" 
+                               rev="1"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1900" 
+                               rev="1"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
     
     <ccm_cms.images object_id="-700" 
                     height="0"
@@ -369,11 +455,17 @@
     
     <ccm_cms.files object_id="-1000" />
     <ccm_cms.files object_id="-1100" />
+    <ccm_cms.files object_id="-1800" />
+    <ccm_cms.files object_id="-1900" />
     
     <ccm_cms.files_aud object_id="-1000" 
                        rev="0" />
     <ccm_cms.files_aud object_id="-1100" 
                        rev="0" />
+    <ccm_cms.files_aud object_id="-1800" 
+                       rev="1" />
+    <ccm_cms.files_aud object_id="-1900" 
+                       rev="1" />
     
     <ccm_cms.asset_titles_aud asset_id="-700" 
                               rev="0"
@@ -398,9 +490,23 @@
     <ccm_cms.asset_titles_aud asset_id="-1100" 
                               rev="0"
                               revtype="0"
-                              localized_value="catelog.pdf" 
+                              localized_value="catalog.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1150" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="orphan.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1800" 
+                              rev="1"
+                              revtype="0"
+                              localized_value="catalog.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1900" 
+                              rev="1"
+                              revtype="0"
+                              localized_value="catalog.pdf" 
                               locale="en" />
-
     
     <ccm_cms.content_items_aud object_id="-600" 
                                rev="0"
@@ -454,14 +560,14 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30200" 
-                              category_id="-400" 
+                              category_id="-410" 
                               object_id="-700" 
                               category_order="1" 
                               object_order="2" 
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30300" 
-                              category_id="-400" 
+                              category_id="-410" 
                               object_id="-800" 
                               category_order="1" 
                               object_order="3" 
@@ -475,12 +581,26 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30600" 
-                              category_id="-400" 
+                              category_id="-420" 
                               object_id="-1100" 
                               category_order="1" 
                               object_order="6" 
                               category_index="false"
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-30700" 
+                              category_id="-420" 
+                              object_id="-1800" 
+                              category_order="1" 
+                              object_order="7" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30800" 
+                              category_id="-420" 
+                              object_id="-1900" 
+                              category_order="1" 
+                              object_order="8" 
+                              category_index="false"
+                              type="folder" />
     
     <ccm_cms.attachment_lists list_id="-40100"
                               name="images"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-create-shared.xml b/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-create-shared.xml
deleted file mode 100644
index ffc0a3b5a..000000000
--- a/ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-create-shared.xml
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dataset>
-
-    <!-- 
-        * 2 ContentSections with several asset folders
-        * CcmObject with existing AttachmentList
-        * several shared assets
-        
-    -->
-    
-    <ccm_core.ccm_revisions id="0"
-                            timestamp="1451602800" />
-    
-    <ccm_core.ccm_objects object_id="-100" 
-                          display_name="info"
-                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
-    <ccm_core.ccm_objects object_id="-200"
-                          display_name="info_root"
-                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
-    <ccm_core.ccm_objects object_id="-300"
-                          display_name="info_assets"
-                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
-    <ccm_core.ccm_objects object_id="-400"
-                          display_name="media"
-                          uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
-    <ccm_core.ccm_objects object_id="-500"
-                          display_name="data"
-                          uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
-    <ccm_core.ccm_objects object_id="-600"
-                          display_name="article1"
-                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
-    <ccm_core.ccm_objects object_id="-700"
-                          display_name="header.png"
-                          uuid="4635589f-b87a-46d9-979e-6af14af063e5" />
-    <ccm_core.ccm_objects object_id="-800"
-                          display_name="the-phb.png"
-                          uuid="0a192e98-3b28-49d0-833f-bc9ff5f9d1d4" />
-    <ccm_core.ccm_objects object_id="-900"
-                          display_name="services-header.png"
-                          uuid="3fe13eb8-ec8d-4523-b42a-7fe1d5cf1a44" />
-    <ccm_core.ccm_objects object_id="-1000"
-                          display_name="product1-datasheet.pdf"
-                          uuid="0393840f-06a6-4ec3-aeb3-a612f845ad60" />
-    <ccm_core.ccm_objects object_id="-1100"
-                          display_name="catalog.pdf"
-                          uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
-    <ccm_core.ccm_objects object_id="-1150"
-                          display_name="orphan.png"
-                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
-    <ccm_core.ccm_objects object_id="-1200"
-                          display_name="org.librecms.contenttypes.Article"
-                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
-    <ccm_core.ccm_objects object_id="-1300" 
-                          display_name="projects"
-                          uuid="2ac48bb5-a5fd-4e30-a80d-d895c2cad78a" />
-    <ccm_core.ccm_objects object_id="-1400"
-                          display_name="projects_root"
-                          uuid="fa88836d-3f3e-4197-949a-e9c697400bf0" />
-    <ccm_core.ccm_objects object_id="-1500"
-                          display_name="projects_assets"
-                          uuid="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" />
-    <ccm_core.ccm_objects object_id="-1600"
-                          display_name="media"
-                          uuid="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" />
-    <ccm_core.ccm_objects object_id="-1700"
-                          display_name="data"
-                          uuid="80086df3-d682-42bb-9939-8cc04a300575" />
-    
-    <ccm_core.ccm_objects_aud object_id="-600"
-                              rev="0"
-                              revtype="0"
-                              display_name="article1" />
-    <ccm_core.ccm_objects_aud object_id="-700"
-                              rev="0"
-                              revtype="0"
-                              display_name="header.png" />
-    <ccm_core.ccm_objects_aud object_id="-800"
-                              rev="0"
-                              revtype="0"
-                              display_name="the-phb.png" />
-    <ccm_core.ccm_objects_aud object_id="-900"
-                              rev="0"
-                              revtype="0"
-                              display_name="services-header.png" />
-    <ccm_core.ccm_objects_aud object_id="-1000"
-                              rev="0"
-                              revtype="0"
-                              display_name="product1-datasheet.pdf" />
-    <ccm_core.ccm_objects_aud object_id="-1100"
-                              rev="0"
-                              revtype="0"
-                              display_name="catalog.pdf" />
-    <ccm_core.ccm_objects_aud object_id="-1150"
-                              rev="0"
-                              revtype="0"
-                              display_name="orphan.png" />
-
-    <ccm_core.categories object_id="-200" 
-                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
-                         name="info_root" 
-                         enabled="true" 
-                         visible="true" 
-                         abstract_category="false" 
-                         category_order="1" />
-    <ccm_core.categories object_id="-300"
-                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828" 
-                         name="info_assets" 
-                         enabled="true" 
-                         visible="true" 
-                         abstract_category="false" 
-                         category_order="1"/>
-    <ccm_core.categories object_id="-400"
-                         unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
-                         name="media" 
-                         enabled="true" 
-                         visible="true" 
-                         abstract_category="false" 
-                         category_order="1"/>
-    <ccm_core.categories object_id="-500" 
-                         unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
-                         name="data" 
-                         enabled="true" 
-                         visible="true" 
-                         abstract_category="false" 
-                         category_order="1"/>
-    <ccm_core.categories object_id="-1400" 
-                         unique_id="fa88836d-3f3e-4197-949a-e9c697400bf0" 
-                         name="projects_root"
-                         enabled="true"
-                         visible="true"
-                         abstract_category="false"
-                         category_order="1" />
-    <ccm_core.categories object_id="-1500" 
-                         unique_id="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" 
-                         name="projects_assets"
-                         enabled="true"
-                         visible="true"
-                         abstract_category="false"
-                         category_order="1" />
-    <ccm_core.categories object_id="-1600" 
-                         unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
-                         name="media"
-                         enabled="true"
-                         visible="true"
-                         abstract_category="false"
-                         category_order="1"    />
-    <ccm_core.categories object_id="-1700" 
-                         unique_id="80086df3-d682-42bb-9939-8cc04a300575"
-                         name="data"
-                         enabled="true"
-                         visible="true"
-                         abstract_category="false"
-                         category_order="1"    />
-
-    <ccm_core.category_titles object_id="-200"
-                              locale="en"
-                              localized_value="info_root" />
-    <ccm_core.category_titles object_id="-300"
-                              locale="en"
-                              localized_value="info_assets" />
-    <ccm_core.category_titles object_id="-400"
-                              locale="en"
-                              localized_value="media" />
-    <ccm_core.category_titles object_id="-500"
-                              locale="en"
-                              localized_value="data" />
-    <ccm_core.category_titles object_id="-1400"
-                              locale="en"
-                              localized_value="projects_root" />
-    <ccm_core.category_titles object_id="-1500"
-                              locale="en"
-                              localized_value="projects_assets" />
-    <ccm_core.category_titles object_id="-1600"
-                              locale="en"
-                              localized_value="media" />
-    <ccm_core.category_titles object_id="-1700"
-                              locale="en"
-                              localized_value="data" />
-    
-    
-    <ccm_core.resources object_id="-100" 
-                        created="2016-07-15" />
-    <ccm_core.resources object_id="-1300" 
-                        created="2016-07-15" />
-
-    <ccm_core.applications object_id="-100"
-                           application_type="org.librecms.contentsection.ContentSection"
-                           primary_url="info" />
-    <ccm_core.applications object_id="-1300"
-                           application_type="org.librecms.contentsection.ContentSection"
-                           primary_url="projects" />
-
-    <ccm_cms.folders object_id="-200"
-                     type="DOCUMENTS_FOLDER" />
-    <ccm_cms.folders object_id="-300"
-                     type="ASSETS_FOLDER" />
-    <ccm_cms.folders object_id="-400"
-                     type="ASSETS_FOLDER" />
-    <ccm_cms.folders object_id="-500"
-                     type="ASSETS_FOLDER" />
-    <ccm_cms.folders object_id="-1400"
-                     type="DOCUMENTS_FOLDER" />
-    <ccm_cms.folders object_id="-1500"
-                     type="ASSETS_FOLDER" />
-    <ccm_cms.folders object_id="-1600"
-                     type="ASSETS_FOLDER" />
-    <ccm_cms.folders object_id="-1700"
-                     type="ASSETS_FOLDER" />
-    
-    <ccm_cms.content_sections object_id="-100"
-                              label="info"
-                              root_documents_folder_id="-200"
-                              root_assets_folder_id="-300" />
-    <ccm_cms.content_sections object_id="-1300"
-                              label="projects"
-                              root_documents_folder_id="-1400"
-                              root_assets_folder_id="-1500" />
-
-    <ccm_cms.folder_content_section_map folder_id="-200" 
-                                        content_section_id="-100" />
-    <ccm_cms.folder_content_section_map folder_id="-300" 
-                                        content_section_id="-100" />
-    <ccm_cms.folder_content_section_map folder_id="-400" 
-                                        content_section_id="-100" />
-    <ccm_cms.folder_content_section_map folder_id="-500" 
-                                        content_section_id="-100" />
-    <ccm_cms.folder_content_section_map folder_id="-1400" 
-                                        content_section_id="-1300" />
-    <ccm_cms.folder_content_section_map folder_id="-1500" 
-                                        content_section_id="-1300" />
-    <ccm_cms.folder_content_section_map folder_id="-1600" 
-                                        content_section_id="-1300" />
-    <ccm_cms.folder_content_section_map folder_id="-1700" 
-                                        content_section_id="-1300" />
-    
-    <ccm_cms.content_types object_id="-1200" 
-                           content_item_class="org.librecms.contenttypes.Article" 
-                           content_section_id="-100" />
-
-    <ccm_cms.content_items object_id="-600" 
-                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
-                           version="DRAFT"
-                           content_type_id="-1200" />
-    
-    <ccm_cms.assets object_id="-700" />
-    <ccm_cms.assets object_id="-800" />
-    <ccm_cms.assets object_id="-900" />
-    <ccm_cms.assets object_id="-1000" />
-    <ccm_cms.assets object_id="-1100" />
-    <ccm_cms.assets object_id="-1150" />
-    
-    <ccm_cms.assets_aud object_id="-700" 
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-800" 
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-900" 
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-1000" 
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-1100" 
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-1150" 
-                        rev="0" />
-    
-    <ccm_cms.asset_titles asset_id="-700" 
-                          localized_value="header.png" 
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-800" 
-                          localized_value="the-phb.png" 
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-900" 
-                          localized_value="services-header.png" 
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-1000" 
-                          localized_value="product1-datasheet.pdf" 
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-1100" 
-                          localized_value="catelog.pdf" 
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-1150" 
-                          localized_value="orphan.pdf" 
-                          locale="en" />
-    
-    <ccm_cms.binary_assets object_id="-700" 
-                           filename="header.png" 
-                           mime_type="image/png" 
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-800" 
-                           filename="the-phb.png" 
-                           mime_type="image/png" 
-                           data_size="0"/>
-    <ccm_cms.binary_assets object_id="-900" 
-                           filename="services-header.png" 
-                           mime_type="image/png" 
-                           data_size="0"/>
-    <ccm_cms.binary_assets object_id="-1000" 
-                           filename="product1-datasheet.pdf"
-                           mime_type="application/pdf" 
-                           data_size="0"/>
-    <ccm_cms.binary_assets object_id="-1100" 
-                           filename="catalog.pdf" 
-                           mime_type="application/pdf" 
-                           data_size="0"/>
-    <ccm_cms.binary_assets object_id="-1150" 
-                           filename="orphan.png" 
-                           mime_type="image/png" 
-                           data_size="0"/>
-    
-    <ccm_cms.binary_assets_aud object_id="-700" 
-                               rev="0"
-                               filename="header.png" 
-                               mime_type="image/png" 
-                               data_size="0"/>
-    <ccm_cms.binary_assets_aud object_id="-800" 
-                               rev="0"
-                               filename="the-phb.png" 
-                               mime_type="image/png" 
-                               data_size="0"/>
-    <ccm_cms.binary_assets_aud object_id="-900" 
-                               rev="0"
-                               filename="services-header.png" 
-                               mime_type="image/png" 
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-1000" 
-                               rev="0"
-                               filename="product1-datasheet.pdf"
-                               mime_type="application/pdf"
-                               data_size="0"    />
-    <ccm_cms.binary_assets_aud object_id="-1100" 
-                               rev="0"
-                               filename="catalog.pdf" 
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-1150" 
-                               rev="0"
-                               filename="orphan.png" 
-                               mime_type="image/png"
-                               data_size="0" />
-    
-    <ccm_cms.images object_id="-700" 
-                    height="0"
-                    width="0" />
-    <ccm_cms.images object_id="-800"
-                    height="0"
-                    width="0" />
-    <ccm_cms.images object_id="-900"
-                    height="0"
-                    width="0" />
-    <ccm_cms.images object_id="-1150"
-                    height="0"
-                    width="0" />
-    
-    <ccm_cms.images_aud object_id="-700" 
-                        rev="0" 
-                        height="0"
-                        width="0" />
-    <ccm_cms.images_aud object_id="-800" 
-                        rev="0"
-                        height="0"
-                        width="0" />
-    <ccm_cms.images_aud object_id="-900" 
-                        rev="0"
-                        height="0"
-                        width="0" />
-    <ccm_cms.images_aud object_id="-1150" 
-                        rev="0"
-                        height="0"
-                        width="0" />
-    
-    <ccm_cms.files object_id="-1000" />
-    <ccm_cms.files object_id="-1100" />
-    
-    <ccm_cms.files_aud object_id="-1000" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-1100" 
-                       rev="0" />
-    
-    <ccm_cms.asset_titles_aud asset_id="-700" 
-                              rev="0"
-                              revtype="0"
-                              localized_value="header.png" 
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-800" 
-                              rev="0"
-                              revtype="0"
-                              localized_value="the-phb.png" 
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-900" 
-                              rev="0"
-                              revtype="0"
-                              localized_value="services-header.png" 
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-1000" 
-                              rev="0"
-                              revtype="0"
-                              localized_value="product1-datasheet.pdf" 
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-1100" 
-                              rev="0"
-                              revtype="0"
-                              localized_value="catelog.pdf" 
-                              locale="en" />
-
-    
-    <ccm_cms.content_items_aud object_id="-600" 
-                               rev="0"
-                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
-                               version="DRAFT" 
-                               content_type_id="-1200" />
-
-    <ccm_cms.content_item_names object_id="-600" 
-                                locale="en" 
-                                localized_value="article1" />
-
-    <ccm_cms.content_item_names_aud rev="0" 
-                                    object_id="-600"
-                                    localized_value="article1"
-                                    locale="en"
-                                    revtype="0" />
-
-    <ccm_cms.content_item_titles object_id="-600" 
-                                 locale="en" 
-                                 localized_value="Article 1" />
-
-    <ccm_cms.content_item_titles_aud rev="0" 
-                                     object_id="-600"
-                                     localized_value="Article 1"
-                                     locale="en"
-                                     revtype="0" />
-    
-    <ccm_cms.content_type_labels object_id="-1200"
-                                 locale="en" 
-                                 localized_value="Article" />
-
-    <ccm_cms.articles object_id="-600" />
-    
-    <ccm_cms.article_texts 
-        object_id="-600"
-        locale="en" 
-        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
-
-    <ccm_cms.article_texts_aud 
-        rev="0" 
-        object_id="-600" 
-        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
-        locale="en" 
-        revtype="0" />
-    
-    <ccm_core.categorizations categorization_id="-30100" 
-                              category_id="-200" 
-                              object_id="-600" 
-                              category_order="1" 
-                              object_order="1" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30200" 
-                              category_id="-400" 
-                              object_id="-700" 
-                              category_order="1" 
-                              object_order="2" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30300" 
-                              category_id="-400" 
-                              object_id="-800" 
-                              category_order="1" 
-                              object_order="3" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30400" 
-                              category_id="-400" 
-                              object_id="-900" 
-                              category_order="1" 
-                              object_order="4" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30600" 
-                              category_id="-400" 
-                              object_id="-1100" 
-                              category_order="1" 
-                              object_order="6" 
-                              category_index="false"
-                              type="folder" />
-    
-    <ccm_cms.attachment_lists list_id="-40100"
-                              name="images"
-                              list_order="1"
-                              uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
-                              item_id="-600" />
-    <ccm_cms.attachment_lists list_id="-40200"
-                              name="downloads"
-                              list_order="1"
-                              uuid="b39e4937-9f15-4b1f-9869-5a1107612e94"
-                              item_id="-600" />
-    
-    <ccm_cms.attachment_lists_aud list_id="-40100"
-                                  rev="0"
-                                  revtype="0"
-                                  name="images"
-                                  list_order="1"
-                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
-                                  item_id="-600" />
-    <ccm_cms.attachment_lists_aud list_id="-40200"
-                                  rev="0"
-                                  revtype="0"
-                                  name="images"
-                                  list_order="1"
-                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
-                                  item_id="-600" />
-    
-    <ccm_cms.attachments attachment_id="-50100"
-                         sort_key="1"
-                         uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
-                         asset_id="-700"
-                         attachment_list_id="-40100" />
-    <ccm_cms.attachments attachment_id="-50200"
-                         sort_key="2"
-                         uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
-                         asset_id="-900"
-                         attachment_list_id="-40100" />
-    <ccm_cms.attachments attachment_id="-50300"
-                         sort_key="1"
-                         uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
-                         asset_id="-1000"
-                         attachment_list_id="-40200" />
-    <ccm_cms.attachments attachment_id="-50400"
-                         sort_key="1"
-                         uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
-                         asset_id="-1100"
-                         attachment_list_id="-40200" />
-    
-    <ccm_cms.attachments_aud attachment_id="-50100"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
-                             asset_id="-700"
-                             attachment_list_id="-40100" />
-    <ccm_cms.attachments_aud attachment_id="-50200"
-                             rev="0"
-                             revtype="0"
-                             sort_key="2"
-                             uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
-                             asset_id="-900"
-                             attachment_list_id="-40100" />
-    <ccm_cms.attachments_aud attachment_id="-50300"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
-                             asset_id="-1000"
-                             attachment_list_id="-40200" />
-    <ccm_cms.attachments_aud attachment_id="-50400"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
-                             asset_id="-1100"
-                             attachment_list_id="-40200" />
-
-        
-</dataset>