Change to PSR-4