Add an autoload setting to allow override of default