Revert "Revert "Remove custom CompositeCollection""

This reverts commit 0a9368086da294586941960e9fa3c49e171e8cbc.