diff --git a/src/index.ts b/src/index.ts
index acbbb0a..ed22649 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -135,13 +135,13 @@ import {
   ToolResponse,
 } from './resources/agents/agents';
 import {
+  BenchmarkConfig,
   Eval,
   EvalCandidate,
   EvalEvaluateRowsAlphaParams,
   EvalEvaluateRowsParams,
   EvalRunEvalAlphaParams,
   EvalRunEvalParams,
-  EvalTaskConfig,
   EvaluateResponse,
   Job,
 } from './resources/eval/eval';
@@ -415,8 +415,8 @@ export declare namespace LlamaStackClient {
 
   export {
     Eval as Eval,
+    type BenchmarkConfig as BenchmarkConfig,
     type EvalCandidate as EvalCandidate,
-    type EvalTaskConfig as EvalTaskConfig,
     type EvaluateResponse as EvaluateResponse,
     type Job as Job,
     type EvalEvaluateRowsParams as EvalEvaluateRowsParams,
diff --git a/src/resources/eval/eval.ts b/src/resources/eval/eval.ts
index a64adf3..2784781 100644
--- a/src/resources/eval/eval.ts
+++ b/src/resources/eval/eval.ts
@@ -39,6 +39,16 @@ export class Eval extends APIResource {
   }
 }
 
+export interface BenchmarkConfig {
+  eval_candidate: EvalCandidate;
+
+  scoring_params: Record<string, ScoringFunctionsAPI.ScoringFnParams>;
+
+  type: 'benchmark';
+
+  num_examples?: number;
+}
+
 export type EvalCandidate = EvalCandidate.ModelCandidate | EvalCandidate.AgentCandidate;
 
 export namespace EvalCandidate {
@@ -62,16 +72,6 @@ export namespace EvalCandidate {
   }
 }
 
-export interface EvalTaskConfig {
-  eval_candidate: EvalCandidate;
-
-  scoring_params: Record<string, ScoringFunctionsAPI.ScoringFnParams>;
-
-  type: 'benchmark';
-
-  num_examples?: number;
-}
-
 export interface EvaluateResponse {
   generations: Array<Record<string, boolean | number | string | Array<unknown> | unknown | null>>;
 
@@ -87,7 +87,7 @@ export interface EvalEvaluateRowsParams {
 
   scoring_functions: Array<string>;
 
-  task_config: EvalTaskConfig;
+  task_config: BenchmarkConfig;
 }
 
 export interface EvalEvaluateRowsAlphaParams {
@@ -95,23 +95,23 @@ export interface EvalEvaluateRowsAlphaParams {
 
   scoring_functions: Array<string>;
 
-  task_config: EvalTaskConfig;
+  task_config: BenchmarkConfig;
 }
 
 export interface EvalRunEvalParams {
-  task_config: EvalTaskConfig;
+  task_config: BenchmarkConfig;
 }
 
 export interface EvalRunEvalAlphaParams {
-  task_config: EvalTaskConfig;
+  task_config: BenchmarkConfig;
 }
 
 Eval.Jobs = Jobs;
 
 export declare namespace Eval {
   export {
+    type BenchmarkConfig as BenchmarkConfig,
     type EvalCandidate as EvalCandidate,
-    type EvalTaskConfig as EvalTaskConfig,
     type EvaluateResponse as EvaluateResponse,
     type Job as Job,
     type EvalEvaluateRowsParams as EvalEvaluateRowsParams,
diff --git a/src/resources/eval/index.ts b/src/resources/eval/index.ts
index ee62c0f..3b5e507 100644
--- a/src/resources/eval/index.ts
+++ b/src/resources/eval/index.ts
@@ -2,8 +2,8 @@
 
 export {
   Eval,
+  type BenchmarkConfig,
   type EvalCandidate,
-  type EvalTaskConfig,
   type EvaluateResponse,
   type Job,
   type EvalEvaluateRowsParams,
diff --git a/src/resources/index.ts b/src/resources/index.ts
index 3641c9a..2ecd2ea 100644
--- a/src/resources/index.ts
+++ b/src/resources/index.ts
@@ -39,8 +39,8 @@ export {
 } from './datasets';
 export {
   Eval,
+  type BenchmarkConfig,
   type EvalCandidate,
-  type EvalTaskConfig,
   type EvaluateResponse,
   type Job,
   type EvalEvaluateRowsParams,
diff --git a/src/resources/shared.ts b/src/resources/shared.ts
index 7dd108a..c58aa43 100644
--- a/src/resources/shared.ts
+++ b/src/resources/shared.ts
@@ -5,14 +5,14 @@ import * as InferenceAPI from './inference';
 import * as ToolRuntimeAPI from './tool-runtime/tool-runtime';
 
 export interface AgentConfig {
-  enable_session_persistence: boolean;
-
   instructions: string;
 
   model: string;
 
   client_tools?: Array<ToolRuntimeAPI.ToolDef>;
 
+  enable_session_persistence?: boolean;
+
   input_shields?: Array<string>;
 
   max_infer_iters?: number;
diff --git a/tests/api-resources/agents/agents.test.ts b/tests/api-resources/agents/agents.test.ts
index 45e0f8b..6988bf7 100644
--- a/tests/api-resources/agents/agents.test.ts
+++ b/tests/api-resources/agents/agents.test.ts
@@ -8,7 +8,7 @@ const client = new LlamaStackClient({ baseURL: process.env['TEST_API_BASE_URL']
 describe('resource agents', () => {
   test('create: only required params', async () => {
     const responsePromise = client.agents.create({
-      agent_config: { enable_session_persistence: true, instructions: 'instructions', model: 'model' },
+      agent_config: { instructions: 'instructions', model: 'model' },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -22,7 +22,6 @@ describe('resource agents', () => {
   test('create: required and optional params', async () => {
     const response = await client.agents.create({
       agent_config: {
-        enable_session_persistence: true,
         instructions: 'instructions',
         model: 'model',
         client_tools: [
@@ -41,6 +40,7 @@ describe('resource agents', () => {
             ],
           },
         ],
+        enable_session_persistence: true,
         input_shields: ['string'],
         max_infer_iters: 0,
         output_shields: ['string'],