Major refactor of dataservices