Added countries and states to enumerations.