Refactored collections

Started with refactoring model.