refactoring collections store