Add KeyValueStore support