Update to new keys