Adding client kv to indexing and client