Add PaymentMethod and ShippingMethod to thrift