Refactored keys.