Updated dispatch autoloading