Further work on autoloader