diff --git a/src/google/adk/tools/application_integration_tool/application_integration_toolset.py b/src/google/adk/tools/application_integration_tool/application_integration_toolset.py
index c25f5ba..3a8c235 100644
--- a/src/google/adk/tools/application_integration_tool/application_integration_toolset.py
+++ b/src/google/adk/tools/application_integration_tool/application_integration_toolset.py
@@ -130,7 +130,7 @@ class ApplicationIntegrationToolset:
     self.tool_name = tool_name
     self.tool_instructions = tool_instructions
     self.service_account_json = service_account_json
-    self.tool_filter = tool_filter
+    self._tool_filter = tool_filter
 
     integration_client = IntegrationClient(
         project,
@@ -191,7 +191,7 @@ class ApplicationIntegrationToolset:
           spec_dict=spec_dict,
           auth_credential=auth_credential,
           auth_scheme=auth_scheme,
-          tool_filter=self.tool_filter,
+          tool_filter=self._tool_filter,
       )
       return
 
diff --git a/src/google/adk/tools/google_api_tool/__init__.py b/src/google/adk/tools/google_api_tool/__init__.py
index ce1c85d..736d6d7 100644
--- a/src/google/adk/tools/google_api_tool/__init__.py
+++ b/src/google/adk/tools/google_api_tool/__init__.py
@@ -36,52 +36,51 @@ _docs_toolset = None
 def __getattr__(name):
   global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset
 
-  match name:
-    case 'bigquery_toolset':
-      if _bigquery_toolset is None:
-        from .google_api_toolsets import bigquery_toolset as bigquery
+  if name == 'bigquery_toolset':
+    if _bigquery_toolset is None:
+      from .google_api_toolsets import bigquery_toolset as bigquery
 
-        _bigquery_toolset = bigquery
-      return _bigquery_toolset
+      _bigquery_toolset = bigquery
+    return _bigquery_toolset
 
-    case 'calendar_toolset':
-      if _calendar_toolset is None:
-        from .google_api_toolsets import calendar_toolset as calendar
+  if name == 'calendar_toolset':
+    if _calendar_toolset is None:
+      from .google_api_toolsets import calendar_toolset as calendar
 
-        _calendar_toolset = calendar
-      return _calendar_toolset
+      _calendar_toolset = calendar
+    return _calendar_toolset
 
-    case 'gmail_toolset':
-      if _gmail_toolset is None:
-        from .google_api_toolsets import gmail_toolset as gmail
+  if name == 'gmail_toolset':
+    if _gmail_toolset is None:
+      from .google_api_toolsets import gmail_toolset as gmail
 
-        _gmail_toolset = gmail
-      return _gmail_toolset
+      _gmail_toolset = gmail
+    return _gmail_toolset
 
-    case 'youtube_toolset':
-      if _youtube_toolset is None:
-        from .google_api_toolsets import youtube_toolset as youtube
+  if name == 'youtube_toolset':
+    if _youtube_toolset is None:
+      from .google_api_toolsets import youtube_toolset as youtube
 
-        _youtube_toolset = youtube
-      return _youtube_toolset
+      _youtube_toolset = youtube
+    return _youtube_toolset
 
-    case 'slides_toolset':
-      if _slides_toolset is None:
-        from .google_api_toolsets import slides_toolset as slides
+  if name == 'slides_toolset':
+    if _slides_toolset is None:
+      from .google_api_toolsets import slides_toolset as slides
 
-        _slides_toolset = slides
-      return _slides_toolset
+      _slides_toolset = slides
+    return _slides_toolset
 
-    case 'sheets_toolset':
-      if _sheets_toolset is None:
-        from .google_api_toolsets import sheets_toolset as sheets
+  if name == 'sheets_toolset':
+    if _sheets_toolset is None:
+      from .google_api_toolsets import sheets_toolset as sheets
 
-        _sheets_toolset = sheets
-      return _sheets_toolset
+      _sheets_toolset = sheets
+    return _sheets_toolset
 
-    case 'docs_toolset':
-      if _docs_toolset is None:
-        from .google_api_toolsets import docs_toolset as docs
+  if name == 'docs_toolset':
+    if _docs_toolset is None:
+      from .google_api_toolsets import docs_toolset as docs
 
-        _docs_toolset = docs
-      return _docs_toolset
+      _docs_toolset = docs
+    return _docs_toolset
diff --git a/src/google/adk/tools/google_api_tool/google_api_toolsets.py b/src/google/adk/tools/google_api_tool/google_api_toolsets.py
index a8b3545..4e56f50 100644
--- a/src/google/adk/tools/google_api_tool/google_api_toolsets.py
+++ b/src/google/adk/tools/google_api_tool/google_api_toolsets.py
@@ -47,66 +47,65 @@ def __getattr__(name):
   """
   global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset
 
-  match name:
-    case "bigquery_toolset":
-      if _bigquery_toolset is None:
-        _bigquery_toolset = GoogleApiToolset.load_toolset(
-            api_name="bigquery",
-            api_version="v2",
-        )
+  if name == "bigquery_toolset":
+    if _bigquery_toolset is None:
+      _bigquery_toolset = GoogleApiToolset.load_toolset(
+          api_name="bigquery",
+          api_version="v2",
+      )
 
-      return _bigquery_toolset
+    return _bigquery_toolset
 
-    case "calendar_toolset":
-      if _calendar_toolset is None:
-        _calendar_toolset = GoogleApiToolset.load_toolset(
-            api_name="calendar",
-            api_version="v3",
-        )
+  if name == "calendar_toolset":
+    if _calendar_toolset is None:
+      _calendar_toolset = GoogleApiToolset.load_toolset(
+          api_name="calendar",
+          api_version="v3",
+      )
 
-      return _calendar_toolset
+    return _calendar_toolset
 
-    case "gmail_toolset":
-      if _gmail_toolset is None:
-        _gmail_toolset = GoogleApiToolset.load_toolset(
-            api_name="gmail",
-            api_version="v1",
-        )
+  if name == "gmail_toolset":
+    if _gmail_toolset is None:
+      _gmail_toolset = GoogleApiToolset.load_toolset(
+          api_name="gmail",
+          api_version="v1",
+      )
 
-      return _gmail_toolset
+    return _gmail_toolset
 
-    case "youtube_toolset":
-      if _youtube_toolset is None:
-        _youtube_toolset = GoogleApiToolset.load_toolset(
-            api_name="youtube",
-            api_version="v3",
-        )
+  if name == "youtube_toolset":
+    if _youtube_toolset is None:
+      _youtube_toolset = GoogleApiToolset.load_toolset(
+          api_name="youtube",
+          api_version="v3",
+      )
 
-      return _youtube_toolset
+    return _youtube_toolset
 
-    case "slides_toolset":
-      if _slides_toolset is None:
-        _slides_toolset = GoogleApiToolset.load_toolset(
-            api_name="slides",
-            api_version="v1",
-        )
+  if name == "slides_toolset":
+    if _slides_toolset is None:
+      _slides_toolset = GoogleApiToolset.load_toolset(
+          api_name="slides",
+          api_version="v1",
+      )
 
-      return _slides_toolset
+    return _slides_toolset
 
-    case "sheets_toolset":
-      if _sheets_toolset is None:
-        _sheets_toolset = GoogleApiToolset.load_toolset(
-            api_name="sheets",
-            api_version="v4",
-        )
+  if name == "sheets_toolset":
+    if _sheets_toolset is None:
+      _sheets_toolset = GoogleApiToolset.load_toolset(
+          api_name="sheets",
+          api_version="v4",
+      )
 
-      return _sheets_toolset
+    return _sheets_toolset
 
-    case "docs_toolset":
-      if _docs_toolset is None:
-        _docs_toolset = GoogleApiToolset.load_toolset(
-            api_name="docs",
-            api_version="v1",
-        )
+  if name == "docs_toolset":
+    if _docs_toolset is None:
+      _docs_toolset = GoogleApiToolset.load_toolset(
+          api_name="docs",
+          api_version="v1",
+      )
 
-      return _docs_toolset
+    return _docs_toolset