Updated to PSR-4