diff --git a/src/compiler/compiler.go b/src/compiler/compiler.go
index f5ffbce..a935f54 100644
--- a/src/compiler/compiler.go
+++ b/src/compiler/compiler.go
@@ -58,7 +58,9 @@ const importsTemplate = `import %s;
 import %s.%sKeys;
 import io.harness.persistence.HPersistence;
 import io.harness.query.PersistentQuery;
-import org.mongodb.morphia.query.Query;`
+import org.mongodb.morphia.query.Query;
+import com.google.common.collect.ImmutableList;
+import java.util.List;`
 
 const queryCanonicalFormsTemplate = `
   List<String> queryCanonicalForms() {
diff --git a/src/compiler/compiler_test.go b/src/compiler/compiler_test.go
index ce4e4a0..dd562a6 100644
--- a/src/compiler/compiler_test.go
+++ b/src/compiler/compiler_test.go
@@ -25,6 +25,8 @@ import io.harness.beans.DelegateTask.DelegateTaskKeys;
 import io.harness.persistence.HPersistence;
 import io.harness.query.PersistentQuery;
 import org.mongodb.morphia.query.Query;
+import com.google.common.collect.ImmutableList;
+import java.util.List;
 
 public class DelegateTaskSelectQuery implements PersistentQuery {
   public static SelectQueryAccountId create(HPersistence persistence) {
@@ -72,7 +74,6 @@ public class DelegateTaskSelectQuery implements PersistentQuery {
 	result := compiler.Generate(&query)
 	assert.Equal(t, expected, result)
 
-
 	query1 := dom.Query{
 		Name: "Select",
 		Collection: "io.harness.beans.DelegateTask",
@@ -89,6 +90,8 @@ import io.harness.beans.DelegateTask.DelegateTaskKeys;
 import io.harness.persistence.HPersistence;
 import io.harness.query.PersistentQuery;
 import org.mongodb.morphia.query.Query;
+import com.google.common.collect.ImmutableList;
+import java.util.List;
 
 public class DelegateTaskSelectQuery implements PersistentQuery {
   public static SelectQueryAccountId create(HPersistence persistence) {