INWORK: Refactoring of collection class