Changed the autoloader