Update to match new key names