Added support for seperate origin/shipper