Refactoring, adding a service