Dispatcher improvements