Added shippingType, shippingAddress support in order