Refactored own collection hierarchy.