diff --git a/roda-common/roda-common-data/pom.xml b/roda-common/roda-common-data/pom.xml
index 6e0c4bfdd3..e6e823034c 100644
--- a/roda-common/roda-common-data/pom.xml
+++ b/roda-common/roda-common-data/pom.xml
@@ -104,6 +104,7 @@
               <schemaDirectory>src/main/resources/backfill</schemaDirectory>
               <schemaIncludes>
                 <include>add_documents.xsd</include>
+                <include>delete_document_ids.xsd</include>
               </schemaIncludes>
               <cleanPackageDirectories>true</cleanPackageDirectories>
               <generatePackage>org.roda.core.plugins.base.maintenance.backfill.beans</generatePackage>
diff --git a/roda-core/roda-core/src/main/java/org/roda/core/plugins/base/maintenance/backfill/GenerateBackfillPluginUtils.java b/roda-core/roda-core/src/main/java/org/roda/core/plugins/base/maintenance/backfill/GenerateBackfillPluginUtils.java
index f10c8a7f37..75c3de7e7a 100644
--- a/roda-core/roda-core/src/main/java/org/roda/core/plugins/base/maintenance/backfill/GenerateBackfillPluginUtils.java
+++ b/roda-core/roda-core/src/main/java/org/roda/core/plugins/base/maintenance/backfill/GenerateBackfillPluginUtils.java
@@ -21,7 +21,6 @@
 import org.roda.core.data.utils.XMLUtils;
 import org.roda.core.data.v2.IsModelObject;
 import org.roda.core.data.v2.IsRODAObject;
-import org.roda.core.data.v2.disposal.confirmation.DisposalConfirmation;
 import org.roda.core.data.v2.index.IsIndexed;
 import org.roda.core.data.v2.index.filter.Filter;
 import org.roda.core.data.v2.index.filter.OneOfManyFilterParameter;
@@ -31,6 +30,7 @@
 import org.roda.core.data.v2.ip.IndexedDIP;
 import org.roda.core.data.v2.ip.StoragePath;
 import org.roda.core.data.v2.ip.TransferredResource;
+import org.roda.core.data.v2.ip.disposal.DisposalConfirmation;
 import org.roda.core.data.v2.ip.metadata.IndexedPreservationAgent;
 import org.roda.core.data.v2.ip.metadata.IndexedPreservationEvent;
 import org.roda.core.data.v2.jobs.Job;
diff --git a/roda-core/roda-core/src/main/java/org/roda/core/plugins/base/maintenance/backfill/GenerateDisposalConfirmationBackfillPlugin.java b/roda-core/roda-core/src/main/java/org/roda/core/plugins/base/maintenance/backfill/GenerateDisposalConfirmationBackfillPlugin.java
index 413200a02a..f01dea7fb9 100644
--- a/roda-core/roda-core/src/main/java/org/roda/core/plugins/base/maintenance/backfill/GenerateDisposalConfirmationBackfillPlugin.java
+++ b/roda-core/roda-core/src/main/java/org/roda/core/plugins/base/maintenance/backfill/GenerateDisposalConfirmationBackfillPlugin.java
@@ -2,14 +2,15 @@
 
 import java.util.List;
 
-import org.roda.core.data.v2.disposal.confirmation.DisposalConfirmation;
 import org.roda.core.data.v2.index.IsIndexed;
+import org.roda.core.data.v2.ip.disposal.DisposalConfirmation;
 import org.roda.core.plugins.Plugin;
 
 /**
  * @author Alexandre Flores <aflores@keep.pt>
  */
-public class GenerateDisposalConfirmationBackfillPlugin extends GenerateRODAEntityBackfillPlugin<DisposalConfirmation> {
+public class GenerateDisposalConfirmationBackfillPlugin
+  extends GenerateRODAEntityBackfillPlugin<org.roda.core.data.v2.ip.disposal.DisposalConfirmation> {
 
   @Override
   protected <I extends IsIndexed> Class<I> getIndexClass() {