Added special case handling to service & dispatcher.