Continued flushing out of the domain model