Collections refactored.