Fixed support for PSR-4