Batcher renamed to Dispatcher, updated