Better composer compatibility