Upgrade PSR-4