Adding URIField
Added KeyValueField