Updating to PSR-4