Service management

Added service management override support