Refactoring and adding new services