Updated to work with new Dispatcher.