Add map and string fields. Drop xml.