Change to autoloader return value