Added decorator for shipment