Architecture refactoring (collections vs models)