Changed shipment and entity additions