Refactoring for the Service Base and Data Service