Quick change to PSR-4