Change to the domain model and classes