Update to PSR-2