Added support for key-value store