Refactored List collection.