added kvs to the mainline