Adding more logic for ShipmentRequest