Updated the autoloading procedure