Added validation for city & state