Moved collection logic to CollectionController