Autoloader refactoring