Add KeyValue conversion from JSON