DataClient refactor