update Shipment to use the new API