Service manager improvements