Added small improvement to the Autoload class