Services refactoring