Quick update to new autoloader