Model specialization refactor