Upgraded to DomainModel package