autoload improvements