data services refactoring