Added ShipmentBuilder Class