Further improvements to the domain model.