Rewrite of Dispatcher engine