Added KeyValue type