Updated for a new address type and code to save USPS address.