Added more to autoloader