Switched to preferred PSR-4