Added support for kvstores. Need to add a test.