Refactoring of Collections