Added city and state elements.