Additional refactoring in Collection