Added conditional autoloader inclusion