Added support for Key-Value JSON Format