Support new style dispatcher config

Change-Id: I2e47dbd425d5f3853871b4a0882541441b0cf4b1