Refactoring collections setup