diff --git a/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj b/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj
index bb178506..6539d461 100644
--- a/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj
+++ b/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj
@@ -22,7 +22,10 @@
 		<PackageReference Include="Dapper" />
 		<PackageReference Include="GoogleReCaptcha.V3" />
 		<PackageReference Include="Mediator.Abstractions" />
-		<PackageReference Include="Mediator.SourceGenerator" />
+		<PackageReference Include="Mediator.SourceGenerator">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
 		<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />
diff --git a/tests/DevBetterWeb.FunctionalTests/NoOpMediator.cs b/tests/DevBetterWeb.FunctionalTests/NoOpMediator.cs
index 79e38f58..7ece7996 100644
--- a/tests/DevBetterWeb.FunctionalTests/NoOpMediator.cs
+++ b/tests/DevBetterWeb.FunctionalTests/NoOpMediator.cs
@@ -12,33 +12,48 @@ public IAsyncEnumerable<TResponse> CreateStream<TResponse>(IStreamRequest<TRespo
 		throw new System.NotImplementedException();
 	}
 
+	public IAsyncEnumerable<TResponse> CreateStream<TResponse>(IStreamQuery<TResponse> request, CancellationToken cancellationToken = default)
+	{
+		throw new System.NotImplementedException();
+	}
+
+	public IAsyncEnumerable<TResponse> CreateStream<TResponse>(IStreamCommand<TResponse> request, CancellationToken cancellationToken = default)
+	{
+		throw new System.NotImplementedException();
+	}
+
 	public IAsyncEnumerable<object> CreateStream(object request, CancellationToken cancellationToken = default)
 	{
 		throw new System.NotImplementedException();
 	}
 
-	public Task Publish(object notification, CancellationToken cancellationToken = default)
+	public ValueTask Publish(object notification, CancellationToken cancellationToken = default)
+	{
+		return ValueTask.CompletedTask;
+	}
+
+	public ValueTask Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default) where TNotification : INotification
 	{
-		return Task.CompletedTask;
+		return ValueTask.CompletedTask;
 	}
 
-	public Task Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default) where TNotification : INotification
+	public ValueTask<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default)
 	{
-		return Task.CompletedTask;
+		return ValueTask.FromResult<TResponse>(default!);
 	}
 
-	public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default)
+	public ValueTask<TResponse> Send<TResponse>(ICommand<TResponse> request, CancellationToken cancellationToken = default)
 	{
-		return Task.FromResult<TResponse>(default);
+		return ValueTask.FromResult<TResponse>(default!);
 	}
 
-	public Task Send<TRequest>(TRequest request, CancellationToken cancellationToken = default) where TRequest : IRequest
+	public ValueTask<TResponse> Send<TResponse>(IQuery<TResponse> request, CancellationToken cancellationToken = default)
 	{
-		return Task.CompletedTask;
+		return ValueTask.FromResult<TResponse>(default!);
 	}
 
-	public Task<object> Send(object request, CancellationToken cancellationToken = default)
+	public ValueTask<object> Send(object request, CancellationToken cancellationToken = default)
 	{
-		return Task.FromResult<object>(default);
+		return ValueTask.FromResult<object>(default!);
 	}
 }