Fixed entity package issue and added DomainObject base class