added state (in addition to state_code) to address to support non-US/CA states