diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/IndexerAwsApplication.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/IndexerAwsApplication.java
index 8d550c871e75408fa2a9e2fc2c90f32dc8dd4124..04de6340810e6d84e8c551a70d9b7e353b08b265 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/IndexerAwsApplication.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/IndexerAwsApplication.java
@@ -14,15 +14,22 @@
 
 package org.opengroup.osdu.indexer.aws;
 
+import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 
 @SpringBootApplication(exclude = { SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class })
-@ComponentScan({"org.opengroup.osdu"})
+@ComponentScan(
+        basePackages = {"org.opengroup.osdu"},
+        excludeFilters={
+                @ComponentScan.Filter(
+                        type=FilterType.ASSIGNABLE_TYPE,
+                        value=IndexerQueueTaskBuilder.class)
+        })
 public class IndexerAwsApplication {
 
     public static void main(String[] args) {
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/IndexerQueueTaskBuilderAws.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/IndexerQueueTaskBuilderAws.java
index a395dfa3d596a24bfcda8d883ff6d13855e4db75..b93d3c94144d859cdf25cde6ff4e1cfcd7ff9358 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/IndexerQueueTaskBuilderAws.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/IndexerQueueTaskBuilderAws.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
 import javax.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
-
+//
 @Primary
 @Component
 public class IndexerQueueTaskBuilderAws extends IndexerQueueTaskBuilder {
@@ -70,12 +70,20 @@ public class IndexerQueueTaskBuilderAws extends IndexerQueueTaskBuilder {
 
     @Override
     public void createWorkerTask(String payload, DpsHeaders headers) {
-        createTask(payload, headers);
+        this.createTask(payload, headers);
     }
 
+    @Override
+    public  void createWorkerTask(String payload, Long countDownMillis, DpsHeaders headers){
+        this.createTask(payload, headers);
+    }
     @Override
     public void createReIndexTask(String payload,DpsHeaders headers) {
-        createTask(payload, headers);
+        this.createTask(payload, headers);
+    }
+    @Override
+    public void createReIndexTask(String payload, Long countDownMillis, DpsHeaders headers){
+        this.createTask(payload, headers);
     }
 
     private void createTask(String payload, DpsHeaders headers) {