Initial service management patch that still needs more work around routing