Changes for compliance with PSR-2