Addresses #215; Shipping values are now passthrough