Updated key-value store internals