Added key value store support.