PSR2 compatibility changes