Adding key-value store support.