Autoloader improvements