Adding KV support