Updated for composer compatibility