Updated autoloader inline with latest API changes