Service manager refactor