Refactored collection settings