diff --git a/api/src/main/java/com/datastrato/gravitino/rel/indexes/Indexes.java b/api/src/main/java/com/datastrato/gravitino/rel/indexes/Indexes.java
index 6ae43bac66c..f91e7e5ceb9 100644
--- a/api/src/main/java/com/datastrato/gravitino/rel/indexes/Indexes.java
+++ b/api/src/main/java/com/datastrato/gravitino/rel/indexes/Indexes.java
@@ -21,11 +21,7 @@ public static Index unique(String[][] fieldNames) {
   }
 
   public static Index unique(String name, String[][] fieldNames) {
-    return IndexImpl.builder()
-        .withIndexType(Index.IndexType.UNIQUE_KEY)
-        .withName(name)
-        .withFieldNames(fieldNames)
-        .build();
+    return of(Index.IndexType.UNIQUE_KEY, name, fieldNames);
   }
 
   public static Index primary(String fieldName) {
@@ -38,17 +34,17 @@ public static Index primary(String[][] fieldNames) {
   }
 
   public static Index primary(String name, String[][] fieldNames) {
+    return of(Index.IndexType.PRIMARY_KEY, name, fieldNames);
+  }
+
+  public static Index of(Index.IndexType indexType, String name, String[][] fieldNames) {
     return IndexImpl.builder()
-        .withIndexType(Index.IndexType.PRIMARY_KEY)
+        .withIndexType(indexType)
         .withName(name)
         .withFieldNames(fieldNames)
         .build();
   }
 
-  public static Index of(Index.IndexType indexType, String name, String[][] fieldNames) {
-    return new IndexImpl(indexType, name, fieldNames);
-  }
-
   public static final class IndexImpl implements Index {
     private final IndexType indexType;
     private final String name;