[#430] Replaced the country field