Updated to reflect changes to County & CountyMap models