Refactored collection models and services.