Added cast to country_id and zone_id