Refactoring collectioon composite