Make autoload smarter