Added support for autoload