diff --git a/pyproject.toml b/pyproject.toml
index aafe70750..8bc83f29b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ dependencies = [
     "psutil",
     "polars",
     "plotly",
-    "environs",
+    "environs<14.1.0",
     "pydantic<v2",
     "scikit-learn",
     "pymilvus", # with pandas, numpy, ujson
diff --git a/vectordb_bench/backend/clients/api.py b/vectordb_bench/backend/clients/api.py
index a86849e96..28dae441f 100644
--- a/vectordb_bench/backend/clients/api.py
+++ b/vectordb_bench/backend/clients/api.py
@@ -22,7 +22,7 @@ class IndexType(str, Enum):
     IVFSQ8 = "IVF_SQ8"
     Flat = "FLAT"
     AUTOINDEX = "AUTOINDEX"
-    ES_HNSW = "hnsw"
+    ES_HNSW = "ybhnsw"
     ES_IVFFlat = "ivfflat"
     GPU_IVF_FLAT = "GPU_IVF_FLAT"
     GPU_IVF_PQ = "GPU_IVF_PQ"
diff --git a/vectordb_bench/backend/clients/pgvector/cli.py b/vectordb_bench/backend/clients/pgvector/cli.py
index 55a462055..fba329d2d 100644
--- a/vectordb_bench/backend/clients/pgvector/cli.py
+++ b/vectordb_bench/backend/clients/pgvector/cli.py
@@ -118,6 +118,28 @@ class PgVectorTypedDict(CommonTypedDict):
             callback=set_default_quantized_fetch_limit,
         ),
     ]
+    create_index_before_load: Annotated[
+        bool | None,
+        click.option(
+            "--create-index-before-load",
+            type=bool,
+            help="Enable create index before loading vectors",
+            default=True,
+            required=False,
+            show_default=True,
+        ),
+    ]
+    create_index_after_load: Annotated[
+        bool | None,
+        click.option(
+            "--create-index-after-load",
+            type=bool,
+            help="Enable create index after loading vectors",
+            default=False,
+            required=False,
+            show_default=True,
+        ),
+    ]
 
 
 class PgVectorIVFFlatTypedDict(PgVectorTypedDict, IVFFlatTypedDict): ...
@@ -149,6 +171,8 @@ def PgVectorIVFFlat(
             reranking=parameters["reranking"],
             reranking_metric=parameters["reranking_metric"],
             quantized_fetch_limit=parameters["quantized_fetch_limit"],
+            create_index_before_load=parameters["create_index_before_load"],
+            create_index_after_load=parameters["create_index_after_load"],
         ),
         **parameters,
     )
@@ -185,6 +209,8 @@ def PgVectorHNSW(
             reranking=parameters["reranking"],
             reranking_metric=parameters["reranking_metric"],
             quantized_fetch_limit=parameters["quantized_fetch_limit"],
+            create_index_before_load=parameters["create_index_before_load"],
+            create_index_after_load=parameters["create_index_after_load"],
         ),
         **parameters,
     )
diff --git a/vectordb_bench/backend/clients/pgvector/config.py b/vectordb_bench/backend/clients/pgvector/config.py
index c386d75ef..ea7263e8d 100644
--- a/vectordb_bench/backend/clients/pgvector/config.py
+++ b/vectordb_bench/backend/clients/pgvector/config.py
@@ -171,6 +171,8 @@ class PgVectorIVFFlatConfig(PgVectorIndexConfig):
     reranking: bool | None = None
     quantized_fetch_limit: int | None = None
     reranking_metric: str | None = None
+    create_index_before_load: bool | None = True
+    create_index_after_load: bool | None = False
 
     def index_param(self) -> PgVectorIndexParam:
         index_parameters = {"lists": self.lists}
@@ -215,6 +217,8 @@ class PgVectorHNSWConfig(PgVectorIndexConfig):
     reranking: bool | None = None
     quantized_fetch_limit: int | None = None
     reranking_metric: str | None = None
+    create_index_before_load: bool | None = True
+    create_index_after_load: bool | None = False
 
     def index_param(self) -> PgVectorIndexParam:
         index_parameters = {"m": self.m, "ef_construction": self.ef_construction}
diff --git a/vectordb_bench/backend/clients/pgvector/pgvector.py b/vectordb_bench/backend/clients/pgvector/pgvector.py
index 4164461fb..61f030cde 100644
--- a/vectordb_bench/backend/clients/pgvector/pgvector.py
+++ b/vectordb_bench/backend/clients/pgvector/pgvector.py
@@ -374,11 +374,11 @@ def _create_table(self, dim: int):
                     "CREATE TABLE IF NOT EXISTS public.{table_name} (id BIGINT PRIMARY KEY, embedding vector({dim}));",
                 ).format(table_name=sql.Identifier(self.table_name), dim=dim),
             )
-            self.cursor.execute(
-                sql.SQL(
-                    "ALTER TABLE public.{table_name} ALTER COLUMN embedding SET STORAGE PLAIN;",
-                ).format(table_name=sql.Identifier(self.table_name)),
-            )
+            # self.cursor.execute(
+            #     sql.SQL(
+            #         "ALTER TABLE public.{table_name} ALTER COLUMN embedding SET STORAGE PLAIN;",
+            #     ).format(table_name=sql.Identifier(self.table_name)),
+            # )
             self.conn.commit()
         except Exception as e:
             log.warning(f"Failed to create pgvector table: {self.table_name} error: {e}")