Switched to PSR-4