Further work on DomainModel