Introduce shipment matching and disabling methods