diff --git a/src/AzureAppConfigurationEmulator/Handlers/KeyHandler.cs b/src/AzureAppConfigurationEmulator/Handlers/KeyHandler.cs
index 04d1b18..f8682bd 100644
--- a/src/AzureAppConfigurationEmulator/Handlers/KeyHandler.cs
+++ b/src/AzureAppConfigurationEmulator/Handlers/KeyHandler.cs
@@ -12,6 +12,7 @@ public class KeyHandler
     public static async Task<Results<KeySetResult, InvalidCharacterResult, TooManyValuesResult>> List(
         [FromServices] IConfigurationSettingRepository repository,
         [FromQuery] string name = KeyFilter.Any,
+        [FromHeader(Name = "Accept-Datetime")] DateTimeOffset? acceptDatetime = default,
         CancellationToken cancellationToken = default)
     {
         if (name != KeyFilter.Any)
@@ -27,11 +28,11 @@ public static async Task<Results<KeySetResult, InvalidCharacterResult, TooManyVa
             }
         }
 
-        var keys = await repository.Get(key: name, cancellationToken: cancellationToken)
+        var keys = await repository.Get(key: name, moment: acceptDatetime, cancellationToken: cancellationToken)
             .Select(setting => setting.Key)
             .Distinct()
             .ToListAsync(cancellationToken);
 
-        return new KeySetResult(keys);
+        return new KeySetResult(keys, acceptDatetime);
     }
 }
diff --git a/src/AzureAppConfigurationEmulator/Handlers/KeyValueHandler.cs b/src/AzureAppConfigurationEmulator/Handlers/KeyValueHandler.cs
index 79f1e4a..e8e1b13 100644
--- a/src/AzureAppConfigurationEmulator/Handlers/KeyValueHandler.cs
+++ b/src/AzureAppConfigurationEmulator/Handlers/KeyValueHandler.cs
@@ -24,7 +24,7 @@ public static async Task<Results<KeyValueResult, NoContent, PreconditionFailedRe
         ifNoneMatch = ifNoneMatch?.TrimStart('"').TrimEnd('"');
         key = Uri.UnescapeDataString(key);
 
-        var setting = await repository.Get(key, label, cancellationToken).SingleOrDefaultAsync(cancellationToken);
+        var setting = await repository.Get(key, label, cancellationToken: cancellationToken).SingleOrDefaultAsync(cancellationToken);
 
         if (setting == null)
         {
@@ -65,6 +65,7 @@ public static async Task<Results<KeyValueResult, NotFound, NotModifiedResult, Pr
         [FromServices] IConfigurationSettingRepository repository,
         [FromRoute] string key,
         [FromQuery] string label = LabelFilter.Null,
+        [FromHeader(Name = "Accept-Datetime")] DateTimeOffset? acceptDatetime = default,
         [FromHeader(Name = "If-Match")] string? ifMatch = default,
         [FromHeader(Name = "If-None-Match")] string? ifNoneMatch = default,
         CancellationToken cancellationToken = default)
@@ -73,7 +74,7 @@ public static async Task<Results<KeyValueResult, NotFound, NotModifiedResult, Pr
         ifNoneMatch = ifNoneMatch?.TrimStart('"').TrimEnd('"');
         key = Uri.UnescapeDataString(key);
 
-        var setting = await repository.Get(key, label, cancellationToken).SingleOrDefaultAsync(cancellationToken);
+        var setting = await repository.Get(key, label, acceptDatetime, cancellationToken).SingleOrDefaultAsync(cancellationToken);
 
         if (setting == null)
         {
@@ -90,13 +91,14 @@ public static async Task<Results<KeyValueResult, NotFound, NotModifiedResult, Pr
             return new NotModifiedResult();
         }
 
-        return new KeyValueResult(setting);
+        return new KeyValueResult(setting, acceptDatetime);
     }
 
     public static async Task<Results<KeyValueSetResult, InvalidCharacterResult, TooManyValuesResult>> List(
         [FromServices] IConfigurationSettingRepository repository,
         [FromQuery] string key = KeyFilter.Any,
         [FromQuery] string label = LabelFilter.Any,
+        [FromHeader(Name = "Accept-Datetime")] DateTimeOffset? acceptDatetime = default,
         CancellationToken cancellationToken = default)
     {
         if (key != KeyFilter.Any)
@@ -125,9 +127,9 @@ public static async Task<Results<KeyValueSetResult, InvalidCharacterResult, TooM
             }
         }
 
-        var settings = await repository.Get(key, label, cancellationToken).ToListAsync(cancellationToken);
+        var settings = await repository.Get(key, label, acceptDatetime, cancellationToken).ToListAsync(cancellationToken);
 
-        return new KeyValueSetResult(settings);
+        return new KeyValueSetResult(settings, acceptDatetime);
     }
 
     public static async Task<Results<KeyValueResult, PreconditionFailedResult, ReadOnlyResult>> Set(
@@ -145,7 +147,7 @@ public static async Task<Results<KeyValueResult, PreconditionFailedResult, ReadO
 
         var date = DateTimeOffset.UtcNow;
 
-        var setting = await repository.Get(key, label, cancellationToken).SingleOrDefaultAsync(cancellationToken);
+        var setting = await repository.Get(key, label, cancellationToken: cancellationToken).SingleOrDefaultAsync(cancellationToken);
 
         if (setting == null)
         {
diff --git a/src/AzureAppConfigurationEmulator/Handlers/LabelHandler.cs b/src/AzureAppConfigurationEmulator/Handlers/LabelHandler.cs
index 5cb1253..b07e478 100644
--- a/src/AzureAppConfigurationEmulator/Handlers/LabelHandler.cs
+++ b/src/AzureAppConfigurationEmulator/Handlers/LabelHandler.cs
@@ -12,6 +12,7 @@ public class LabelHandler
     public static async Task<Results<LabelSetResult, InvalidCharacterResult, TooManyValuesResult>> List(
         [FromServices] IConfigurationSettingRepository repository,
         [FromQuery] string name = LabelFilter.Any,
+        [FromHeader(Name = "Accept-Datetime")] DateTimeOffset? acceptDatetime = default,
         CancellationToken cancellationToken = default)
     {
         if (name != LabelFilter.Any)
@@ -27,7 +28,7 @@ public static async Task<Results<LabelSetResult, InvalidCharacterResult, TooMany
             }
         }
 
-        var labels = await repository.Get(label: name, cancellationToken: cancellationToken)
+        var labels = await repository.Get(label: name, moment: acceptDatetime, cancellationToken: cancellationToken)
             .Select(setting => setting.Label)
             .Distinct()
             .ToListAsync(cancellationToken);
diff --git a/src/AzureAppConfigurationEmulator/Repositories/ConfigurationSettingRepository.cs b/src/AzureAppConfigurationEmulator/Repositories/ConfigurationSettingRepository.cs
index aacaa60..81037d9 100644
--- a/src/AzureAppConfigurationEmulator/Repositories/ConfigurationSettingRepository.cs
+++ b/src/AzureAppConfigurationEmulator/Repositories/ConfigurationSettingRepository.cs
@@ -48,9 +48,10 @@ public async Task AddAsync(
     public async IAsyncEnumerable<ConfigurationSetting> Get(
         string key = KeyFilter.Any,
         string label = LabelFilter.Any,
+        DateTimeOffset? moment = default,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
-        var text = "SELECT etag, key, label, content_type, value, last_modified, locked, tags FROM configuration_settings";
+        var text = $"SELECT etag, key, label, content_type, value, last_modified, locked, tags FROM {(moment is not null ? "configuration_settings_history" : "configuration_settings")}";
 
         var parameters = new List<DbParameter>();
 
@@ -99,6 +100,13 @@ public async IAsyncEnumerable<ConfigurationSetting> Get(
             outers.Add($"({string.Join(" OR ", inners)})");
         }
 
+        if (moment is not null)
+        {
+            parameters.Add(ParameterFactory.Create("$moment", moment));
+
+            outers.Add("(valid_from <= $moment AND valid_to > $moment)");
+        }
+
         if (outers.Count > 0)
         {
             text += $" WHERE {string.Join(" AND ", outers)}";
diff --git a/src/AzureAppConfigurationEmulator/Repositories/IConfigurationSettingRepository.cs b/src/AzureAppConfigurationEmulator/Repositories/IConfigurationSettingRepository.cs
index 9e4f000..daff141 100644
--- a/src/AzureAppConfigurationEmulator/Repositories/IConfigurationSettingRepository.cs
+++ b/src/AzureAppConfigurationEmulator/Repositories/IConfigurationSettingRepository.cs
@@ -12,6 +12,7 @@ public Task AddAsync(
     public IAsyncEnumerable<ConfigurationSetting> Get(
         string key = KeyFilter.Any,
         string label = LabelFilter.Any,
+        DateTimeOffset? moment = default,
         CancellationToken cancellationToken = default);
 
     public Task RemoveAsync(
diff --git a/src/AzureAppConfigurationEmulator/Results/KeySetResult.cs b/src/AzureAppConfigurationEmulator/Results/KeySetResult.cs
index 34a278b..9aa2581 100644
--- a/src/AzureAppConfigurationEmulator/Results/KeySetResult.cs
+++ b/src/AzureAppConfigurationEmulator/Results/KeySetResult.cs
@@ -1,6 +1,6 @@
 namespace AzureAppConfigurationEmulator.Results;
 
-public class KeySetResult(IEnumerable<string> keys) :
+public class KeySetResult(IEnumerable<string> keys, DateTimeOffset? mementoDatetime = default) :
     IResult,
     IContentTypeHttpResult,
     IStatusCodeHttpResult,
@@ -9,6 +9,11 @@ public class KeySetResult(IEnumerable<string> keys) :
 {
     public async Task ExecuteAsync(HttpContext httpContext)
     {
+        if (MementoDatetime.HasValue)
+        {
+            httpContext.Response.Headers["Memento-Datetime"] = MementoDatetime.Value.ToString("R");
+        }
+
         if (StatusCode.HasValue)
         {
             httpContext.Response.StatusCode = StatusCode.Value;
@@ -24,6 +29,8 @@ public async Task ExecuteAsync(HttpContext httpContext)
     object IValueHttpResult.Value => Value;
 
     public KeySet Value { get; } = new(keys.Select(key => new Key(key)));
+
+    private DateTimeOffset? MementoDatetime { get; } = mementoDatetime;
 }
 
 public record KeySet(IEnumerable<Key> Items);
diff --git a/src/AzureAppConfigurationEmulator/Results/KeyValueResult.cs b/src/AzureAppConfigurationEmulator/Results/KeyValueResult.cs
index 84d6de2..f70c575 100644
--- a/src/AzureAppConfigurationEmulator/Results/KeyValueResult.cs
+++ b/src/AzureAppConfigurationEmulator/Results/KeyValueResult.cs
@@ -2,7 +2,7 @@
 
 namespace AzureAppConfigurationEmulator.Results;
 
-public class KeyValueResult(ConfigurationSetting setting) :
+public class KeyValueResult(ConfigurationSetting setting, DateTimeOffset? mementoDatetime = default) :
     IResult,
     IContentTypeHttpResult,
     IStatusCodeHttpResult,
@@ -14,6 +14,11 @@ public async Task ExecuteAsync(HttpContext httpContext)
         httpContext.Response.Headers.ETag = Value.Etag;
         httpContext.Response.Headers.LastModified = Value.LastModified.ToString("R");
 
+        if (MementoDatetime.HasValue)
+        {
+            httpContext.Response.Headers["Memento-Datetime"] = MementoDatetime.Value.ToString("R");
+        }
+
         if (StatusCode.HasValue)
         {
             httpContext.Response.StatusCode = StatusCode.Value;
@@ -29,4 +34,6 @@ public async Task ExecuteAsync(HttpContext httpContext)
     object IValueHttpResult.Value => Value;
 
     public ConfigurationSetting Value { get; } = setting;
+
+    private DateTimeOffset? MementoDatetime { get; } = mementoDatetime;
 }
diff --git a/src/AzureAppConfigurationEmulator/Results/KeyValueSetResult.cs b/src/AzureAppConfigurationEmulator/Results/KeyValueSetResult.cs
index af3ccb5..9abab81 100644
--- a/src/AzureAppConfigurationEmulator/Results/KeyValueSetResult.cs
+++ b/src/AzureAppConfigurationEmulator/Results/KeyValueSetResult.cs
@@ -2,7 +2,7 @@
 
 namespace AzureAppConfigurationEmulator.Results;
 
-public class KeyValueSetResult(IEnumerable<ConfigurationSetting> settings) :
+public class KeyValueSetResult(IEnumerable<ConfigurationSetting> settings, DateTimeOffset? mementoDatetime = default) :
     IResult,
     IContentTypeHttpResult,
     IStatusCodeHttpResult,
@@ -11,6 +11,11 @@ public class KeyValueSetResult(IEnumerable<ConfigurationSetting> settings) :
 {
     public async Task ExecuteAsync(HttpContext httpContext)
     {
+        if (MementoDatetime.HasValue)
+        {
+            httpContext.Response.Headers["Memento-Datetime"] = MementoDatetime.Value.ToString("R");
+        }
+
         if (StatusCode.HasValue)
         {
             httpContext.Response.StatusCode = StatusCode.Value;
@@ -26,6 +31,8 @@ public async Task ExecuteAsync(HttpContext httpContext)
     object IValueHttpResult.Value => Value;
 
     public KeyValueSet Value { get; } = new(settings);
+
+    private DateTimeOffset? MementoDatetime { get; } = mementoDatetime;
 }
 
 public record KeyValueSet(IEnumerable<ConfigurationSetting> Items);
diff --git a/src/AzureAppConfigurationEmulator/Results/LabelSetResult.cs b/src/AzureAppConfigurationEmulator/Results/LabelSetResult.cs
index df00599..093ef34 100644
--- a/src/AzureAppConfigurationEmulator/Results/LabelSetResult.cs
+++ b/src/AzureAppConfigurationEmulator/Results/LabelSetResult.cs
@@ -1,6 +1,6 @@
 namespace AzureAppConfigurationEmulator.Results;
 
-public class LabelSetResult(IEnumerable<string?> labels) :
+public class LabelSetResult(IEnumerable<string?> labels, DateTimeOffset? mementoDatetime = default) :
     IResult,
     IContentTypeHttpResult,
     IStatusCodeHttpResult,
@@ -9,6 +9,11 @@ public class LabelSetResult(IEnumerable<string?> labels) :
 {
     public async Task ExecuteAsync(HttpContext httpContext)
     {
+        if (MementoDatetime.HasValue)
+        {
+            httpContext.Response.Headers["Memento-Datetime"] = MementoDatetime.Value.ToString("R");
+        }
+
         if (StatusCode.HasValue)
         {
             httpContext.Response.StatusCode = StatusCode.Value;
@@ -24,6 +29,8 @@ public async Task ExecuteAsync(HttpContext httpContext)
     object IValueHttpResult.Value => Value;
 
     public LabelSet Value { get; } = new(labels.Select(label => new Label(label)));
+
+    private DateTimeOffset? MementoDatetime { get; } = mementoDatetime;
 }
 
 public record LabelSet(IEnumerable<Label> Items);
diff --git a/tests/AzureAppConfigurationEmulator.Tests/Handlers/KeyValueHandlerTests.cs b/tests/AzureAppConfigurationEmulator.Tests/Handlers/KeyValueHandlerTests.cs
index 9893959..eca040a 100644
--- a/tests/AzureAppConfigurationEmulator.Tests/Handlers/KeyValueHandlerTests.cs
+++ b/tests/AzureAppConfigurationEmulator.Tests/Handlers/KeyValueHandlerTests.cs
@@ -1,4 +1,3 @@
-using AzureAppConfigurationEmulator.Constants;
 using AzureAppConfigurationEmulator.Entities;
 using AzureAppConfigurationEmulator.Handlers;
 using AzureAppConfigurationEmulator.Repositories;
@@ -18,9 +17,9 @@ public async Task Delete_KeyValueResult_ExistingConfigurationSetting()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await KeyValueHandler.Delete(repository, "HelloWorld");
@@ -29,7 +28,7 @@ public async Task Delete_KeyValueResult_ExistingConfigurationSetting()
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Delete_KeyValueResult_ExistingConfigurationSettingMatchingIfMatch(string ifMatch)
     {
@@ -37,12 +36,12 @@ public async Task Delete_KeyValueResult_ExistingConfigurationSettingMatchingIfMa
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld", ifMatch: ifMatch);
+        var results = await KeyValueHandler.Delete(repository, "TestKey", ifMatch: ifMatch);
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
@@ -55,12 +54,12 @@ public async Task Delete_KeyValueResult_ExistingConfigurationSettingNonMatchingI
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld", ifNoneMatch: "def");
+        var results = await KeyValueHandler.Delete(repository, "TestKey", ifNoneMatch: "abc");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
@@ -72,10 +71,10 @@ public async Task Delete_NoContentResult_NonExistingConfigurationSetting()
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld");
+        var results = await KeyValueHandler.Delete(repository, "TestKey");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<NoContent>());
@@ -87,10 +86,10 @@ public async Task Delete_NoContentResult_NonExistingConfigurationSettingMatching
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld", ifNoneMatch: "*");
+        var results = await KeyValueHandler.Delete(repository, "TestKey", ifNoneMatch: "*");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<NoContent>());
@@ -102,16 +101,16 @@ public async Task Delete_NoContentResult_NonExistingConfigurationSettingNonMatch
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld", ifMatch: "abc");
+        var results = await KeyValueHandler.Delete(repository, "TestKey", ifMatch: "TestEtag");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<NoContent>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Delete_PreconditionFailedResult_ExistingConfigurationSettingMatchingIfNoneMatch(string ifNoneMatch)
     {
@@ -119,12 +118,12 @@ public async Task Delete_PreconditionFailedResult_ExistingConfigurationSettingMa
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld", ifNoneMatch: ifNoneMatch);
+        var results = await KeyValueHandler.Delete(repository, "TestKey", ifNoneMatch: ifNoneMatch);
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<PreconditionFailedResult>());
@@ -137,12 +136,12 @@ public async Task Delete_PreconditionFailedResult_ExistingConfigurationSettingNo
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld", ifMatch: "def");
+        var results = await KeyValueHandler.Delete(repository, "TestKey", ifMatch: "abc");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<PreconditionFailedResult>());
@@ -154,10 +153,10 @@ public async Task Delete_PreconditionFailedResult_NonExistingConfigurationSettin
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld", ifNoneMatch: "abc");
+        var results = await KeyValueHandler.Delete(repository, "TestKey", ifNoneMatch: "TestEtag");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<PreconditionFailedResult>());
@@ -169,10 +168,10 @@ public async Task Delete_PreconditionFailedResult_NonExistingConfigurationSettin
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld", ifMatch: "*");
+        var results = await KeyValueHandler.Delete(repository, "TestKey", ifMatch: "*");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<PreconditionFailedResult>());
@@ -185,12 +184,12 @@ public async Task Delete_ReadOnlyResult_LockedConfigurationSetting()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, true, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, true, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Delete(repository, "HelloWorld");
+        var results = await KeyValueHandler.Delete(repository, "TestKey");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<ReadOnlyResult>());
@@ -203,18 +202,18 @@ public async Task Get_KeyValueResult_ExistingConfigurationSetting()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Get(repository, "HelloWorld");
+        var results = await KeyValueHandler.Get(repository, "TestKey");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Get_KeyValueResult_ExistingConfigurationSettingMatchingIfMatch(string ifMatch)
     {
@@ -222,12 +221,12 @@ public async Task Get_KeyValueResult_ExistingConfigurationSettingMatchingIfMatch
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Get(repository, "HelloWorld", ifMatch: ifMatch);
+        var results = await KeyValueHandler.Get(repository, "TestKey", ifMatch: ifMatch);
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
@@ -240,12 +239,12 @@ public async Task Get_KeyValueResult_ExistingConfigurationSettingNonMatchingIfNo
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Get(repository, "HelloWorld", ifNoneMatch: "def");
+        var results = await KeyValueHandler.Get(repository, "TestKey", ifNoneMatch: "abc");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
@@ -257,10 +256,10 @@ public async Task Get_NotFoundResult_NonExistingConfigurationSetting()
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Get(repository, "HelloWorld");
+        var results = await KeyValueHandler.Get(repository, "TestKey");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<NotFound>());
@@ -272,10 +271,10 @@ public async Task Get_NotFoundResult_NonExistingConfigurationSettingMatchingIfNo
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Get(repository, "HelloWorld", ifNoneMatch: "abc");
+        var results = await KeyValueHandler.Get(repository, "TestKey", ifNoneMatch: "TestEtag");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<NotFound>());
@@ -287,16 +286,16 @@ public async Task Get_NotFoundResult_NonExistingConfigurationSettingNonMatchingI
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Get(repository, "HelloWorld", ifMatch: "*");
+        var results = await KeyValueHandler.Get(repository, "TestKey", ifMatch: "*");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<NotFound>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Get_NotModifiedResult_ExistingConfigurationSettingMatchingIfNoneMatch(string ifNoneMatch)
     {
@@ -304,12 +303,12 @@ public async Task Get_NotModifiedResult_ExistingConfigurationSettingMatchingIfNo
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Get(repository, "HelloWorld", ifNoneMatch: ifNoneMatch);
+        var results = await KeyValueHandler.Get(repository, "TestKey", ifNoneMatch: ifNoneMatch);
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<NotModifiedResult>());
@@ -322,12 +321,12 @@ public async Task Get_PreconditionFailedResult_ExistingConfigurationSettingNonMa
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
-        var results = await KeyValueHandler.Get(repository, "HelloWorld", ifMatch: "def");
+        var results = await KeyValueHandler.Get(repository, "TestKey", ifMatch: "abc");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<PreconditionFailedResult>());
@@ -340,19 +339,19 @@ public async Task Set_KeyValueResult_ExistingConfigurationSetting()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld");
+        var results = await KeyValueHandler.Set(repository, input, "TestKey");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Set_KeyValueResult_ExistingConfigurationSettingMatchingIfMatch(string ifMatch)
     {
@@ -360,13 +359,13 @@ public async Task Set_KeyValueResult_ExistingConfigurationSettingMatchingIfMatch
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld", ifMatch: ifMatch);
+        var results = await KeyValueHandler.Set(repository, input, "TestKey", ifMatch: ifMatch);
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
@@ -379,13 +378,13 @@ public async Task Set_KeyValueResult_ExistingConfigurationSettingNonMatchingIfNo
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld", ifNoneMatch: "def");
+        var results = await KeyValueHandler.Set(repository, input, "TestKey", ifNoneMatch: "abc");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
@@ -397,11 +396,11 @@ public async Task Set_KeyValueResult_NonExistingConfigurationSetting()
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld");
+        var results = await KeyValueHandler.Set(repository, input, "TestKey");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
@@ -413,11 +412,11 @@ public async Task Set_KeyValueResult_NonExistingConfigurationSettingMatchingIfNo
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld", ifNoneMatch: "*");
+        var results = await KeyValueHandler.Set(repository, input, "TestKey", ifNoneMatch: "*");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
@@ -429,17 +428,17 @@ public async Task Set_KeyValueResult_NonExistingConfigurationSettingNonMatchingI
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld", ifMatch: "abc");
+        var results = await KeyValueHandler.Set(repository, input, "TestKey", ifMatch: "TestEtag");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Set_PreconditionFailedResult_ExistingConfigurationSettingMatchingIfNoneMatch(string ifNoneMatch)
     {
@@ -447,13 +446,13 @@ public async Task Set_PreconditionFailedResult_ExistingConfigurationSettingMatch
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld", ifNoneMatch: ifNoneMatch);
+        var results = await KeyValueHandler.Set(repository, input, "TestKey", ifNoneMatch: ifNoneMatch);
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<PreconditionFailedResult>());
@@ -466,13 +465,13 @@ public async Task Set_PreconditionFailedResult_ExistingConfigurationSettingNonMa
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld", ifMatch: "def");
+        var results = await KeyValueHandler.Set(repository, input, "TestKey", ifMatch: "abc");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<PreconditionFailedResult>());
@@ -484,11 +483,11 @@ public async Task Set_PreconditionFailedResult_NonExistingConfigurationSettingMa
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld", ifNoneMatch: "abc");
+        var results = await KeyValueHandler.Set(repository, input, "TestKey", ifNoneMatch: "TestEtag");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<PreconditionFailedResult>());
@@ -500,11 +499,11 @@ public async Task Set_PreconditionFailedResult_NonExistingConfigurationSettingNo
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld", ifMatch: "*");
+        var results = await KeyValueHandler.Set(repository, input, "TestKey", ifMatch: "*");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<PreconditionFailedResult>());
@@ -517,13 +516,13 @@ public async Task Set_ReadOnlyResult_LockedConfigurationSetting()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, true, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, true, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var input = new KeyValueHandler.SetInput(null, null, null);
-        var results = await KeyValueHandler.Set(repository, input, "HelloWorld");
+        var results = await KeyValueHandler.Set(repository, input, "TestKey");
 
         // Assert
         Assert.That(results.Result, Is.TypeOf<ReadOnlyResult>());
diff --git a/tests/AzureAppConfigurationEmulator.Tests/Handlers/LockHandlerTests.cs b/tests/AzureAppConfigurationEmulator.Tests/Handlers/LockHandlerTests.cs
index 34701b6..6318cd5 100644
--- a/tests/AzureAppConfigurationEmulator.Tests/Handlers/LockHandlerTests.cs
+++ b/tests/AzureAppConfigurationEmulator.Tests/Handlers/LockHandlerTests.cs
@@ -1,4 +1,3 @@
-using AzureAppConfigurationEmulator.Constants;
 using AzureAppConfigurationEmulator.Entities;
 using AzureAppConfigurationEmulator.Handlers;
 using AzureAppConfigurationEmulator.Repositories;
@@ -18,9 +17,9 @@ public async Task Lock_KeyValueResult_ExistingConfigurationSetting()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string?>(), Arg.Any<string?>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Lock(repository, "HelloWorld");
@@ -29,7 +28,7 @@ public async Task Lock_KeyValueResult_ExistingConfigurationSetting()
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Lock_KeyValueResult_MatchingIfMatch(string ifMatch)
     {
@@ -37,9 +36,9 @@ public async Task Lock_KeyValueResult_MatchingIfMatch(string ifMatch)
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Lock(repository, "HelloWorld", ifMatch: ifMatch);
@@ -55,9 +54,9 @@ public async Task Lock_KeyValueResult_NonMatchingIfNoneMatch()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Lock(repository, "HelloWorld", ifNoneMatch: "def");
@@ -72,7 +71,7 @@ public async Task Lock_NotFoundResult_NonExistingConfigurationSetting()
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Lock(repository, "HelloWorld");
@@ -81,7 +80,7 @@ public async Task Lock_NotFoundResult_NonExistingConfigurationSetting()
         Assert.That(results.Result, Is.TypeOf<NotFound>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Lock_PreconditionFailedResult_MatchingIfNoneMatch(string ifNoneMatch)
     {
@@ -89,9 +88,9 @@ public async Task Lock_PreconditionFailedResult_MatchingIfNoneMatch(string ifNon
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Lock(repository, "HelloWorld", ifNoneMatch: ifNoneMatch);
@@ -107,9 +106,9 @@ public async Task Lock_PreconditionFailedResult_NonMatchingIfMatch()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Lock(repository, "HelloWorld", ifMatch: "def");
@@ -125,9 +124,9 @@ public async Task Unlock_KeyValueResult_ExistingConfigurationSetting()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Unlock(repository, "HelloWorld");
@@ -136,7 +135,7 @@ public async Task Unlock_KeyValueResult_ExistingConfigurationSetting()
         Assert.That(results.Result, Is.TypeOf<KeyValueResult>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Unlock_KeyValueResult_MatchingIfMatch(string ifMatch)
     {
@@ -144,9 +143,9 @@ public async Task Unlock_KeyValueResult_MatchingIfMatch(string ifMatch)
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Unlock(repository, "HelloWorld", ifMatch: ifMatch);
@@ -162,9 +161,9 @@ public async Task Unlock_KeyValueResult_NonMatchingIfNoneMatch()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Unlock(repository, "HelloWorld", ifNoneMatch: "def");
@@ -179,7 +178,7 @@ public async Task Unlock_NotFoundResult_NonExistingConfigurationSetting()
         // Arrange
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = Enumerable.Empty<ConfigurationSetting>();
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Unlock(repository, "HelloWorld");
@@ -188,7 +187,7 @@ public async Task Unlock_NotFoundResult_NonExistingConfigurationSetting()
         Assert.That(results.Result, Is.TypeOf<NotFound>());
     }
 
-    [TestCase("abc")]
+    [TestCase("TestEtag")]
     [TestCase("*")]
     public async Task Unlock_PreconditionFailedResult_MatchingIfNoneMatch(string ifNoneMatch)
     {
@@ -196,9 +195,9 @@ public async Task Unlock_PreconditionFailedResult_MatchingIfNoneMatch(string ifN
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Unlock(repository, "HelloWorld", ifNoneMatch: ifNoneMatch);
@@ -214,9 +213,9 @@ public async Task Unlock_PreconditionFailedResult_NonMatchingIfMatch()
         var repository = Substitute.For<IConfigurationSettingRepository>();
         var settings = new List<ConfigurationSetting>
         {
-            new("abc", "HelloWorld", LabelFilter.Null, null, null, DateTimeOffset.UtcNow, false, null)
+            new("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null)
         };
-        repository.Get(Arg.Any<string>(), Arg.Any<string>()).Returns(settings.ToAsyncEnumerable());
+        repository.Get(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<DateTimeOffset?>(), Arg.Any<CancellationToken>()).Returns(settings.ToAsyncEnumerable());
 
         // Act
         var results = await LockHandler.Unlock(repository, "HelloWorld", ifMatch: "def");
diff --git a/tests/AzureAppConfigurationEmulator.Tests/Repositories/ConfigurationSettingRepositoryTests.cs b/tests/AzureAppConfigurationEmulator.Tests/Repositories/ConfigurationSettingRepositoryTests.cs
index 5f3e75f..7b80c72 100644
--- a/tests/AzureAppConfigurationEmulator.Tests/Repositories/ConfigurationSettingRepositoryTests.cs
+++ b/tests/AzureAppConfigurationEmulator.Tests/Repositories/ConfigurationSettingRepositoryTests.cs
@@ -1,9 +1,9 @@
 using System.Data.Common;
+using AzureAppConfigurationEmulator.Constants;
 using AzureAppConfigurationEmulator.Entities;
 using AzureAppConfigurationEmulator.Factories;
 using AzureAppConfigurationEmulator.Repositories;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 using NSubstitute;
 using NUnit.Framework;
 
@@ -19,22 +19,41 @@ public class ConfigurationSettingRepositoryTests
 
     private IDbParameterFactory ParameterFactory { get; set; }
 
+    private ConfigurationSettingRepository Repository { get; set; }
+
     [SetUp]
     public void SetUp()
     {
         CommandFactory = Substitute.For<IDbCommandFactory>();
         CommandFactory
             .Create(Arg.Any<DbConnection>(), Arg.Any<string?>(), Arg.Any<IEnumerable<DbParameter>?>())
-            .Returns(_ => Substitute.For<DbCommand>());
+            .Returns(_ =>
+            {
+                var command = Substitute.For<DbCommand>();
+
+                command.ExecuteReaderAsync().Returns(_ =>
+                {
+                    var reader = Substitute.For<DbDataReader>();
+                    return reader;
+                });
+
+                return command;
+            });
 
         ConnectionFactory = Substitute.For<IDbConnectionFactory>();
         ConnectionFactory
             .Create()
-            .Returns(_ => Substitute.For<DbConnection>());
+            .Returns(_ =>
+            {
+                var connection = Substitute.For<DbConnection>();
+                return connection;
+            });
 
-        Logger = NullLogger<ConfigurationSettingRepository>.Instance;
+        Logger = Substitute.For<ILogger<ConfigurationSettingRepository>>();
 
         ParameterFactory = Substitute.For<IDbParameterFactory>();
+
+        Repository = new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory);
     }
 
     [Test]
@@ -44,7 +63,7 @@ public async Task AddAsync_CommandText_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).AddAsync(setting);
+        await Repository.AddAsync(setting);
 
         // Assert
         CommandFactory
@@ -63,7 +82,7 @@ public async Task AddAsync_ContentTypeParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, contentType, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).AddAsync(setting);
+        await Repository.AddAsync(setting);
 
         // Assert
         ParameterFactory
@@ -81,7 +100,7 @@ public async Task AddAsync_EtagParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting(etag, "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).AddAsync(setting);
+        await Repository.AddAsync(setting);
 
         // Assert
         ParameterFactory
@@ -99,7 +118,7 @@ public async Task AddAsync_KeyParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", key, null, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).AddAsync(setting);
+        await Repository.AddAsync(setting);
 
         // Assert
         ParameterFactory
@@ -117,7 +136,7 @@ public async Task AddAsync_LabelParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", label, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).AddAsync(setting);
+        await Repository.AddAsync(setting);
 
         // Assert
         ParameterFactory
@@ -135,7 +154,7 @@ public async Task AddAsync_LastModifiedParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, null, null, lastModified, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).AddAsync(setting);
+        await Repository.AddAsync(setting);
 
         // Assert
         ParameterFactory
@@ -153,7 +172,7 @@ public async Task AddAsync_LockedParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, locked, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).AddAsync(setting);
+        await Repository.AddAsync(setting);
 
         // Assert
         ParameterFactory
@@ -171,7 +190,7 @@ public async Task AddAsync_TagsParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, tags);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).AddAsync(setting);
+        await Repository.AddAsync(setting);
 
         // Assert
         ParameterFactory
@@ -189,7 +208,7 @@ public async Task AddAsync_ValueParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, null, value, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).AddAsync(setting);
+        await Repository.AddAsync(setting);
 
         // Assert
         ParameterFactory
@@ -199,6 +218,76 @@ public async Task AddAsync_ValueParameter_ConfigurationSetting()
                 Arg.Is(value));
     }
 
+    [TestCaseSource(nameof(Get_CommandText_KeyAndLabelAndMoment_TestCases))]
+    public async Task Get_CommandText_KeyAndLabelAndMoment(string key, string label, DateTimeOffset? moment, string expected)
+    {
+        // Act
+        await Repository.Get(key, label, moment).ToListAsync();
+
+        // Assert
+        CommandFactory
+            .Received()
+            .Create(
+                Arg.Any<DbConnection>(),
+                Arg.Is($"SELECT etag, key, label, content_type, value, last_modified, locked, tags{expected}"),
+                Arg.Any<IEnumerable<DbParameter>?>());
+    }
+
+    // ReSharper disable once InconsistentNaming
+    private static object[] Get_CommandText_KeyAndLabelAndMoment_TestCases =
+    [
+        new object?[]
+        {
+            KeyFilter.Any, LabelFilter.Any, null,
+            " FROM configuration_settings"
+        },
+        new object?[]
+        {
+            "TestKey", LabelFilter.Any, null,
+            " FROM configuration_settings WHERE (key = $key0)"
+        },
+        new object?[]
+        {
+            "TestKey*", LabelFilter.Any, null,
+            " FROM configuration_settings WHERE (key LIKE $key0)"
+        },
+        new object?[]
+        {
+            "TestKey,TestKey*", LabelFilter.Any, null,
+            " FROM configuration_settings WHERE (key = $key0 OR key LIKE $key1)"
+        },
+        new object?[]
+        {
+            KeyFilter.Any, LabelFilter.Null, null,
+            " FROM configuration_settings WHERE (label IS NULL)"
+        },
+        new object?[]
+        {
+            KeyFilter.Any, "TestLabel", null,
+            " FROM configuration_settings WHERE (label = $label0)"
+        },
+        new object?[]
+        {
+            KeyFilter.Any, "TestLabel*", null,
+            " FROM configuration_settings WHERE (label LIKE $label0)"
+        },
+        new object?[]
+        {
+            KeyFilter.Any, $"{LabelFilter.Null},TestLabel,TestLabel*", null,
+            " FROM configuration_settings WHERE (label IS NULL OR label = $label1 OR label LIKE $label2)"
+        },
+        new object?[]
+        {
+            KeyFilter.Any, LabelFilter.Any, DateTimeOffset.Parse("2023-10-01T00:00:00+00:00"),
+            " FROM configuration_settings_history WHERE (valid_from <= $moment AND valid_to > $moment)"
+        },
+        new object?[]
+        {
+            "TestKey", LabelFilter.Null, DateTimeOffset.Parse("2023-10-01T00:00:00+00:00"),
+            " FROM configuration_settings_history WHERE (key = $key0) AND (label IS NULL) AND (valid_from <= $moment AND valid_to > $moment)"
+        }
+    ];
+
     [TestCase("TestKey", "TestLabel", " WHERE key = $key AND label = $label")]
     [TestCase("TestKey", null, " WHERE key = $key AND label IS NULL")]
     public async Task RemoveAsync_CommandText_ConfigurationSetting(string key, string? label, string expected)
@@ -207,7 +296,7 @@ public async Task RemoveAsync_CommandText_ConfigurationSetting(string key, strin
         var setting = new ConfigurationSetting("TestEtag", key, label, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).RemoveAsync(setting);
+        await Repository.RemoveAsync(setting);
 
         // Assert
         CommandFactory
@@ -226,7 +315,7 @@ public async Task RemoveAsync_KeyParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", key, null, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).RemoveAsync(setting);
+        await Repository.RemoveAsync(setting);
 
         // Assert
         ParameterFactory
@@ -244,7 +333,7 @@ public async Task RemoveAsync_LabelParameter_ConfigurationSetting(string? label)
         var setting = new ConfigurationSetting("TestEtag", "TestKey", label, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).RemoveAsync(setting);
+        await Repository.RemoveAsync(setting);
 
         // Assert
         if (label is not null)
@@ -273,7 +362,7 @@ public async Task UpdateAsync_CommandText_ConfigurationSetting(string key, strin
         var setting = new ConfigurationSetting("TestEtag", key, label, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).UpdateAsync(setting);
+        await Repository.UpdateAsync(setting);
 
         // Assert
         CommandFactory
@@ -292,7 +381,7 @@ public async Task UpdateAsync_ContentTypeParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, contentType, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).UpdateAsync(setting);
+        await Repository.UpdateAsync(setting);
 
         // Assert
         ParameterFactory
@@ -310,7 +399,7 @@ public async Task UpdateAsync_EtagParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting(etag, "TestKey", null, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).UpdateAsync(setting);
+        await Repository.UpdateAsync(setting);
 
         // Assert
         ParameterFactory
@@ -328,7 +417,7 @@ public async Task UpdateAsync_KeyParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", key, null, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).UpdateAsync(setting);
+        await Repository.UpdateAsync(setting);
 
         // Assert
         ParameterFactory
@@ -346,7 +435,7 @@ public async Task UpdateAsync_LabelParameter_ConfigurationSetting(string? label)
         var setting = new ConfigurationSetting("TestEtag", "TestKey", label, null, null, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).UpdateAsync(setting);
+        await Repository.UpdateAsync(setting);
 
         // Assert
         if (label is not null)
@@ -375,7 +464,7 @@ public async Task UpdateAsync_LastModifiedParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, null, null, lastModified, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).UpdateAsync(setting);
+        await Repository.UpdateAsync(setting);
 
         // Assert
         ParameterFactory
@@ -393,7 +482,7 @@ public async Task UpdateAsync_LockedParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, locked, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).UpdateAsync(setting);
+        await Repository.UpdateAsync(setting);
 
         // Assert
         ParameterFactory
@@ -411,7 +500,7 @@ public async Task UpdateAsync_TagsParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, null, null, DateTimeOffset.UtcNow, false, tags);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).UpdateAsync(setting);
+        await Repository.UpdateAsync(setting);
 
         // Assert
         ParameterFactory
@@ -429,7 +518,7 @@ public async Task UpdateAsync_ValueParameter_ConfigurationSetting()
         var setting = new ConfigurationSetting("TestEtag", "TestKey", null, null, value, DateTimeOffset.UtcNow, false, null);
 
         // Act
-        await new ConfigurationSettingRepository(CommandFactory, ConnectionFactory, Logger, ParameterFactory).UpdateAsync(setting);
+        await Repository.UpdateAsync(setting);
 
         // Assert
         ParameterFactory