State/Province/Country code in membership form

I did a workaround so that our club could enter more than the US for states. I used Mexico, where our club is located and all it does now is ask for a city and postal code. We will be able to use this for the membership form but it might be something to look at. Instead of connecting it to the time zone in the general settings use another field.