Added additional validation and field transformation, including country names.