Tweaked autoloader version