Refactoring for InitDataService