Added autoload support