[WIP] Autoloader improvements