Updated Ship From/Ship To feature