Added fields for Country