Updated config to support dispatching