autoloader revamped