Changed to PSR-4