Added DomainObjectFactory