Migrating to PSR-2