Updated to support split shipments