Added new fields for city and state and related field validation rules