added separate field for zip_code and street_address