Made changes to the Dispatcher