Adding service manager support to Engine