More work on the domain models