Update for PSR-4