Enhance Dispatcher interface