Getting ready for PSR-2