diff --git a/README.md b/README.md
index 6783215..599f252 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,8 @@ Set the following environment variables before starting the Gemini CLI. These va
 ```bash
 export BIGQUERY_PROJECT="<your-gcp-project-id>"
 export BIGQUERY_LOCATION="<your-dataset-location>"  # Optional
+export BIGQUERY_SCOPES="https://www.googleapis.com/auth/bigquery,https://www.googleapis.com/auth/drive"  # Optional
+export BIGQUERY_MAX_QUERY_RESULT_ROWS=50  # Optional
 ```
 
 Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
diff --git a/gemini-extension.json b/gemini-extension.json
index 4e8a05e..b43f6ed 100644
--- a/gemini-extension.json
+++ b/gemini-extension.json
@@ -23,6 +23,16 @@
       "name": "Location",
       "description": "(Optional) Location of the BigQuery resources",
       "envVar": "BIGQUERY_LOCATION"
+    },
+    {
+      "name": "Authorization Scopes",
+      "description": "(Optional) Authorization scopes for Google APIs (Dataplex, Conversational API, BigQuery), comma-separated",
+      "envVar": "BIGQUERY_SCOPES"
+    },
+    {
+      "name": "Maximum Query Result Rows",
+      "description": "(Optional) Maximum number of rows to return from BigQuery query results",
+      "envVar": "BIGQUERY_MAX_QUERY_RESULT_ROWS"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tools.yaml b/tools.yaml
index 7d6bbba..d796353 100644
--- a/tools.yaml
+++ b/tools.yaml
@@ -18,6 +18,8 @@ sources:
     project: ${BIGQUERY_PROJECT}
     location: ${BIGQUERY_LOCATION:}
     useClientOAuth: ${BIGQUERY_USE_CLIENT_OAUTH:false}
+    scopes: ${BIGQUERY_SCOPES:}
+    maxQueryResultRows: ${BIGQUERY_MAX_QUERY_RESULT_ROWS:50}
 
 tools:
   ask_data_insights: