Refactoring collections support