Update to PSR2