Added autoloader definitions