diff --git a/src/main.py b/src/main.py
index 1125e2b6..ef287adb 100644
--- a/src/main.py
+++ b/src/main.py
@@ -133,9 +133,8 @@ async def lifespan(_: FastAPI):
 app = FastAPI(
     lifespan=lifespan,
     servers=[
-        {"url": "http://localhost:8000", "description": "Local Development Server"},
-        {"url": "https://demo.honcho.dev", "description": "Demo Server"},
         {"url": "https://api.honcho.dev", "description": "Production SaaS Platform"},
+        {"url": "http://localhost:8000", "description": "Local Development Server"},
     ],
     title="Honcho API",
     summary="The Identity Layer for the Agentic World",
diff --git a/src/routers/workspaces.py b/src/routers/workspaces.py
index db69f7e3..207316d1 100644
--- a/src/routers/workspaces.py
+++ b/src/routers/workspaces.py
@@ -159,7 +159,7 @@ async def get_queue_status(
 
 @router.get(
     "/{workspace_id}/deriver/status",
-    response_model=schemas.QueueStatus,
+    response_model=schemas.DeriverStatus,
     dependencies=[Depends(require_auth(workspace_name="workspace_id"))],
     deprecated=True,
 )
diff --git a/src/schemas.py b/src/schemas.py
index 608f5e21..a9f56350 100644
--- a/src/schemas.py
+++ b/src/schemas.py
@@ -1,7 +1,7 @@
 import datetime
 import ipaddress
 from enum import Enum
-from typing import Annotated, Any, Self
+from typing import Annotated, Any, ClassVar, Self
 from urllib.parse import urlparse
 
 import tiktoken
@@ -608,22 +608,43 @@ class ConclusionBatchCreate(BaseModel):
 class ObservationGet(ConclusionGet):
     """Deprecated: use ConclusionGet."""
 
+    model_config: ClassVar[ConfigDict] = ConfigDict(title="ObservationGet")
+
 
 class Observation(Conclusion):
     """Deprecated: use Conclusion."""
 
+    model_config: ClassVar[ConfigDict] = ConfigDict(title="Observation")
+
 
 class ObservationQuery(ConclusionQuery):
     """Deprecated: use ConclusionQuery."""
 
+    model_config: ClassVar[ConfigDict] = ConfigDict(title="ObservationQuery")
+
 
 class ObservationCreate(ConclusionCreate):
     """Deprecated: use ConclusionCreate."""
 
+    model_config: ClassVar[ConfigDict] = ConfigDict(title="ObservationCreate")
+
 
 class ObservationBatchCreate(ConclusionBatchCreate):
     """Deprecated: use ConclusionBatchCreate."""
 
+    observations: list[ObservationCreate] = Field(
+        ...,
+        min_length=1,
+        max_length=100,
+        serialization_alias="observations",
+        validation_alias=AliasChoices("observations", "conclusions"),
+    )
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(
+        title="ObservationBatchCreate",
+        populate_by_name=True,
+    )
+
 
 class MessageSearchOptions(BaseModel):
     query: str = Field(..., description="Search query")
@@ -752,10 +773,14 @@ class QueueStatus(BaseModel):
 class SessionDeriverStatus(SessionQueueStatus):
     """Deprecated: use SessionQueueStatus."""
 
+    model_config: ClassVar[ConfigDict] = ConfigDict(title="SessionDeriverStatus")
+
 
 class DeriverStatus(QueueStatus):
     """Deprecated: use QueueStatus."""
 
+    model_config: ClassVar[ConfigDict] = ConfigDict(title="DeriverStatus")
+
 
 # Dream trigger schema
 class TriggerDreamRequest(BaseModel):