Dispatcher.Factory replaced with Factory<>