improved autoloader complexity