Updating to PSR-0