Update to new refactored KV API.