Added key value store