Changes to byID and Shipment