Huge improvement of Dispatcher/Handler/Executor