Added city, state fields to table