Update kv_map to be a mutli_field. Add name to kv_map