Major changes around how dispatcher works