Changes to Common functionality: refactoring Collection classes