Finish refactored shipment service