Added better autoload