ShipmentSpec refactored