More work on domain model