ServiceManager changes

ServiceManager changes