Add kvs implementation