More TODO for kvs.