Changes made in the domain model part 2