Conversion to PSR-2