PSR2 support