Updated to include autoloader