master
Refactoring collections