diff --git a/veadk/a2a/ve_a2a_server.py b/veadk/a2a/ve_a2a_server.py
index 99bfa6f0..95e53c1a 100644
--- a/veadk/a2a/ve_a2a_server.py
+++ b/veadk/a2a/ve_a2a_server.py
@@ -35,6 +35,7 @@ def __init__(
             runner=Runner(
                 agent=agent,
                 app_name=app_name,
+                short_term_memory=short_term_memory,
             ),
         )
 
diff --git a/veadk/tools/builtin_tools/video_generate.py b/veadk/tools/builtin_tools/video_generate.py
index 71e37c0b..a00fa4e0 100644
--- a/veadk/tools/builtin_tools/video_generate.py
+++ b/veadk/tools/builtin_tools/video_generate.py
@@ -86,7 +86,9 @@ async def generate(prompt, first_frame_image=None, last_frame_image=None):
     return response
 
 
-async def video_generate(params: list, tool_context: ToolContext) -> Dict:
+async def video_generate(
+    params: list, tool_context: ToolContext, batch_size: int = 10
+) -> Dict:
     """
     Generate videos in **batch** from text prompts, optionally guided by a first/last frame,
     and fine-tuned via *model text commands* (a.k.a. `parameters` appended to the prompt).
@@ -97,6 +99,8 @@ async def video_generate(params: list, tool_context: ToolContext) -> Dict:
     Args:
         params (list[dict]):
             A list of video generation requests. Each item supports the fields below.
+        batch_size (int):
+            The number of videos to generate in a batch. Defaults to 10.
 
             Required per item:
                 - video_name (str):
@@ -191,7 +195,6 @@ async def video_generate(params: list, tool_context: ToolContext) -> Dict:
                 }
             ]
     """
-    batch_size = 10
     success_list = []
     error_list = []
     logger.debug(f"Using model: {getenv('MODEL_VIDEO_NAME', DEFAULT_VIDEO_MODEL_NAME)}")