diff --git a/crates/dump/src/lib.rs b/crates/dump/src/lib.rs
index a17fcf941..8bed7f0d4 100644
--- a/crates/dump/src/lib.rs
+++ b/crates/dump/src/lib.rs
@@ -1,6 +1,7 @@
 #![allow(clippy::type_complexity)]
 #![allow(clippy::wrong_self_convention)]
 
+use meilisearch_types::batches::BatchId;
 use meilisearch_types::error::ResponseError;
 use meilisearch_types::keys::Key;
 use meilisearch_types::milli::update::IndexDocumentsMethod;
@@ -57,6 +58,9 @@ pub enum Version {
 #[serde(rename_all = "camelCase")]
 pub struct TaskDump {
     pub uid: TaskId,
+    // The batch ID were introduced in v1.12, everything prior to this version will be `None`.
+    #[serde(default)]
+    pub batch_uid: Option<BatchId>,
     #[serde(default)]
     pub index_uid: Option<String>,
     pub status: Status,
@@ -143,6 +147,7 @@ impl From<Task> for TaskDump {
     fn from(task: Task) -> Self {
         TaskDump {
             uid: task.uid,
+            batch_uid: task.batch_uid,
             index_uid: task.index_uid().map(|uid| uid.to_string()),
             status: task.status,
             kind: task.kind.into(),
@@ -297,6 +302,7 @@ pub(crate) mod test {
             (
                 TaskDump {
                     uid: 0,
+                    batch_uid: Some(0),
                     index_uid: Some(S("doggo")),
                     status: Status::Succeeded,
                     kind: KindDump::DocumentImport {
@@ -320,6 +326,7 @@ pub(crate) mod test {
             (
                 TaskDump {
                     uid: 1,
+                    batch_uid: None,
                     index_uid: Some(S("doggo")),
                     status: Status::Enqueued,
                     kind: KindDump::DocumentImport {
@@ -346,6 +353,7 @@ pub(crate) mod test {
             (
                 TaskDump {
                     uid: 5,
+                    batch_uid: None,
                     index_uid: Some(S("catto")),
                     status: Status::Enqueued,
                     kind: KindDump::IndexDeletion,
diff --git a/crates/dump/src/reader/compat/v5_to_v6.rs b/crates/dump/src/reader/compat/v5_to_v6.rs
index 40a055465..9887c55ba 100644
--- a/crates/dump/src/reader/compat/v5_to_v6.rs
+++ b/crates/dump/src/reader/compat/v5_to_v6.rs
@@ -70,6 +70,7 @@ impl CompatV5ToV6 {
 
                 let task = v6::Task {
                     uid: task_view.uid,
+                    batch_uid: None,
                     index_uid: task_view.index_uid,
                     status: match task_view.status {
                         v5::Status::Enqueued => v6::Status::Enqueued,
diff --git a/crates/index-scheduler/src/batch.rs b/crates/index-scheduler/src/batch.rs
index 903ec1217..d64e2657a 100644
--- a/crates/index-scheduler/src/batch.rs
+++ b/crates/index-scheduler/src/batch.rs
@@ -24,6 +24,7 @@ use std::fs::{self, File};
 use std::io::BufWriter;
 
 use dump::IndexMetadata;
+use meilisearch_types::batches::BatchId;
 use meilisearch_types::error::Code;
 use meilisearch_types::heed::{RoTxn, RwTxn};
 use meilisearch_types::milli::documents::{obkv_to_object, DocumentsBatchReader};
@@ -279,18 +280,22 @@ impl IndexScheduler {
         rtxn: &RoTxn,
         index_uid: String,
         batch: BatchKind,
+        batch_id: BatchId,
         must_create_index: bool,
     ) -> Result<Option<Batch>> {
         match batch {
             BatchKind::DocumentClear { ids } => Ok(Some(Batch::IndexOperation {
                 op: IndexOperation::DocumentClear {
-                    tasks: self.get_existing_tasks(rtxn, ids)?,
+                    tasks: self.get_existing_tasks_with_batch_id(rtxn, batch_id, ids)?,
                     index_uid,
                 },
                 must_create_index,
             })),
             BatchKind::DocumentEdition { id } => {
-                let task = self.get_task(rtxn, id)?.ok_or(Error::CorruptedTaskQueue)?;
+                let task = self
+                    .get_task(rtxn, id)?
+                    .ok_or(Error::CorruptedTaskQueue)?
+                    .with_batch_id(batch_id);
                 match &task.kind {
                     KindWithContent::DocumentEdition { index_uid, .. } => {
                         Ok(Some(Batch::IndexOperation {
@@ -305,7 +310,7 @@ impl IndexScheduler {
                 }
             }
             BatchKind::DocumentOperation { method, operation_ids, .. } => {
-                let tasks = self.get_existing_tasks(rtxn, operation_ids)?;
+                let tasks = self.get_existing_tasks_with_batch_id(rtxn, batch_id, operation_ids)?;
                 let primary_key = tasks
                     .iter()
                     .find_map(|task| match task.kind {
@@ -352,7 +357,7 @@ impl IndexScheduler {
                 }))
             }
             BatchKind::DocumentDeletion { deletion_ids, includes_by_filter: _ } => {
-                let tasks = self.get_existing_tasks(rtxn, deletion_ids)?;
+                let tasks = self.get_existing_tasks_with_batch_id(rtxn, batch_id, deletion_ids)?;
 
                 Ok(Some(Batch::IndexOperation {
                     op: IndexOperation::DocumentDeletion { index_uid, tasks },
@@ -360,7 +365,7 @@ impl IndexScheduler {
                 }))
             }
             BatchKind::Settings { settings_ids, .. } => {
-                let tasks = self.get_existing_tasks(rtxn, settings_ids)?;
+                let tasks = self.get_existing_tasks_with_batch_id(rtxn, batch_id, settings_ids)?;
 
                 let mut settings = Vec::new();
                 for task in &tasks {
@@ -383,6 +388,7 @@ impl IndexScheduler {
                         rtxn,
                         index_uid,
                         BatchKind::Settings { settings_ids, allow_index_creation },
+                        batch_id,
                         must_create_index,
                     )?
                     .unwrap()
@@ -398,6 +404,7 @@ impl IndexScheduler {
                         rtxn,
                         index_uid,
                         BatchKind::DocumentClear { ids: other },
+                        batch_id,
                         must_create_index,
                     )?
                     .unwrap()
@@ -430,6 +437,7 @@ impl IndexScheduler {
                     rtxn,
                     index_uid.clone(),
                     BatchKind::Settings { settings_ids, allow_index_creation },
+                    batch_id,
                     must_create_index,
                 )?;
 
@@ -442,6 +450,7 @@ impl IndexScheduler {
                         primary_key,
                         operation_ids,
                     },
+                    batch_id,
                     must_create_index,
                 )?;
 
@@ -479,7 +488,10 @@ impl IndexScheduler {
                 }
             }
             BatchKind::IndexCreation { id } => {
-                let task = self.get_task(rtxn, id)?.ok_or(Error::CorruptedTaskQueue)?;
+                let task = self
+                    .get_task(rtxn, id)?
+                    .ok_or(Error::CorruptedTaskQueue)?
+                    .with_batch_id(batch_id);
                 let (index_uid, primary_key) = match &task.kind {
                     KindWithContent::IndexCreation { index_uid, primary_key } => {
                         (index_uid.clone(), primary_key.clone())
@@ -489,7 +501,10 @@ impl IndexScheduler {
                 Ok(Some(Batch::IndexCreation { index_uid, primary_key, task }))
             }
             BatchKind::IndexUpdate { id } => {
-                let task = self.get_task(rtxn, id)?.ok_or(Error::CorruptedTaskQueue)?;
+                let task = self
+                    .get_task(rtxn, id)?
+                    .ok_or(Error::CorruptedTaskQueue)?
+                    .with_batch_id(batch_id);
                 let primary_key = match &task.kind {
                     KindWithContent::IndexUpdate { primary_key, .. } => primary_key.clone(),
                     _ => unreachable!(),
@@ -499,10 +514,13 @@ impl IndexScheduler {
             BatchKind::IndexDeletion { ids } => Ok(Some(Batch::IndexDeletion {
                 index_uid,
                 index_has_been_created: must_create_index,
-                tasks: self.get_existing_tasks(rtxn, ids)?,
+                tasks: self.get_existing_tasks_with_batch_id(rtxn, batch_id, ids)?,
             })),
             BatchKind::IndexSwap { id } => {
-                let task = self.get_task(rtxn, id)?.ok_or(Error::CorruptedTaskQueue)?;
+                let task = self
+                    .get_task(rtxn, id)?
+                    .ok_or(Error::CorruptedTaskQueue)?
+                    .with_batch_id(batch_id);
                 Ok(Some(Batch::IndexSwap { task }))
             }
         }
@@ -515,10 +533,11 @@ impl IndexScheduler {
     /// 4. We get the *next* dump to process.
     /// 5. We get the *next* tasks to process for a specific index.
     #[tracing::instrument(level = "trace", skip(self, rtxn), target = "indexing::scheduler")]
-    pub(crate) fn create_next_batch(&self, rtxn: &RoTxn) -> Result<Option<Batch>> {
+    pub(crate) fn create_next_batch(&self, rtxn: &RoTxn) -> Result<Option<(Batch, BatchId)>> {
         #[cfg(test)]
         self.maybe_fail(crate::tests::FailureLocation::InsideCreateBatch)?;
 
+        let batch_id = self.next_batch_id(rtxn)?;
         let enqueued = &self.get_status(rtxn, Status::Enqueued)?;
         let to_cancel = self.get_kind(rtxn, Kind::TaskCancelation)? & enqueued;
 
@@ -526,39 +545,65 @@ impl IndexScheduler {
         if let Some(task_id) = to_cancel.max() {
             // We retrieve the tasks that were processing before this tasks cancelation started.
             // We must *not* reset the processing tasks before calling this method.
-            let ProcessingTasks { started_at, processing } =
+            // Displaying the `batch_id` would make a strange error message since this task cancelation is going to
+            // replace the canceled batch. It's better to avoid mentioning it in the error message.
+            let ProcessingTasks { started_at, batch_id: _, processing } =
                 &*self.processing_tasks.read().unwrap();
-            return Ok(Some(Batch::TaskCancelation {
-                task: self.get_task(rtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?,
-                previous_started_at: *started_at,
-                previous_processing_tasks: processing.clone(),
-            }));
+            return Ok(Some((
+                Batch::TaskCancelation {
+                    task: self
+                        .get_task(rtxn, task_id)?
+                        .ok_or(Error::CorruptedTaskQueue)?
+                        .with_batch_id(batch_id),
+                    previous_started_at: *started_at,
+                    previous_processing_tasks: processing.clone(),
+                },
+                batch_id,
+            )));
         }
 
         // 2. we get the next task to delete
         let to_delete = self.get_kind(rtxn, Kind::TaskDeletion)? & enqueued;
         if !to_delete.is_empty() {
-            let tasks = self.get_existing_tasks(rtxn, to_delete)?;
-            return Ok(Some(Batch::TaskDeletions(tasks)));
+            let tasks = self
+                .get_existing_tasks(rtxn, to_delete)?
+                .into_iter()
+                .map(|task| task.with_batch_id(batch_id))
+                .collect();
+            return Ok(Some((Batch::TaskDeletions(tasks), batch_id)));
         }
 
         // 3. we batch the snapshot.
         let to_snapshot = self.get_kind(rtxn, Kind::SnapshotCreation)? & enqueued;
         if !to_snapshot.is_empty() {
-            return Ok(Some(Batch::SnapshotCreation(self.get_existing_tasks(rtxn, to_snapshot)?)));
+            return Ok(Some((
+                Batch::SnapshotCreation(
+                    self.get_existing_tasks(rtxn, to_snapshot)?
+                        .into_iter()
+                        .map(|task| task.with_batch_id(batch_id))
+                        .collect(),
+                ),
+                batch_id,
+            )));
         }
 
         // 4. we batch the dumps.
         let to_dump = self.get_kind(rtxn, Kind::DumpCreation)? & enqueued;
         if let Some(to_dump) = to_dump.min() {
-            return Ok(Some(Batch::Dump(
-                self.get_task(rtxn, to_dump)?.ok_or(Error::CorruptedTaskQueue)?,
+            return Ok(Some((
+                Batch::Dump(
+                    self.get_task(rtxn, to_dump)?
+                        .ok_or(Error::CorruptedTaskQueue)?
+                        .with_batch_id(batch_id),
+                ),
+                batch_id,
             )));
         }
 
         // 5. We make a batch from the unprioritised tasks. Start by taking the next enqueued task.
         let task_id = if let Some(task_id) = enqueued.min() { task_id } else { return Ok(None) };
-        let task = self.get_task(rtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?;
+        let task =
+            self.get_task(rtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?.with_batch_id(batch_id);
 
         // If the task is not associated with any index, verify that it is an index swap and
         // create the batch directly. Otherwise, get the index name associated with the task
@@ -568,7 +613,7 @@ impl IndexScheduler {
             index_name
         } else {
             assert!(matches!(&task.kind, KindWithContent::IndexSwap { swaps } if swaps.is_empty()));
-            return Ok(Some(Batch::IndexSwap { task }));
+            return Ok(Some((Batch::IndexSwap { task }, batch_id)));
         };
 
         let index_already_exists = self.index_mapper.exists(rtxn, index_name)?;
@@ -599,12 +644,15 @@ impl IndexScheduler {
         if let Some((batchkind, create_index)) =
             autobatcher::autobatch(enqueued, index_already_exists, primary_key.as_deref())
         {
-            return self.create_next_batch_index(
-                rtxn,
-                index_name.to_string(),
-                batchkind,
-                create_index,
-            );
+            return Ok(self
+                .create_next_batch_index(
+                    rtxn,
+                    index_name.to_string(),
+                    batchkind,
+                    batch_id,
+                    create_index,
+                )?
+                .map(|batch| (batch, batch_id)));
         }
 
         // If we found no tasks then we were notified for something that got autobatched
diff --git a/crates/index-scheduler/src/insta_snapshot.rs b/crates/index-scheduler/src/insta_snapshot.rs
index f295e35b6..94b9ca859 100644
--- a/crates/index-scheduler/src/insta_snapshot.rs
+++ b/crates/index-scheduler/src/insta_snapshot.rs
@@ -24,6 +24,7 @@ pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
         file_store,
         env,
         all_tasks,
+        all_batches,
         status,
         kind,
         index_tasks,
@@ -145,6 +146,7 @@ pub fn snapshot_task(task: &Task) -> String {
     let mut snap = String::new();
     let Task {
         uid,
+        batch_uid,
         enqueued_at: _,
         started_at: _,
         finished_at: _,
@@ -156,6 +158,9 @@ pub fn snapshot_task(task: &Task) -> String {
     } = task;
     snap.push('{');
     snap.push_str(&format!("uid: {uid}, "));
+    if let Some(batch_uid) = batch_uid {
+        snap.push_str(&format!("batch_uid: {batch_uid}, "));
+    }
     snap.push_str(&format!("status: {status}, "));
     if let Some(canceled_by) = canceled_by {
         snap.push_str(&format!("canceled_by: {canceled_by}, "));
diff --git a/crates/index-scheduler/src/lib.rs b/crates/index-scheduler/src/lib.rs
index e0e2bfb75..38031c62a 100644
--- a/crates/index-scheduler/src/lib.rs
+++ b/crates/index-scheduler/src/lib.rs
@@ -48,6 +48,7 @@ pub use features::RoFeatures;
 use file_store::FileStore;
 use flate2::bufread::GzEncoder;
 use flate2::Compression;
+use meilisearch_types::batches::{Batch, BatchId};
 use meilisearch_types::error::ResponseError;
 use meilisearch_types::features::{InstanceTogglableFeatures, RuntimeTogglableFeatures};
 use meilisearch_types::heed::byteorder::BE;
@@ -159,6 +160,8 @@ impl Query {
 struct ProcessingTasks {
     /// The date and time at which the indexation started.
     started_at: OffsetDateTime,
+    /// The id of the batch processing
+    batch_id: Option<BatchId>,
     /// The list of tasks ids that are currently running.
     processing: RoaringBitmap,
 }
@@ -166,17 +169,28 @@ struct ProcessingTasks {
 impl ProcessingTasks {
     /// Creates an empty `ProcessingAt` struct.
     fn new() -> ProcessingTasks {
-        ProcessingTasks { started_at: OffsetDateTime::now_utc(), processing: RoaringBitmap::new() }
+        ProcessingTasks {
+            started_at: OffsetDateTime::now_utc(),
+            batch_id: None,
+            processing: RoaringBitmap::new(),
+        }
     }
 
     /// Stores the currently processing tasks, and the date time at which it started.
-    fn start_processing_at(&mut self, started_at: OffsetDateTime, processing: RoaringBitmap) {
+    fn start_processing(
+        &mut self,
+        started_at: OffsetDateTime,
+        batch_id: BatchId,
+        processing: RoaringBitmap,
+    ) {
         self.started_at = started_at;
+        self.batch_id = Some(batch_id);
         self.processing = processing;
     }
 
     /// Set the processing tasks to an empty list
     fn stop_processing(&mut self) -> RoaringBitmap {
+        self.batch_id = None;
         std::mem::take(&mut self.processing)
     }
 
@@ -206,6 +220,7 @@ impl MustStopProcessing {
 /// Database const names for the `IndexScheduler`.
 mod db_name {
     pub const ALL_TASKS: &str = "all-tasks";
+    pub const ALL_BATCHES: &str = "all-batches";
     pub const STATUS: &str = "status";
     pub const KIND: &str = "kind";
     pub const INDEX_TASKS: &str = "index-tasks";
@@ -297,6 +312,9 @@ pub struct IndexScheduler {
     // The main database, it contains all the tasks accessible by their Id.
     pub(crate) all_tasks: Database<BEU32, SerdeJson<Task>>,
 
+    // Contains all the batches accessible by their Id.
+    pub(crate) all_batches: Database<BEU32, SerdeJson<Batch>>,
+
     /// All the tasks ids grouped by their status.
     // TODO we should not be able to serialize a `Status::Processing` in this database.
     pub(crate) status: Database<SerdeBincode<Status>, RoaringBitmapCodec>,
@@ -385,6 +403,7 @@ impl IndexScheduler {
             processing_tasks: self.processing_tasks.clone(),
             file_store: self.file_store.clone(),
             all_tasks: self.all_tasks,
+            all_batches: self.all_batches,
             status: self.status,
             kind: self.kind,
             index_tasks: self.index_tasks,
@@ -451,7 +470,7 @@ impl IndexScheduler {
 
         let env = unsafe {
             heed::EnvOpenOptions::new()
-                .max_dbs(11)
+                .max_dbs(12)
                 .map_size(budget.task_db_size)
                 .open(options.tasks_path)
         }?;
@@ -462,6 +481,7 @@ impl IndexScheduler {
 
         let mut wtxn = env.write_txn()?;
         let all_tasks = env.create_database(&mut wtxn, Some(db_name::ALL_TASKS))?;
+        let all_batches = env.create_database(&mut wtxn, Some(db_name::ALL_BATCHES))?;
         let status = env.create_database(&mut wtxn, Some(db_name::STATUS))?;
         let kind = env.create_database(&mut wtxn, Some(db_name::KIND))?;
         let index_tasks = env.create_database(&mut wtxn, Some(db_name::INDEX_TASKS))?;
@@ -477,6 +497,7 @@ impl IndexScheduler {
             processing_tasks: Arc::new(RwLock::new(ProcessingTasks::new())),
             file_store,
             all_tasks,
+            all_batches,
             status,
             kind,
             index_tasks,
@@ -956,7 +977,7 @@ impl IndexScheduler {
             tasks.into_iter().rev().take(query.limit.unwrap_or(u32::MAX) as usize),
         )?;
 
-        let ProcessingTasks { started_at, processing, .. } =
+        let ProcessingTasks { started_at, batch_id, processing } =
             self.processing_tasks.read().map_err(|_| Error::CorruptedTaskQueue)?.clone();
 
         let ret = tasks.into_iter();
@@ -966,7 +987,12 @@ impl IndexScheduler {
             Ok((
                 ret.map(|task| {
                     if processing.contains(task.uid) {
-                        Task { status: Status::Processing, started_at: Some(started_at), ..task }
+                        Task {
+                            status: Status::Processing,
+                            batch_uid: batch_id,
+                            started_at: Some(started_at),
+                            ..task
+                        }
                     } else {
                         task
                     }
@@ -1005,6 +1031,8 @@ impl IndexScheduler {
 
         let mut task = Task {
             uid: task_id.unwrap_or(next_task_id),
+            // The batch is defined once we starts processing the task
+            batch_uid: None,
             enqueued_at: OffsetDateTime::now_utc(),
             started_at: None,
             finished_at: None,
@@ -1140,7 +1168,7 @@ impl IndexScheduler {
         }
 
         let rtxn = self.env.read_txn().map_err(Error::HeedTransaction)?;
-        let batch =
+        let (batch, batch_id) =
             match self.create_next_batch(&rtxn).map_err(|e| Error::CreateBatch(Box::new(e)))? {
                 Some(batch) => batch,
                 None => return Ok(TickOutcome::WaitForSignal),
@@ -1155,7 +1183,7 @@ impl IndexScheduler {
 
         // We reset the must_stop flag to be sure that we don't stop processing tasks
         self.must_stop_processing.reset();
-        self.processing_tasks.write().unwrap().start_processing_at(started_at, ids.clone());
+        self.processing_tasks.write().unwrap().start_processing(started_at, batch_id, ids.clone());
 
         #[cfg(test)]
         self.breakpoint(Breakpoint::BatchCreated);
@@ -1253,7 +1281,8 @@ impl IndexScheduler {
                     let mut task = self
                         .get_task(&wtxn, id)
                         .map_err(|e| Error::TaskDatabaseUpdate(Box::new(e)))?
-                        .ok_or(Error::CorruptedTaskQueue)?;
+                        .ok_or(Error::CorruptedTaskQueue)?
+                        .with_batch_id(batch_id);
                     task.started_at = Some(started_at);
                     task.finished_at = Some(finished_at);
                     task.status = Status::Failed;
@@ -1271,6 +1300,12 @@ impl IndexScheduler {
             }
         }
 
+        self.all_batches.put(
+            &mut wtxn,
+            &batch_id,
+            &Batch { uid: batch_id, started_at, finished_at: Some(finished_at) },
+        )?;
+
         let processed = self.processing_tasks.write().unwrap().stop_processing();
 
         #[cfg(test)]
@@ -1585,6 +1620,7 @@ impl<'a> Dump<'a> {
 
         let task = Task {
             uid: task.uid,
+            batch_uid: task.batch_uid,
             enqueued_at: task.enqueued_at,
             started_at: task.started_at,
             finished_at: task.finished_at,
diff --git a/crates/index-scheduler/src/utils.rs b/crates/index-scheduler/src/utils.rs
index 788a70fb8..534d3b5d4 100644
--- a/crates/index-scheduler/src/utils.rs
+++ b/crates/index-scheduler/src/utils.rs
@@ -3,6 +3,7 @@
 use std::collections::{BTreeSet, HashSet};
 use std::ops::Bound;
 
+use meilisearch_types::batches::BatchId;
 use meilisearch_types::heed::types::DecodeIgnore;
 use meilisearch_types::heed::{Database, RoTxn, RwTxn};
 use meilisearch_types::milli::CboRoaringBitmapCodec;
@@ -25,10 +26,37 @@ impl IndexScheduler {
         Ok(self.last_task_id(rtxn)?.unwrap_or_default())
     }
 
+    pub(crate) fn next_batch_id(&self, rtxn: &RoTxn) -> Result<BatchId> {
+        Ok(self
+            .all_batches
+            .remap_data_type::<DecodeIgnore>()
+            .last(rtxn)?
+            .map(|(k, _)| k + 1)
+            .unwrap_or_default())
+    }
+
     pub(crate) fn get_task(&self, rtxn: &RoTxn, task_id: TaskId) -> Result<Option<Task>> {
         Ok(self.all_tasks.get(rtxn, &task_id)?)
     }
 
+    /// Convert an iterator to a `Vec` of tasks. The tasks MUST exist or a
+    /// `CorruptedTaskQueue` error will be throwed.
+    pub(crate) fn get_existing_tasks_with_batch_id(
+        &self,
+        rtxn: &RoTxn,
+        batch_id: BatchId,
+        tasks: impl IntoIterator<Item = TaskId>,
+    ) -> Result<Vec<Task>> {
+        tasks
+            .into_iter()
+            .map(|task_id| {
+                self.get_task(rtxn, task_id)
+                    .and_then(|task| task.ok_or(Error::CorruptedTaskQueue))
+                    .map(|task| task.with_batch_id(batch_id))
+            })
+            .collect::<Result<_>>()
+    }
+
     /// Convert an iterator to a `Vec` of tasks. The tasks MUST exist or a
     /// `CorruptedTaskQueue` error will be throwed.
     pub(crate) fn get_existing_tasks(
@@ -342,6 +370,8 @@ impl IndexScheduler {
 
             let Task {
                 uid,
+                /// We should iterate over the list of batch to ensure this task is effectively in the right batch
+                batch_uid,
                 enqueued_at,
                 started_at,
                 finished_at,
diff --git a/crates/meilisearch-types/src/batches.rs b/crates/meilisearch-types/src/batches.rs
new file mode 100644
index 000000000..8a439c59f
--- /dev/null
+++ b/crates/meilisearch-types/src/batches.rs
@@ -0,0 +1,18 @@
+use serde::{Deserialize, Serialize};
+use time::OffsetDateTime;
+
+pub type BatchId = u32;
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Batch {
+    pub uid: BatchId,
+
+    #[serde(with = "time::serde::rfc3339")]
+    pub started_at: OffsetDateTime,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub finished_at: Option<OffsetDateTime>,
+    // pub details: Option<Details>,
+
+    // pub status: Status,
+}
diff --git a/crates/meilisearch-types/src/lib.rs b/crates/meilisearch-types/src/lib.rs
index d6049e667..e10b2950b 100644
--- a/crates/meilisearch-types/src/lib.rs
+++ b/crates/meilisearch-types/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod batches;
 pub mod compression;
 pub mod deserr;
 pub mod document_formats;
diff --git a/crates/meilisearch-types/src/task_view.rs b/crates/meilisearch-types/src/task_view.rs
index 3075fa899..0cc127c0d 100644
--- a/crates/meilisearch-types/src/task_view.rs
+++ b/crates/meilisearch-types/src/task_view.rs
@@ -2,6 +2,7 @@ use milli::Object;
 use serde::Serialize;
 use time::{Duration, OffsetDateTime};
 
+use crate::batches::BatchId;
 use crate::error::ResponseError;
 use crate::settings::{Settings, Unchecked};
 use crate::tasks::{serialize_duration, Details, IndexSwap, Kind, Status, Task, TaskId};
@@ -10,6 +11,7 @@ use crate::tasks::{serialize_duration, Details, IndexSwap, Kind, Status, Task, T
 #[serde(rename_all = "camelCase")]
 pub struct TaskView {
     pub uid: TaskId,
+    pub batch_uid: Option<BatchId>,
     #[serde(default)]
     pub index_uid: Option<String>,
     pub status: Status,
@@ -33,6 +35,7 @@ impl TaskView {
     pub fn from_task(task: &Task) -> TaskView {
         TaskView {
             uid: task.uid,
+            batch_uid: task.batch_uid,
             index_uid: task.index_uid().map(ToOwned::to_owned),
             status: task.status,
             kind: task.kind.as_kind(),
diff --git a/crates/meilisearch-types/src/tasks.rs b/crates/meilisearch-types/src/tasks.rs
index 1dd6d3fbf..3485962d1 100644
--- a/crates/meilisearch-types/src/tasks.rs
+++ b/crates/meilisearch-types/src/tasks.rs
@@ -11,6 +11,7 @@ use serde::{Deserialize, Serialize, Serializer};
 use time::{Duration, OffsetDateTime};
 use uuid::Uuid;
 
+use crate::batches::BatchId;
 use crate::error::ResponseError;
 use crate::keys::Key;
 use crate::settings::{Settings, Unchecked};
@@ -22,6 +23,7 @@ pub type TaskId = u32;
 #[serde(rename_all = "camelCase")]
 pub struct Task {
     pub uid: TaskId,
+    pub batch_uid: Option<BatchId>,
 
     #[serde(with = "time::serde::rfc3339")]
     pub enqueued_at: OffsetDateTime,
@@ -60,6 +62,11 @@ impl Task {
         }
     }
 
+    pub fn with_batch_id(mut self, batch_id: TaskId) -> Self {
+        self.batch_uid = Some(batch_id);
+        self
+    }
+
     /// Return the list of indexes updated by this tasks.
     pub fn indexes(&self) -> Vec<&str> {
         self.kind.indexes()
diff --git a/crates/meilisearch/tests/common/mod.rs b/crates/meilisearch/tests/common/mod.rs
index a0137931d..3aae2fe80 100644
--- a/crates/meilisearch/tests/common/mod.rs
+++ b/crates/meilisearch/tests/common/mod.rs
@@ -99,6 +99,7 @@ impl Display for Value {
             "{}",
             json_string!(self, {
                 ".uid" => "[uid]",
+                ".batchUid" => "[batch_uid]",
                 ".enqueuedAt" => "[date]",
                 ".startedAt" => "[date]",
                 ".finishedAt" => "[date]",
diff --git a/crates/meilisearch/tests/documents/add_documents.rs b/crates/meilisearch/tests/documents/add_documents.rs
index c37b3a5e3..cec6f0791 100644
--- a/crates/meilisearch/tests/documents/add_documents.rs
+++ b/crates/meilisearch/tests/documents/add_documents.rs
@@ -293,6 +293,7 @@ async fn add_csv_document() {
     snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "pets",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -357,6 +358,7 @@ async fn add_csv_document_with_types() {
     snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "pets",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -432,6 +434,7 @@ async fn add_csv_document_with_custom_delimiter() {
     snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "pets",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -985,6 +988,7 @@ async fn add_documents_no_index_creation() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1063,6 +1067,7 @@ async fn document_addition_with_primary_key() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1111,6 +1116,7 @@ async fn document_addition_with_huge_int_primary_key() {
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1183,6 +1189,7 @@ async fn replace_document() {
         @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1271,6 +1278,7 @@ async fn error_add_documents_bad_document_id() {
         @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1312,6 +1320,7 @@ async fn error_add_documents_missing_document_id() {
         @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1403,6 +1412,7 @@ async fn error_document_field_limit_reached_over_multiple_documents() {
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1437,6 +1447,7 @@ async fn error_document_field_limit_reached_over_multiple_documents() {
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1486,6 +1497,7 @@ async fn error_document_field_limit_reached_in_one_nested_document() {
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1529,6 +1541,7 @@ async fn error_document_field_limit_reached_over_multiple_documents_with_nested_
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1564,6 +1577,7 @@ async fn error_document_field_limit_reached_over_multiple_documents_with_nested_
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1611,6 +1625,7 @@ async fn add_documents_with_geo_field() {
         @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1651,6 +1666,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 2,
+      "batchUid": 2,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1688,6 +1704,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 3,
+      "batchUid": 3,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1725,6 +1742,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 4,
+      "batchUid": 4,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1762,6 +1780,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 5,
+      "batchUid": 5,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1799,6 +1818,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 6,
+      "batchUid": 6,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1836,6 +1856,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 7,
+      "batchUid": 7,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1873,6 +1894,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 8,
+      "batchUid": 8,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1910,6 +1932,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 9,
+      "batchUid": 9,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1947,6 +1970,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 10,
+      "batchUid": 10,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1984,6 +2008,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 11,
+      "batchUid": 11,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -2021,6 +2046,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 12,
+      "batchUid": 12,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -2058,6 +2084,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 13,
+      "batchUid": 13,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -2096,6 +2123,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 14,
+      "batchUid": 14,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -2132,6 +2160,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 15,
+      "batchUid": 15,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -2168,6 +2197,7 @@ async fn add_documents_invalid_geo_field() {
         @r###"
     {
       "uid": 16,
+      "batchUid": 16,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -2210,6 +2240,7 @@ async fn add_invalid_geo_and_then_settings() {
     snapshot!(ret, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -2232,6 +2263,7 @@ async fn add_invalid_geo_and_then_settings() {
     snapshot!(ret, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "failed",
       "type": "settingsUpdate",
@@ -2303,6 +2335,7 @@ async fn error_primary_key_inference() {
     @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -2343,6 +2376,7 @@ async fn error_primary_key_inference() {
     @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": "test",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -2381,6 +2415,7 @@ async fn error_primary_key_inference() {
     @r###"
     {
       "uid": 2,
+      "batchUid": 2,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/documents/delete_documents.rs b/crates/meilisearch/tests/documents/delete_documents.rs
index 5a15e95ff..c50823183 100644
--- a/crates/meilisearch/tests/documents/delete_documents.rs
+++ b/crates/meilisearch/tests/documents/delete_documents.rs
@@ -184,6 +184,7 @@ async fn delete_document_by_filter() {
     snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
     {
       "uid": 2,
+      "batchUid": 2,
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentDeletion",
@@ -249,6 +250,7 @@ async fn delete_document_by_filter() {
     snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
     {
       "uid": 3,
+      "batchUid": 3,
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentDeletion",
@@ -333,6 +335,7 @@ async fn delete_document_by_complex_filter() {
     snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
     {
       "uid": 2,
+      "batchUid": 2,
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentDeletion",
@@ -391,6 +394,7 @@ async fn delete_document_by_complex_filter() {
     snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
     {
       "uid": 3,
+      "batchUid": 3,
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentDeletion",
diff --git a/crates/meilisearch/tests/documents/errors.rs b/crates/meilisearch/tests/documents/errors.rs
index 4c644ae98..c90b9ed49 100644
--- a/crates/meilisearch/tests/documents/errors.rs
+++ b/crates/meilisearch/tests/documents/errors.rs
@@ -563,6 +563,7 @@ async fn delete_document_by_filter() {
     snapshot!(response, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "DOES_NOT_EXISTS",
       "status": "failed",
       "type": "documentDeletion",
@@ -592,6 +593,7 @@ async fn delete_document_by_filter() {
     snapshot!(response, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "EMPTY_INDEX",
       "status": "failed",
       "type": "documentDeletion",
@@ -623,6 +625,7 @@ async fn delete_document_by_filter() {
     snapshot!(response, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "SHARED_DOCUMENTS",
       "status": "failed",
       "type": "documentDeletion",
diff --git a/crates/meilisearch/tests/dumps/mod.rs b/crates/meilisearch/tests/dumps/mod.rs
index 1c1a8e649..c7d157b00 100644
--- a/crates/meilisearch/tests/dumps/mod.rs
+++ b/crates/meilisearch/tests/dumps/mod.rs
@@ -88,7 +88,7 @@ async fn import_dump_v1_movie_raw() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks,
-        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31968 }, "error": null, "duration": "PT9.317060500S", "enqueuedAt": "2021-09-08T09:08:45.153219Z", "startedAt": "2021-09-08T09:08:45.3961665Z", "finishedAt": "2021-09-08T09:08:54.713227Z" }], "total": 1,  "limit": 20, "from": 0, "next": null })
+        json!({ "results": [{"uid": 0, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31968 }, "error": null, "duration": "PT9.317060500S", "enqueuedAt": "2021-09-08T09:08:45.153219Z", "startedAt": "2021-09-08T09:08:45.3961665Z", "finishedAt": "2021-09-08T09:08:54.713227Z" }], "total": 1,  "limit": 20, "from": 0, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -251,7 +251,7 @@ async fn import_dump_v1_movie_with_settings() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks,
-        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["genres", "id", "overview", "poster", "release_date", "title"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "sortableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT7.288826907S", "enqueuedAt": "2021-09-08T09:34:40.882977Z", "startedAt": "2021-09-08T09:34:40.883073093Z", "finishedAt": "2021-09-08T09:34:48.1719Z"}, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31968 }, "error": null, "duration": "PT9.090735774S", "enqueuedAt": "2021-09-08T09:34:16.036101Z", "startedAt": "2021-09-08T09:34:16.261191226Z", "finishedAt": "2021-09-08T09:34:25.351927Z" }], "total": 2, "limit": 20, "from": 1, "next": null })
+        json!({ "results": [{ "uid": 1, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["genres", "id", "overview", "poster", "release_date", "title"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "sortableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT7.288826907S", "enqueuedAt": "2021-09-08T09:34:40.882977Z", "startedAt": "2021-09-08T09:34:40.883073093Z", "finishedAt": "2021-09-08T09:34:48.1719Z"}, { "uid": 0, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31968 }, "error": null, "duration": "PT9.090735774S", "enqueuedAt": "2021-09-08T09:34:16.036101Z", "startedAt": "2021-09-08T09:34:16.261191226Z", "finishedAt": "2021-09-08T09:34:25.351927Z" }], "total": 2, "limit": 20, "from": 1, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -400,7 +400,7 @@ async fn import_dump_v1_rubygems_with_settings() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks["results"][0],
-        json!({"uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT1.487793839S", "enqueuedAt": "2021-09-08T09:27:01.465296Z", "startedAt": "2021-09-08T09:28:44.882177161Z", "finishedAt": "2021-09-08T09:28:46.369971Z"})
+        json!({"uid": 92, "batchUid": null, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT1.487793839S", "enqueuedAt": "2021-09-08T09:27:01.465296Z", "startedAt": "2021-09-08T09:28:44.882177161Z", "finishedAt": "2021-09-08T09:28:46.369971Z"})
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -535,7 +535,7 @@ async fn import_dump_v2_movie_raw() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks,
-        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "total": 1, "limit": 20, "from": 0, "next": null })
+        json!({ "results": [{"uid": 0, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "total": 1, "limit": 20, "from": 0, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -682,7 +682,7 @@ async fn import_dump_v2_movie_with_settings() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks,
-        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "total": 2, "limit": 20, "from": 1, "next": null })
+        json!({ "results": [{ "uid": 1, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "total": 2, "limit": 20, "from": 1, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -828,7 +828,7 @@ async fn import_dump_v2_rubygems_with_settings() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks["results"][0],
-        json!({"uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
+        json!({"uid": 92, "batchUid": null, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -963,7 +963,7 @@ async fn import_dump_v3_movie_raw() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks,
-        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "total": 1, "limit": 20, "from": 0, "next": null })
+        json!({ "results": [{"uid": 0, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "total": 1, "limit": 20, "from": 0, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -1110,7 +1110,7 @@ async fn import_dump_v3_movie_with_settings() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks,
-        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "total": 2, "limit": 20, "from": 1, "next": null })
+        json!({ "results": [{ "uid": 1, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "total": 2, "limit": 20, "from": 1, "next": null })
     );
 
     // finally we're just going to check that we can["results"] still get a few documents by id
@@ -1256,7 +1256,7 @@ async fn import_dump_v3_rubygems_with_settings() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks["results"][0],
-        json!({"uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
+        json!({"uid": 92, "batchUid": null, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -1391,7 +1391,7 @@ async fn import_dump_v4_movie_raw() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks,
-        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "total": 1, "limit" : 20, "from": 0, "next": null })
+        json!({ "results": [{"uid": 0, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "total": 1, "limit" : 20, "from": 0, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -1538,7 +1538,7 @@ async fn import_dump_v4_movie_with_settings() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks,
-        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "total": 2, "limit": 20, "from": 1, "next": null })
+        json!({ "results": [{ "uid": 1, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "batchUid": null, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "total": 2, "limit": 20, "from": 1, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -1684,7 +1684,7 @@ async fn import_dump_v4_rubygems_with_settings() {
     snapshot!(code, @"200 OK");
     assert_eq!(
         tasks["results"][0],
-        json!({ "uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
+        json!({ "uid": 92, "batchUid": null, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
     );
 
     // finally we're just going to check that we can still get a few documents by id
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/1.snap
index 2004eb036..a9e7be539 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/1.snap
@@ -1,8 +1,9 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "uid": "[uid]",
+  "batchUid": "[batch_uid]",
   "indexUid": "pets",
   "status": "succeeded",
   "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/2.snap
index 8405a0461..ed457d9a6 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/2.snap
@@ -1,8 +1,9 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "uid": "[uid]",
+  "batchUid": "[batch_uid]",
   "indexUid": "pets",
   "status": "succeeded",
   "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/1.snap
index 7227fd4cc..b79ce068c 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/2.snap
index 7227fd4cc..b79ce068c 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/3.snap
index 7227fd4cc..b79ce068c 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/4.snap
index 7227fd4cc..b79ce068c 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/5.snap
index 7227fd4cc..b79ce068c 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/6.snap
index 7227fd4cc..b79ce068c 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/7.snap
index 7227fd4cc..b79ce068c 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/1.snap
index d22c13b72..bbda115f4 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/2.snap
index d22c13b72..bbda115f4 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/3.snap
index b49f68a59..612a922d2 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/4.snap
index b49f68a59..612a922d2 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/5.snap
index b49f68a59..612a922d2 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/6.snap
index b49f68a59..612a922d2 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/7.snap
index b49f68a59..612a922d2 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/1.snap
index beb25ce95..e1887a1f8 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/2.snap
index add41439f..b085d78a4 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/3.snap
index c9e368061..b793e4eb9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/4.snap
index c9e368061..b793e4eb9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/5.snap
index c9e368061..b793e4eb9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/6.snap
index c9e368061..b793e4eb9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/7.snap
index c9e368061..b793e4eb9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/1.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/2.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/3.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/4.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/5.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/6.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/7.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/1.snap
index 6acf1f564..ec5c69801 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/2.snap
index 6acf1f564..ec5c69801 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/3.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/4.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/5.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/6.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/7.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/1.snap
index 92613ce34..6ecf9200e 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/2.snap
index bfef698e1..3ed8929c1 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/3.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/4.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/5.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/6.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/7.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/1.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/2.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/3.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/4.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/5.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/6.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/7.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/1.snap
index 6acf1f564..ec5c69801 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/2.snap
index 6acf1f564..ec5c69801 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/3.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/4.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/5.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/6.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/7.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/1.snap
index 92613ce34..6ecf9200e 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/2.snap
index bfef698e1..3ed8929c1 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/3.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/4.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/5.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/6.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/7.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/1.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/2.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/3.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/4.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/5.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/6.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/7.snap
index 33f1b46c5..93a2938a9 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/1.snap
index 6acf1f564..ec5c69801 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/2.snap
index 6acf1f564..ec5c69801 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/3.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/4.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/5.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/6.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/7.snap
index 22fad9f58..0b8da54bf 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "indexUID",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/1.snap
index 92613ce34..6ecf9200e 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/2.snap
index bfef698e1..3ed8929c1 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/3.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/4.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/5.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/6.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/7.snap
index 3fa18f512..4005cdfed 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 92,
+      "batchUid": null,
       "indexUid": "rubygems",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/1.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/1.snap
index b8c0d07b1..2de02953d 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/1.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/1.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 0,
+      "batchUid": null,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/2.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/2.snap
index b31fb744f..dac7f08f7 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/2.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/2.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 1,
+      "batchUid": null,
       "indexUid": "test2",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/3.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/3.snap
index 082cc97ee..319b6b229 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/3.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/3.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 4,
+      "batchUid": 0,
       "indexUid": null,
       "status": "succeeded",
       "type": "dumpCreation",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/4.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/4.snap
index 54e8f84bf..19c8fc8aa 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/4.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/4.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 2,
+      "batchUid": null,
       "indexUid": "test",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/5.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/5.snap
index 082cc97ee..319b6b229 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/5.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/5.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 4,
+      "batchUid": 0,
       "indexUid": null,
       "status": "succeeded",
       "type": "dumpCreation",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/6.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/6.snap
index 082cc97ee..319b6b229 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/6.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/6.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 4,
+      "batchUid": 0,
       "indexUid": null,
       "status": "succeeded",
       "type": "dumpCreation",
diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/7.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/7.snap
index 082cc97ee..319b6b229 100644
--- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/7.snap
+++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/7.snap
@@ -1,10 +1,11 @@
 ---
-source: meilisearch/tests/dumps/mod.rs
+source: crates/meilisearch/tests/dumps/mod.rs
 ---
 {
   "results": [
     {
       "uid": 4,
+      "batchUid": 0,
       "indexUid": null,
       "status": "succeeded",
       "type": "dumpCreation",
diff --git a/crates/meilisearch/tests/search/snapshots/distinct.rs/distinct_at_search_time/succeed.snap b/crates/meilisearch/tests/search/snapshots/distinct.rs/distinct_at_search_time/succeed.snap
index 64e48b6a5..ea55d9c61 100644
--- a/crates/meilisearch/tests/search/snapshots/distinct.rs/distinct_at_search_time/succeed.snap
+++ b/crates/meilisearch/tests/search/snapshots/distinct.rs/distinct_at_search_time/succeed.snap
@@ -1,8 +1,9 @@
 ---
-source: meilisearch/tests/search/distinct.rs
+source: crates/meilisearch/tests/search/distinct.rs
 ---
 {
   "uid": "[uid]",
+  "batchUid": "[batch_uid]",
   "indexUid": "tamo",
   "status": "succeeded",
   "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/snapshot/mod.rs b/crates/meilisearch/tests/snapshot/mod.rs
index 0008993fe..b4454a7f2 100644
--- a/crates/meilisearch/tests/snapshot/mod.rs
+++ b/crates/meilisearch/tests/snapshot/mod.rs
@@ -151,6 +151,7 @@ async fn perform_on_demand_snapshot() {
     snapshot!(json_string!(task, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
     {
       "uid": 4,
+      "batchUid": 4,
       "indexUid": null,
       "status": "succeeded",
       "type": "snapshotCreation",
diff --git a/crates/meilisearch/tests/swap_indexes/mod.rs b/crates/meilisearch/tests/swap_indexes/mod.rs
index 7f2b1623c..646f773d8 100644
--- a/crates/meilisearch/tests/swap_indexes/mod.rs
+++ b/crates/meilisearch/tests/swap_indexes/mod.rs
@@ -24,6 +24,7 @@ async fn swap_indexes() {
       "results": [
         {
           "uid": 1,
+          "batchUid": 1,
           "indexUid": "b",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
@@ -40,6 +41,7 @@ async fn swap_indexes() {
         },
         {
           "uid": 0,
+          "batchUid": 0,
           "indexUid": "a",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
@@ -76,6 +78,7 @@ async fn swap_indexes() {
       "results": [
         {
           "uid": 2,
+          "batchUid": 2,
           "indexUid": null,
           "status": "succeeded",
           "type": "indexSwap",
@@ -98,6 +101,7 @@ async fn swap_indexes() {
         },
         {
           "uid": 1,
+          "batchUid": 1,
           "indexUid": "a",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
@@ -114,6 +118,7 @@ async fn swap_indexes() {
         },
         {
           "uid": 0,
+          "batchUid": 0,
           "indexUid": "b",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
@@ -164,6 +169,7 @@ async fn swap_indexes() {
       "results": [
         {
           "uid": 4,
+          "batchUid": 4,
           "indexUid": "d",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
@@ -180,6 +186,7 @@ async fn swap_indexes() {
         },
         {
           "uid": 3,
+          "batchUid": 3,
           "indexUid": "c",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
@@ -226,6 +233,7 @@ async fn swap_indexes() {
       "results": [
         {
           "uid": 5,
+          "batchUid": 5,
           "indexUid": null,
           "status": "succeeded",
           "type": "indexSwap",
@@ -254,6 +262,7 @@ async fn swap_indexes() {
         },
         {
           "uid": 4,
+          "batchUid": 4,
           "indexUid": "c",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
@@ -270,6 +279,7 @@ async fn swap_indexes() {
         },
         {
           "uid": 3,
+          "batchUid": 3,
           "indexUid": "d",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
@@ -286,6 +296,7 @@ async fn swap_indexes() {
         },
         {
           "uid": 2,
+          "batchUid": 2,
           "indexUid": null,
           "status": "succeeded",
           "type": "indexSwap",
@@ -308,6 +319,7 @@ async fn swap_indexes() {
         },
         {
           "uid": 1,
+          "batchUid": 1,
           "indexUid": "b",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
@@ -324,6 +336,7 @@ async fn swap_indexes() {
         },
         {
           "uid": 0,
+          "batchUid": 0,
           "indexUid": "a",
           "status": "succeeded",
           "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/tasks/mod.rs b/crates/meilisearch/tests/tasks/mod.rs
index c59313885..5a4350d91 100644
--- a/crates/meilisearch/tests/tasks/mod.rs
+++ b/crates/meilisearch/tests/tasks/mod.rs
@@ -373,6 +373,7 @@ async fn test_summarized_document_addition_or_update() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -397,6 +398,7 @@ async fn test_summarized_document_addition_or_update() {
         @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -426,6 +428,7 @@ async fn test_summarized_delete_documents_by_batch() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "failed",
       "type": "documentDeletion",
@@ -457,6 +460,7 @@ async fn test_summarized_delete_documents_by_batch() {
         @r###"
     {
       "uid": 2,
+      "batchUid": 2,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentDeletion",
@@ -488,6 +492,7 @@ async fn test_summarized_delete_documents_by_filter() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "failed",
       "type": "documentDeletion",
@@ -519,6 +524,7 @@ async fn test_summarized_delete_documents_by_filter() {
         @r###"
     {
       "uid": 2,
+      "batchUid": 2,
       "indexUid": "test",
       "status": "failed",
       "type": "documentDeletion",
@@ -550,6 +556,7 @@ async fn test_summarized_delete_documents_by_filter() {
         @r###"
     {
       "uid": 4,
+      "batchUid": 4,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentDeletion",
@@ -580,6 +587,7 @@ async fn test_summarized_delete_document_by_id() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "failed",
       "type": "documentDeletion",
@@ -611,6 +619,7 @@ async fn test_summarized_delete_document_by_id() {
         @r###"
     {
       "uid": 2,
+      "batchUid": 2,
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentDeletion",
@@ -653,6 +662,7 @@ async fn test_summarized_settings_update() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "succeeded",
       "type": "settingsUpdate",
@@ -691,6 +701,7 @@ async fn test_summarized_index_creation() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "succeeded",
       "type": "indexCreation",
@@ -714,6 +725,7 @@ async fn test_summarized_index_creation() {
         @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": "test",
       "status": "failed",
       "type": "indexCreation",
@@ -745,6 +757,7 @@ async fn test_summarized_index_deletion() {
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "failed",
       "type": "indexDeletion",
@@ -775,6 +788,7 @@ async fn test_summarized_index_deletion() {
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -797,6 +811,7 @@ async fn test_summarized_index_deletion() {
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "succeeded",
       "type": "indexDeletion",
@@ -819,6 +834,7 @@ async fn test_summarized_index_deletion() {
         @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "test",
       "status": "failed",
       "type": "indexDeletion",
@@ -853,6 +869,7 @@ async fn test_summarized_index_update() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": "test",
       "status": "failed",
       "type": "indexUpdate",
@@ -881,6 +898,7 @@ async fn test_summarized_index_update() {
         @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": "test",
       "status": "failed",
       "type": "indexUpdate",
@@ -912,6 +930,7 @@ async fn test_summarized_index_update() {
         @r###"
     {
       "uid": 3,
+      "batchUid": 3,
       "indexUid": "test",
       "status": "succeeded",
       "type": "indexUpdate",
@@ -935,6 +954,7 @@ async fn test_summarized_index_update() {
         @r###"
     {
       "uid": 4,
+      "batchUid": 4,
       "indexUid": "test",
       "status": "succeeded",
       "type": "indexUpdate",
@@ -966,6 +986,7 @@ async fn test_summarized_index_swap() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": null,
       "status": "failed",
       "type": "indexSwap",
@@ -1007,6 +1028,7 @@ async fn test_summarized_index_swap() {
         @r###"
     {
       "uid": 3,
+      "batchUid": 3,
       "indexUid": null,
       "status": "succeeded",
       "type": "indexSwap",
@@ -1045,6 +1067,7 @@ async fn test_summarized_task_cancelation() {
         @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": null,
       "status": "succeeded",
       "type": "taskCancelation",
@@ -1078,6 +1101,7 @@ async fn test_summarized_task_deletion() {
         @r###"
     {
       "uid": 1,
+      "batchUid": 1,
       "indexUid": null,
       "status": "succeeded",
       "type": "taskDeletion",
@@ -1107,6 +1131,7 @@ async fn test_summarized_dump_creation() {
         @r###"
     {
       "uid": 0,
+      "batchUid": 0,
       "indexUid": null,
       "status": "succeeded",
       "type": "dumpCreation",
diff --git a/crates/meilisearch/tests/tasks/webhook.rs b/crates/meilisearch/tests/tasks/webhook.rs
index b01ef3d5a..b18002eb7 100644
--- a/crates/meilisearch/tests/tasks/webhook.rs
+++ b/crates/meilisearch/tests/tasks/webhook.rs
@@ -8,12 +8,12 @@ use actix_http::body::MessageBody;
 use actix_web::dev::{ServiceFactory, ServiceResponse};
 use actix_web::web::{Bytes, Data};
 use actix_web::{post, App, HttpRequest, HttpResponse, HttpServer};
-use meili_snap::{json_string, snapshot};
+use meili_snap::snapshot;
 use meilisearch::Opt;
 use tokio::sync::mpsc;
 use url::Url;
 
-use crate::common::{default_settings, Server};
+use crate::common::{self, default_settings, Server};
 use crate::json;
 
 #[post("/")]
@@ -97,11 +97,11 @@ async fn test_basic_webhook() {
             }
             nb_tasks += 1;
             let json: serde_json::Value = serde_json::from_str(json).unwrap();
-            snapshot!(
-                json_string!(json, { ".uid" => "[uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
+            snapshot!(common::Value(json),
             @r###"
             {
               "uid": "[uid]",
+              "batchUid": "[batch_uid]",
               "indexUid": "tamo",
               "status": "succeeded",
               "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/vector/binary_quantized.rs b/crates/meilisearch/tests/vector/binary_quantized.rs
index d3fe3c824..560c4e2f2 100644
--- a/crates/meilisearch/tests/vector/binary_quantized.rs
+++ b/crates/meilisearch/tests/vector/binary_quantized.rs
@@ -303,6 +303,7 @@ async fn try_to_disable_binary_quantization() {
     snapshot!(ret, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/vector/mod.rs b/crates/meilisearch/tests/vector/mod.rs
index 47d0c1051..828f72c5e 100644
--- a/crates/meilisearch/tests/vector/mod.rs
+++ b/crates/meilisearch/tests/vector/mod.rs
@@ -240,6 +240,7 @@ async fn user_provided_embeddings_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -269,6 +270,7 @@ async fn user_provided_embeddings_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -299,6 +301,7 @@ async fn user_provided_embeddings_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -328,6 +331,7 @@ async fn user_provided_embeddings_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -357,6 +361,7 @@ async fn user_provided_embeddings_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -386,6 +391,7 @@ async fn user_provided_embeddings_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -427,6 +433,7 @@ async fn user_provided_embeddings_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -455,6 +462,7 @@ async fn user_provided_embeddings_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -483,6 +491,7 @@ async fn user_provided_embeddings_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -523,6 +532,7 @@ async fn user_provided_vectors_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -552,6 +562,7 @@ async fn user_provided_vectors_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -581,6 +592,7 @@ async fn user_provided_vectors_error() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/vector/openai.rs b/crates/meilisearch/tests/vector/openai.rs
index 04c068c40..9fae810f9 100644
--- a/crates/meilisearch/tests/vector/openai.rs
+++ b/crates/meilisearch/tests/vector/openai.rs
@@ -365,6 +365,7 @@ async fn it_works() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -595,6 +596,7 @@ async fn tokenize_long_text() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -651,6 +653,7 @@ async fn bad_api_key() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -683,6 +686,7 @@ async fn bad_api_key() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -727,6 +731,7 @@ async fn bad_api_key() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -796,6 +801,7 @@ async fn bad_model() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -873,6 +879,7 @@ async fn bad_dimensions() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -980,6 +987,7 @@ async fn smaller_dimensions() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1211,6 +1219,7 @@ async fn small_embedding_model() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1441,6 +1450,7 @@ async fn legacy_embedding_model() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1672,6 +1682,7 @@ async fn it_still_works() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/vector/rest.rs b/crates/meilisearch/tests/vector/rest.rs
index 2748d0846..2bf6f2a46 100644
--- a/crates/meilisearch/tests/vector/rest.rs
+++ b/crates/meilisearch/tests/vector/rest.rs
@@ -922,6 +922,7 @@ async fn bad_settings() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -967,6 +968,7 @@ async fn bad_settings() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1016,6 +1018,7 @@ async fn add_vector_and_user_provided() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1112,6 +1115,7 @@ async fn server_returns_bad_request() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -1152,6 +1156,7 @@ async fn server_returns_bad_request() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "settingsUpdate",
@@ -1185,6 +1190,7 @@ async fn server_returns_bad_request() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "documentAdditionOrUpdate",
@@ -1229,6 +1235,7 @@ async fn server_returns_bad_response() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -1282,6 +1289,7 @@ async fn server_returns_bad_response() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -1337,6 +1345,7 @@ async fn server_returns_bad_response() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -1392,6 +1401,7 @@ async fn server_returns_bad_response() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -1457,6 +1467,7 @@ async fn server_returns_bad_response() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -1524,6 +1535,7 @@ async fn server_returns_multiple() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1629,6 +1641,7 @@ async fn server_single_input_returns_in_array() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1734,6 +1747,7 @@ async fn server_raw() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -1831,6 +1845,7 @@ async fn server_custom_header() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -1870,6 +1885,7 @@ async fn server_custom_header() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
@@ -1912,6 +1928,7 @@ async fn server_custom_header() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "settingsUpdate",
@@ -1957,6 +1974,7 @@ async fn searchable_reindex() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "settingsUpdate",
@@ -1993,6 +2011,7 @@ async fn searchable_reindex() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
@@ -2021,6 +2040,7 @@ async fn searchable_reindex() {
     snapshot!(task, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "failed",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/vector/settings.rs b/crates/meilisearch/tests/vector/settings.rs
index ed45913a8..027c55219 100644
--- a/crates/meilisearch/tests/vector/settings.rs
+++ b/crates/meilisearch/tests/vector/settings.rs
@@ -91,6 +91,7 @@ async fn update_embedder() {
     snapshot!(ret, @r###"
     {
       "uid": "[uid]",
+      "batchUid": "[batch_uid]",
       "indexUid": "doggo",
       "status": "succeeded",
       "type": "settingsUpdate",
diff --git a/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/document-added.snap b/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/document-added.snap
index c4f1c0b25..709dfeae0 100644
--- a/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/document-added.snap
+++ b/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/document-added.snap
@@ -1,8 +1,9 @@
 ---
-source: meilisearch/tests/vector/mod.rs
+source: crates/meilisearch/tests/vector/mod.rs
 ---
 {
   "uid": "[uid]",
+  "batchUid": "[batch_uid]",
   "indexUid": "doggo",
   "status": "succeeded",
   "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/document-deleted.snap b/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/document-deleted.snap
index c4f1c0b25..709dfeae0 100644
--- a/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/document-deleted.snap
+++ b/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/document-deleted.snap
@@ -1,8 +1,9 @@
 ---
-source: meilisearch/tests/vector/mod.rs
+source: crates/meilisearch/tests/vector/mod.rs
 ---
 {
   "uid": "[uid]",
+  "batchUid": "[batch_uid]",
   "indexUid": "doggo",
   "status": "succeeded",
   "type": "documentAdditionOrUpdate",
diff --git a/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/settings-processed.snap b/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/settings-processed.snap
index 08dbe3ee0..c8bad0070 100644
--- a/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/settings-processed.snap
+++ b/crates/meilisearch/tests/vector/snapshots/mod.rs/add_remove_one_vector_4588/settings-processed.snap
@@ -1,8 +1,9 @@
 ---
-source: meilisearch/tests/vector/mod.rs
+source: crates/meilisearch/tests/vector/mod.rs
 ---
 {
   "uid": "[uid]",
+  "batchUid": "[batch_uid]",
   "indexUid": "doggo",
   "status": "succeeded",
   "type": "settingsUpdate",