Upgraded to new DomainModel package