Fix domain model