Updated for shipment status and db util