Dispatcher cleaning
Improve support for asynchronous dispatchers