Updates for PSR-4