Improved the autoloader