diff --git a/AiServer.ServiceInterface/GenerationServices.cs b/AiServer.ServiceInterface/GenerationServices.cs
index 07cc31d..8ed3562 100644
--- a/AiServer.ServiceInterface/GenerationServices.cs
+++ b/AiServer.ServiceInterface/GenerationServices.cs
@@ -9,47 +9,64 @@ namespace AiServer.ServiceInterface;
 
 public class GenerationServices(IBackgroundJobs jobs, AppData appData) : Service
 {
-    public async Task<object> Any(GetArtifactGenerationStatus request)
+    public async Task<GetTextGenerationStatusResponse> Any(GetTextGenerationStatus request)
     {
-        JobResult? job = null;
-        if (request.JobId != null)
-        {
-            job = jobs.GetJob((long)request.JobId);
-        }
+        var job = (request.JobId != null
+                      ? jobs.GetJob((long)request.JobId)
+                      : null)
+                  ?? (!string.IsNullOrEmpty(request.RefId)
+                      ? jobs.GetJobByRefId(request.RefId)
+                      : null);
 
-        if (!string.IsNullOrEmpty(request.RefId))
-        {
-            job = jobs.GetJobByRefId(request.RefId);
-        }
-        
-        if(job == null || job.Job == null || job.Summary.RefId == null)
+        if (job?.Job == null || job.Summary.RefId == null)
             throw HttpError.NotFound("Job not found");
+        if (job.Failed != null)
+            throw new Exception($"Job failed: {job.Failed.Error}");
         
-        // We know at this point, we definitely have a job
-        JobResult queuedJob = job;
-        
-        var completedResponse = new GetArtifactGenerationStatusResponse
+        var ret = new GetTextGenerationStatusResponse
         {
-            RefId = queuedJob.Job?.RefId ?? queuedJob.Summary.RefId,
-            JobId = queuedJob.Job?.Id ?? queuedJob.Summary.Id,
-            Status = queuedJob.Job?.Status ?? queuedJob.Job!.State.ToString(),
-            JobState = queuedJob.Job?.State ?? queuedJob.Summary.State
+            RefId = job.Job?.RefId ?? job.Summary.RefId,
+            JobId = job.Job?.Id ?? job.Summary.Id,
+            Status = job.Job?.Status ?? job.Job!.State.ToString(),
+            JobState = job.Job?.State ?? job.Summary.State
         };
         
-        // Handle failed jobs
-        if (queuedJob.Failed != null)
-        {
-            throw new Exception($"Job failed: {queuedJob.Failed.Error}");
-        }
+        if ((job.Job?.State ?? job.Summary.State) != BackgroundJobState.Completed)
+            return ret;
         
-        if ((queuedJob.Job?.State ?? queuedJob.Summary.State) != BackgroundJobState.Completed)
-            return completedResponse;
+        var outputs = job.GetOutputs();
+        ret.Results = outputs.Item2; // Get TextOutputs
+        return ret;
+    }
+    
+    public async Task<GetArtifactGenerationStatusResponse> Any(GetArtifactGenerationStatus request)
+    {
+        var job = (request.JobId != null
+              ? jobs.GetJob((long)request.JobId)
+              : null)
+          ?? (!string.IsNullOrEmpty(request.RefId)
+              ? jobs.GetJobByRefId(request.RefId)
+              : null);
+
+        if (job?.Job == null || job.Summary.RefId == null)
+            throw HttpError.NotFound("Job not found");
+        if (job.Failed != null)
+            throw new Exception($"Job failed: {job.Failed.Error}");
         
-        // Process successful job results
-        var outputs = queuedJob.GetOutputs();
-        completedResponse.Results = outputs.Item1;
+        var ret = new GetArtifactGenerationStatusResponse
+        {
+            RefId = job.Job?.RefId ?? job.Summary.RefId,
+            JobId = job.Job?.Id ?? job.Summary.Id,
+            Status = job.Job?.Status ?? job.Job!.State.ToString(),
+            JobState = job.Job?.State ?? job.Summary.State
+        };
         
-        return completedResponse;
+        if ((job.Job?.State ?? job.Summary.State) != BackgroundJobState.Completed)
+            return ret;
+        
+        var outputs = job.GetOutputs();
+        ret.Results = outputs.Item1; // Get ArtifactOutputs
+        return ret;
     }
     
     public object Any(ActiveMediaModels request)
diff --git a/AiServer.Tests/QueueSpeechToTextTests.cs b/AiServer.Tests/QueueSpeechToTextTests.cs
index a6eeb17..ee03641 100644
--- a/AiServer.Tests/QueueSpeechToTextTests.cs
+++ b/AiServer.Tests/QueueSpeechToTextTests.cs
@@ -138,7 +138,6 @@ public async Task Can_transcribe_speech_without_sync_or_reply_to()
             Assert.Fail(e.Message);
         }
 
-
         Assert.That(response, Is.Not.Null);
         Assert.That(response.RefId, Is.Not.Null);
         Assert.That(response.RefId, Is.Not.Empty);