diff --git a/api/pyproject.toml b/api/pyproject.toml
index 8a726c2e5b..1d9813f427 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "api"
-version = "0.59.8"
+version = "0.59.9"
 description = "Agenta API"
 authors = [
     { name = "Mahmoud Mabrouk", email = "mahmoud@agenta.ai" },
diff --git a/docs/src/data/roadmap.ts b/docs/src/data/roadmap.ts
index 746fb4cd5d..5bb39ab461 100644
--- a/docs/src/data/roadmap.ts
+++ b/docs/src/data/roadmap.ts
@@ -180,6 +180,54 @@ export const shippedFeatures: ShippedFeature[] = [
     },
 ];
 export const inProgressFeatures: PlannedFeature[] = [
+    {
+        id: "llm-judge-structured-output",
+        title: "Structured Output and Multiple Outputs in LLM-as-a-Judge Evaluators",
+        description: "Use structured output formats and generate multiple output fields (explanation, confidence, suggestions, issue categories) in LLM-as-a-judge evaluators.",
+        githubUrl: "https://github.com/Agenta-AI/agenta/discussions/2855",
+        labels: [
+            {
+                name: "Evaluation",
+                color: "86B7FF",
+            },
+        ],
+    },
+    {
+        id: "jinja2-playground",
+        title: "Jinja2 Template Support in the Playground",
+        description: "Add Jinja2 template support to enable conditional logic, filters, and template blocks in prompts. The prompt type will be stored in the schema, and the SDK will handle rendering.",
+        githubUrl: "https://github.com/Agenta-AI/agenta/discussions/2856",
+        labels: [
+            {
+                name: "Playground",
+                color: "BCFF78",
+            },
+        ],
+    },
+    {
+        id: "pdf-support-playground",
+        title: "PDF Support in the Playground",
+        description: "Add PDF support for models that support it (OpenAI, Gemini, etc.) through base64 encoding, URLs, or file IDs. Support extends to human evaluation for reviewing model responses on PDF inputs.",
+        githubUrl: "https://github.com/Agenta-AI/agenta/discussions/2857",
+        labels: [
+            {
+                name: "Playground",
+                color: "BCFF78",
+            },
+        ],
+    },
+    {
+        id: "prompt-snippets",
+        title: "Prompt Snippets",
+        description: "Create reusable prompt snippets that can be referenced across multiple prompts. Reference specific versions or always use the latest version to maintain consistency across prompt variants.",
+        githubUrl: "https://github.com/Agenta-AI/agenta/discussions/2858",
+        labels: [
+            {
+                name: "Playground",
+                color: "BCFF78",
+            },
+        ],
+    },
     {
         id: "online-evaluation",
         title: "Online Evaluation",
@@ -220,6 +268,58 @@ export const inProgressFeatures: PlannedFeature[] = [
 ];
 
 export const plannedFeatures: PlannedFeature[] = [
+    {
+        id: "prompt-folders",
+        title: "Folders for Prompt Organization",
+        description: "Create folders and subfolders to organize prompts in the playground. Move prompts between folders and search within specific folders to structure prompt libraries.",
+        githubUrl: "https://github.com/Agenta-AI/agenta/discussions/2859",
+        labels: [
+            {
+                name: "Playground",
+                color: "BCFF78",
+            },
+        ],
+    },
+    {
+        id: "projects-workspaces",
+        title: "Projects and Workspaces",
+        description: "Improve organization structure by adding projects and workspaces. Create projects for different products, set up workspaces for different environments or teams, and scope resources to specific workspaces.",
+        githubUrl: "https://github.com/Agenta-AI/agenta/discussions/2860",
+        labels: [
+            {
+                name: "Misc",
+                color: "000000",
+            },
+        ],
+    },
+    {
+        id: "ai-prompt-refinement",
+        title: "AI-Powered Prompt Refinement in the Playground",
+        description: "Analyze prompts and suggest improvements based on best practices. Identify issues, propose refined versions, and allow users to accept, modify, or reject suggestions.",
+        githubUrl: "https://github.com/Agenta-AI/agenta/discussions/2861",
+        labels: [
+            {
+                name: "Playground",
+                color: "BCFF78",
+            },
+        ],
+    },
+    {
+        id: "open-spans-playground",
+        title: "Open Observability Spans Directly in the Playground",
+        description: "Add a button in observability to open any chat span directly in the playground. Creates a stateless playground session pre-filled with the exact prompt, configuration, and inputs for immediate iteration.",
+        githubUrl: "https://github.com/Agenta-AI/agenta/discussions/2862",
+        labels: [
+            {
+                name: "Playground",
+                color: "BCFF78",
+            },
+            {
+                name: "Observability",
+                color: "DE74FF",
+            },
+        ],
+    },
     {
         id: "navigation-in-the-playground",
         title: "Improving Navigation between Test Sets in the Playground",
diff --git a/docs/src/pages/roadmap.tsx b/docs/src/pages/roadmap.tsx
index bb399de4cb..5ceadd9650 100644
--- a/docs/src/pages/roadmap.tsx
+++ b/docs/src/pages/roadmap.tsx
@@ -383,7 +383,7 @@ export default function RoadmapPage() {
 
                 <SectionHeader>Last Shipped</SectionHeader>
                 <div className={styles.sectionList}>
-                    {shippedFeatures.map((f: ShippedFeature) => (
+                    {shippedFeatures.slice(0, 7).map((f: ShippedFeature) => (
                         <FeatureCardClickable
                             key={f.id}
                             title={f.title}
diff --git a/sdk/agenta/sdk/assets.py b/sdk/agenta/sdk/assets.py
index cdef47b2f7..e4b0b44be4 100644
--- a/sdk/agenta/sdk/assets.py
+++ b/sdk/agenta/sdk/assets.py
@@ -1,5 +1,5 @@
 supported_llm_models = {
-    "Anthropic": [
+    "anthropic": [
         "anthropic/claude-sonnet-4-5",
         "anthropic/claude-haiku-4-5",
         "anthropic/claude-opus-4-1",
@@ -15,18 +15,18 @@
         "anthropic/claude-2.1",
         "anthropic/claude-2",
     ],
-    "Cohere": [
+    "cohere": [
         "cohere/command-light",
         "cohere/command-r-plus",
         "cohere/command-nightly",
     ],
-    "DeepInfra": [
+    "deepinfra": [
         "deepinfra/meta-llama/Llama-2-70b-chat-hf",
         "deepinfra/meta-llama/Llama-2-13b-chat-hf",
         "deepinfra/codellama/CodeLlama-34b-Instruct-hf",
         "deepinfra/mistralai/Mistral-7B-Instruct-v0.1",
     ],
-    "Gemini": [
+    "gemini": [
         "gemini/gemini-2.5-pro",
         "gemini/gemini-2.5-pro-preview-05-06",
         "gemini/gemini-2.5-flash",
@@ -40,7 +40,7 @@
         "gemini/gemini-2.0-flash-lite",
         "gemini/gemini-2.0-flash-lite-preview-02-05",
     ],
-    "Groq": [
+    "groq": [
         "groq/deepseek-r1-distill-llama-70b",
         "groq/deepseek-r1-distill-llama-70b-specdec",
         "groq/gemma2-9b-it",
@@ -56,13 +56,13 @@
         "groq/llama3-8b-8192",
         "groq/mixtral-8x7b-32768",
     ],
-    "Mistral": [
+    "mistral": [
         "mistral/mistral-tiny",
         "mistral/mistral-small",
         "mistral/mistral-medium",
         "mistral/mistral-large-latest",
     ],
-    "OpenAI": [
+    "openai": [
         "gpt-5",
         "gpt-5-mini",
         "gpt-5-nano",
@@ -78,7 +78,7 @@
         "gpt-4.1-nano",
         "o4-mini",
     ],
-    "OpenRouter": [
+    "openrouter": [
         "openrouter/qwen/qwen3-235b-a22b",
         "openrouter/qwen/qwen3-32b",
         "openrouter/qwen/qwen3-30b-a3b",
@@ -148,13 +148,13 @@
         "openrouter/google/gemini-2.0-flash-001",
         "openrouter/perplexity/sonar-reasoning",
     ],
-    "Perplexity AI": [
+    "perplexity": [
         "perplexity/sonar",
         "perplexity/sonar-pro",
         "perplexity/sonar-reasoning",
         "perplexity/sonar-reasoning-pro",
     ],
-    "togetherai": [
+    "together_ai": [
         "together_ai/deepseek-ai/DeepSeek-R1",
         "together_ai/deepseek-ai/DeepSeek-R1-Distill-Llama-70B",
         "together_ai/deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B",
diff --git a/sdk/agenta/sdk/managers/secrets.py b/sdk/agenta/sdk/managers/secrets.py
index 8cab332968..6ff68bb79b 100644
--- a/sdk/agenta/sdk/managers/secrets.py
+++ b/sdk/agenta/sdk/managers/secrets.py
@@ -126,7 +126,8 @@ def _get_compatible_model(*, model: str, provider_slug: str):
                 f"{provider_slug}/custom/", "openai/"
             )
 
-        modified_model = modified_model.replace(f"{provider_slug}/", "")
+        if provider_slug:
+            modified_model = modified_model.replace(f"{provider_slug}/", "")
 
         return modified_model
 
diff --git a/sdk/agenta/sdk/middleware/vault.py b/sdk/agenta/sdk/middleware/vault.py
index b03e638184..52c02fa186 100644
--- a/sdk/agenta/sdk/middleware/vault.py
+++ b/sdk/agenta/sdk/middleware/vault.py
@@ -85,7 +85,7 @@ async def _get_secrets(self, request: Request) -> Optional[Dict]:
                     continue
 
                 secret = SecretDTO(
-                    kind="provider_kind",  # type: ignore
+                    kind="provider_key",  # type: ignore
                     data=StandardProviderDTO(
                         kind=provider,
                         provider=StandardProviderSettingsDTO(key=key),
diff --git a/sdk/pyproject.toml b/sdk/pyproject.toml
index 249002fb60..241a5703e9 100644
--- a/sdk/pyproject.toml
+++ b/sdk/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.59.8"
+version = "0.59.9"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = [
diff --git a/web/ee/package.json b/web/ee/package.json
index bb8404cb91..c9c26fff0d 100644
--- a/web/ee/package.json
+++ b/web/ee/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@agenta/ee",
-    "version": "0.59.8",
+    "version": "0.59.9",
     "private": true,
     "engines": {
         "node": ">=18"
diff --git a/web/oss/package.json b/web/oss/package.json
index 24b9cfbf7b..0054d82ca6 100644
--- a/web/oss/package.json
+++ b/web/oss/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@agenta/oss",
-    "version": "0.59.8",
+    "version": "0.59.9",
     "private": true,
     "engines": {
         "node": ">=18"
diff --git a/web/package.json b/web/package.json
index 59d4aefdde..f443722612 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "agenta-web",
-    "version": "0.59.8",
+    "version": "0.59.9",
     "workspaces": [
         "ee",
         "oss",