Removed autoloader dependency