refactor dataservice in progress