Refactoring ServicesClass