Data service refactoring