Update to use Dispatcher 1.2.1