Tidying up and extending the domain model.