Update to PSR4