Incomplete restructure of Data tier (removing DataObjects)