Further work on the best autoloader ever