Some changes to Dispatch