Service manager refactoring