Fix the domain model