added domain objects and data context