diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs
index cecbab75..abf15e52 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs
@@ -3,9 +3,8 @@ using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Application.Histories.Queries;
-using DigitalData.Core.Client;
 using EnvelopeGenerator.Application.Extensions;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
@@ -49,9 +48,11 @@ public class HistoryController : ControllerBase
     /// <response code="200"></response>
     [HttpGet("related")]
     [Authorize]
-    public IActionResult GetReferenceTypes(ReferenceType? referenceType = null)
+    public IActionResult GetReferenceTypes(Constants.ReferenceType? referenceType = null)
     {
-        return referenceType is null ? Ok(_memoryCache.GetEnumAsDictionary<ReferenceType>("gen.api", ReferenceType.Unknown)) : Ok(referenceType.ToString());
+        return referenceType is null 
+            ? Ok(_memoryCache.GetEnumAsDictionary<Constants.ReferenceType>("gen.api", Constants.ReferenceType.Unknown))
+            : Ok(referenceType.ToString());
     }
 
     /// <summary>
@@ -90,15 +91,18 @@ public class HistoryController : ControllerBase
     /// <response code="200"></response>
     [HttpGet("status")]
     [Authorize]
-    public IActionResult GetEnvelopeStatus([FromQuery] EnvelopeStatus? status = null)
+    public IActionResult GetEnvelopeStatus([FromQuery] Constants.EnvelopeStatus? status = null)
     {
-        return status is null ? Ok(_memoryCache.GetEnumAsDictionary<EnvelopeStatus>("gen.api", Status.NonHist, Status.RelatedToFormApp)) : Ok(status.ToString());
+        return status is null
+            ? Ok(_memoryCache.GetEnumAsDictionary<Constants.EnvelopeStatus>("gen.api", Constants.Status.NonHist, Constants.Status.RelatedToFormApp))
+            : Ok(status.ToString());
     }
 
     /// <summary>
     /// Ruft die gesamte Umschlaghistorie basierend auf den angegebenen Abfrageparametern ab.
     /// </summary>
     /// <param name="historyQuery">Die Abfrageparameter, die die Filterkriterien für die Umschlaghistorie definieren.</param>
+    /// <param name="cancel"></param>
     /// <returns>Eine Liste von Historieneinträgen, die den angegebenen Kriterien entsprechen, oder nur der letzte Eintrag.</returns>
     /// <response code="200">Die Anfrage war erfolgreich, und die Umschlaghistorie wird zurückgegeben.</response>
     /// <response code="400">Die Anfrage war ungültig oder unvollständig.</response>
@@ -107,9 +111,9 @@ public class HistoryController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [HttpGet]
     [Authorize]
-    public async Task<IActionResult> GetAllAsync([FromQuery] ReadHistoryQuery historyQuery)
+    public async Task<IActionResult> GetAllAsync([FromQuery] ReadHistoryQuery historyQuery, CancellationToken cancel)
     {
-        var history = await _mediator.Send(historyQuery).ThrowIfEmpty(Exceptions.NotFound);
+        var history = await _mediator.Send(historyQuery, cancel).ThrowIfEmpty(Exceptions.NotFound);
         return Ok((historyQuery.OnlyLast ?? false) ? history.MaxBy(h => h.AddedWhen) : history);
     }
 }