Update to match PSR-2