Update for composer compatibility