More refactoring to the service implementation