Started Refactoring of collections.