Update to work with the new version of crdispatcher plugin