diff --git a/Application/Application.csproj b/Application/Application.csproj
index cde91d6..cfe5605 100644
--- a/Application/Application.csproj
+++ b/Application/Application.csproj
@@ -9,8 +9,12 @@
 
   <ItemGroup>
     <PackageReference Include="Ardalis.Result" Version="10.1.0" />
-    <PackageReference Include="DispatchR.Mediator" Version="2.1.1" />
     <PackageReference Include="MassTransit" Version="9.0.1" />
+    <PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
+    <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.5" />
diff --git a/Application/PlayLists/Commands/CreatePlayListCommand.cs b/Application/PlayLists/Commands/CreatePlayListCommand.cs
index cda4122..5b6bdbb 100644
--- a/Application/PlayLists/Commands/CreatePlayListCommand.cs
+++ b/Application/PlayLists/Commands/CreatePlayListCommand.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Application;
 using Musify.Application.PlayLists.Responses;
 using Musify.Domain.Entities;
@@ -11,7 +11,7 @@ namespace Musify.Application.PlayLists.Commands
         string Name,
         string Description,
         IFileData? Picture)
-        : IRequest<CreatePlayListCommand, Task<Result<PlayListResponse>> >
+        : ICommand<Result<PlayListResponse>>
     {
         public static PlayList ToEntity(CreatePlayListCommand command, string originalKey, string smallKey, string mediumKey, string largeKey)
         {
diff --git a/Application/PlayLists/Commands/DeletePlayListCommand.cs b/Application/PlayLists/Commands/DeletePlayListCommand.cs
index d4fd556..c695479 100644
--- a/Application/PlayLists/Commands/DeletePlayListCommand.cs
+++ b/Application/PlayLists/Commands/DeletePlayListCommand.cs
@@ -1,8 +1,8 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 
 namespace Musify.Application.PlayLists.Commands
 {
     public record DeletePlayListCommand(Guid UserId, Guid PlayListId)
-        : IRequest<DeletePlayListCommand, Task<Result> >;
+        : ICommand<Result>;
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Commands/UpdatePlayListCommand.cs b/Application/PlayLists/Commands/UpdatePlayListCommand.cs
index 32442ef..3aac73c 100644
--- a/Application/PlayLists/Commands/UpdatePlayListCommand.cs
+++ b/Application/PlayLists/Commands/UpdatePlayListCommand.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Application;
 using Musify.Application.PlayLists.Responses;
 
@@ -11,5 +11,5 @@ namespace Musify.Application.PlayLists.Commands
         string? NewName,
         string? NewDescription,
         IFileData? NewPicture)
-        : IRequest<UpdatePlayListCommand, Task<Result<PlayListResponse>> >;
+        : ICommand<Result<PlayListResponse>>;
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
index bb0fb85..51e37d9 100644
--- a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
+++ b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
@@ -14,9 +14,9 @@ namespace Musify.Application.PlayLists.Handlers
 {
     public class CreatePlayListCommandHandler(IEventBus eventBus, IDatabase database, IStorageService storageHandler,
         ILogger<CreatePlayListCommandHandler> logger, ApplicationStorageConfiguration storageConfiguration, PlayListConfiguration playListConfiguration)
-        : IRequestHandler<CreatePlayListCommand, Task<Result<PlayListResponse>> >
+        : ICommandHandler<CreatePlayListCommand, Result<PlayListResponse>> 
     {
-        public async Task<Result<PlayListResponse>> Handle(CreatePlayListCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PlayListResponse>> Handle(CreatePlayListCommand request, CancellationToken cancellationToken)
         {
             var userExists = await database.Users.AnyAsync(u => u.Id == request.UserId, cancellationToken);
             if (!userExists)
diff --git a/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs b/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs
index 47c33fb..48e634a 100644
--- a/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs
+++ b/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
 using Musify.Application.Contracts.Infrastructure;
@@ -10,9 +10,9 @@ namespace Musify.Application.PlayLists.Handlers
 {
     public class DeletePlayListCommandHandler(IDatabase database, IEventBus eventBus,
         ApplicationStorageConfiguration storageConfiguration, PlayListConfiguration playListConfiguration, ILogger<DeletePlayListCommandHandler> logger)
-        : IRequestHandler<DeletePlayListCommand, Task<Result>>
+        : ICommandHandler<DeletePlayListCommand, Result>
     {
-        public async Task<Result> Handle(DeletePlayListCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result> Handle(DeletePlayListCommand request, CancellationToken cancellationToken)
         {
             var playList = await database.PlayLists.FindAsync(
                 [request.PlayListId],
diff --git a/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs
index d007186..d8558f6 100644
--- a/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs
+++ b/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs
@@ -1,16 +1,16 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
+using Mediator;
 
 namespace Musify.Application.PlayLists.Handlers
 {
     public class GetPlayListByIdQueryHandler(IDatabase database)
-        : IRequestHandler<GetPlayListByIdQuery, Task<Result<PlayListResponse>> >
+        : IQueryHandler<GetPlayListByIdQuery, Result<PlayListResponse>>
     {
-        public async Task<Result<PlayListResponse>> Handle(GetPlayListByIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PlayListResponse>> Handle(GetPlayListByIdQuery request, CancellationToken cancellationToken)
         {
             var playList = await database.PlayLists
                 .AsNoTracking()
diff --git a/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs
index 18c1fda..29ea4cf 100644
--- a/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs
+++ b/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs
@@ -1,18 +1,18 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using X.PagedList.EF;
+using Mediator;
 
 namespace Musify.Application.PlayLists.Handlers
 {
     public class GetPlayListsByUserIdQueryHandler(IDatabase database)
-        : IRequestHandler<GetPlayListsByUserIdQuery, Task<Result<PaginatedResponse<PlayListResponse> > >>
+        : IQueryHandler<GetPlayListsByUserIdQuery, Result<PaginatedResponse<PlayListResponse> > >
     {
-        public async Task<Result<PaginatedResponse<PlayListResponse> >> Handle(GetPlayListsByUserIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<PlayListResponse> >> Handle(GetPlayListsByUserIdQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
diff --git a/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs
index 8cb758e..308d32b 100644
--- a/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs
+++ b/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs
@@ -1,18 +1,18 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using X.PagedList.EF;
+using Mediator;
 
 namespace Musify.Application.PlayLists.Handlers
 {
     public class GetPlayListsQueryHandler(IDatabase database)
-        : IRequestHandler<GetPlayListsQuery, Task<Result<PaginatedResponse<PlayListResponse> >> >
+        : IQueryHandler<GetPlayListsQuery, Result<PaginatedResponse<PlayListResponse> >>
     {
-        public async Task<Result<PaginatedResponse<PlayListResponse> >> Handle(GetPlayListsQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<PlayListResponse> >> Handle(GetPlayListsQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
diff --git a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
index 06182a6..70bfa21 100644
--- a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
+++ b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
 using Musify.Application.Contracts.Application;
@@ -14,9 +14,9 @@ namespace Musify.Application.PlayLists.Handlers
     public class UpdatePlayListCommandHandler(IEventBus eventBus, IDatabase database, IStorageService storageHandler,
         ILogger<UpdatePlayListCommandHandler> logger, ApplicationStorageConfiguration storageConfiguration,
         PlayListConfiguration playListConfiguration)
-        : IRequestHandler<UpdatePlayListCommand, Task<Result<PlayListResponse>> >
+        : ICommandHandler<UpdatePlayListCommand, Result<PlayListResponse>>
     {
-        public async Task<Result<PlayListResponse>> Handle(UpdatePlayListCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PlayListResponse>> Handle(UpdatePlayListCommand request, CancellationToken cancellationToken)
         {
             var playListEntity = await database.PlayLists.FindAsync(
                 [request.PlayListId],
diff --git a/Application/PlayLists/Queries/GetPlayListByIdQuery.cs b/Application/PlayLists/Queries/GetPlayListByIdQuery.cs
index 4bf4360..27cc8c0 100644
--- a/Application/PlayLists/Queries/GetPlayListByIdQuery.cs
+++ b/Application/PlayLists/Queries/GetPlayListByIdQuery.cs
@@ -1,9 +1,9 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.PlayLists.Responses;
 
 namespace Musify.Application.PlayLists.Queries
 {
     public record GetPlayListByIdQuery(Guid Id)
-        : IRequest<GetPlayListByIdQuery, Task<Result<PlayListResponse>>>;
+        : IQuery<Result<PlayListResponse>>;
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs b/Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs
index 5610553..c745a09 100644
--- a/Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs
+++ b/Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Application;
 using Musify.Application.PlayLists.Responses;
 
@@ -10,5 +10,5 @@ namespace Musify.Application.PlayLists.Queries
         string Name = "",
         int PageNumber = 1,
         int PageSize = 10)
-        : IRequest<GetPlayListsByUserIdQuery, Task<Result<PaginatedResponse<PlayListResponse>> >>;
+        : IQuery<Result<PaginatedResponse<PlayListResponse>> >;
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Queries/GetPlayListsQuery.cs b/Application/PlayLists/Queries/GetPlayListsQuery.cs
index 9764acd..c8ae5de 100644
--- a/Application/PlayLists/Queries/GetPlayListsQuery.cs
+++ b/Application/PlayLists/Queries/GetPlayListsQuery.cs
@@ -1,10 +1,10 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Application;
 using Musify.Application.PlayLists.Responses;
 
 namespace Musify.Application.PlayLists.Queries
 {
     public record GetPlayListsQuery(int PageNumber = 1, int PageSize = 10)
-        : IRequest<GetPlayListsQuery, Task<Result<PaginatedResponse<PlayListResponse>> >>;
+        : IQuery<Result<PaginatedResponse<PlayListResponse>> >;
 }
\ No newline at end of file
diff --git a/Application/Tracks/Commands/CreateTrackCommand.cs b/Application/Tracks/Commands/CreateTrackCommand.cs
index fc762cd..cc65340 100644
--- a/Application/Tracks/Commands/CreateTrackCommand.cs
+++ b/Application/Tracks/Commands/CreateTrackCommand.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Tracks.Responses;
 using Musify.Domain.Entities;
@@ -11,7 +11,7 @@ namespace Musify.Application.Tracks.Commands
         string Title,
         IFileData Picture,
         IFileData Audio)
-        : IRequest<CreateTrackCommand, Task<Result<TrackResponse> >>
+        : ICommand<Result<TrackResponse> >
     {
         public static Track ToEntity(CreateTrackCommand command, string smallPictureName, string mediumPictureName, string largePictureName)
         {
diff --git a/Application/Tracks/Commands/DeleteTrackCommand.cs b/Application/Tracks/Commands/DeleteTrackCommand.cs
index 5351410..6d7615f 100644
--- a/Application/Tracks/Commands/DeleteTrackCommand.cs
+++ b/Application/Tracks/Commands/DeleteTrackCommand.cs
@@ -1,10 +1,10 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 
 namespace Musify.Application.Tracks.Commands
 {
     public record DeleteTrackCommand(
         Guid UserId,
         Guid TrackId)
-        : IRequest<DeleteTrackCommand, Task<Result>>;
+        : ICommand<Result>;
 }
\ No newline at end of file
diff --git a/Application/Tracks/Handler/CreateTrackCommandHandler.cs b/Application/Tracks/Handler/CreateTrackCommandHandler.cs
index 8274e0e..1a3a86f 100644
--- a/Application/Tracks/Handler/CreateTrackCommandHandler.cs
+++ b/Application/Tracks/Handler/CreateTrackCommandHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
 using Musify.Application.Contracts.Infrastructure;
@@ -12,9 +12,9 @@ namespace Musify.Application.Tracks.Handler
 {
     public class CreateTrackCommandHandler(IDatabase database, IEventBus eventBus, IStorageService storageHandler,
         ILogger<CreateTrackCommandHandler> logger, ApplicationStorageConfiguration storageConfiguration, TrackConfiguration trackConfiguration)
-        : IRequestHandler<CreateTrackCommand, Task<Result<TrackResponse> >>
+        : ICommandHandler<CreateTrackCommand, Result<TrackResponse> >
     {
-        public async Task<Result<TrackResponse>> Handle(CreateTrackCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result<TrackResponse>> Handle(CreateTrackCommand request, CancellationToken cancellationToken)
         {
             var userExists = await database.Users.FindAsync(request.UserId, cancellationToken);
             if (userExists is null)
diff --git a/Application/Tracks/Handler/DeleteTrackCommandHandler.cs b/Application/Tracks/Handler/DeleteTrackCommandHandler.cs
index 599fa2a..5cc943e 100644
--- a/Application/Tracks/Handler/DeleteTrackCommandHandler.cs
+++ b/Application/Tracks/Handler/DeleteTrackCommandHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
 using Musify.Application.Contracts.Infrastructure;
@@ -10,9 +10,9 @@ namespace Musify.Application.Tracks.Handler
 {
     public class DeleteTrackCommandHandler(IDatabase database, IStorageService storageHandler, ILogger<DeleteTrackCommandHandler> logger,
         TrackConfiguration trackConfiguration, ApplicationStorageConfiguration storageConfiguration)
-        : IRequestHandler<DeleteTrackCommand, Task<Result>>
+        : ICommandHandler<DeleteTrackCommand, Result>
     {
-        public async Task<Result> Handle(DeleteTrackCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result> Handle(DeleteTrackCommand request, CancellationToken cancellationToken)
         {
             var track = await database.Tracks.FindAsync(request.TrackId, cancellationToken);
             if (track is null)
diff --git a/Application/Tracks/Handler/GetTrackByIdQueryHandler.cs b/Application/Tracks/Handler/GetTrackByIdQueryHandler.cs
index c0d4b2e..2d4172b 100644
--- a/Application/Tracks/Handler/GetTrackByIdQueryHandler.cs
+++ b/Application/Tracks/Handler/GetTrackByIdQueryHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
@@ -7,9 +7,9 @@ using Musify.Application.Tracks.Responses;
 namespace Musify.Application.Tracks.Handler
 {
     public class GetTrackByIdQueryHandler(IDatabase database)
-        : IRequestHandler<GetTrackByIdQuery, Task<Result<TrackResponse> >>
+        : IQueryHandler<GetTrackByIdQuery, Result<TrackResponse> >
     {
-        public async Task<Result<TrackResponse>> Handle(GetTrackByIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<TrackResponse>> Handle(GetTrackByIdQuery request, CancellationToken cancellationToken)
         {
             var track = await database.Tracks.FindAsync(request.TrackId);
 
diff --git a/Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs b/Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs
index 4dd81b8..54b8973 100644
--- a/Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs
+++ b/Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Contracts.Infrastructure;
@@ -10,9 +10,9 @@ using X.PagedList.EF;
 namespace Musify.Application.Tracks.Handler
 {
     public class GetTracksByUserIdQueryHandler(IDatabase database)
-        : IRequestHandler<GetTracksByUserIdQuery, Task<Result<PaginatedResponse<TrackResponse>> >>
+        : IQueryHandler<GetTracksByUserIdQuery, Result<PaginatedResponse<TrackResponse>> >
     {
-        public async Task<Result<PaginatedResponse<TrackResponse> >> Handle(GetTracksByUserIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<TrackResponse> >> Handle(GetTracksByUserIdQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
diff --git a/Application/Tracks/Handler/GetTracksQueryHandler.cs b/Application/Tracks/Handler/GetTracksQueryHandler.cs
index 59e43e3..7cc21cb 100644
--- a/Application/Tracks/Handler/GetTracksQueryHandler.cs
+++ b/Application/Tracks/Handler/GetTracksQueryHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Contracts.Infrastructure;
@@ -10,9 +10,9 @@ using X.PagedList.EF;
 namespace Musify.Application.Tracks.Handler
 {
     public class GetTracksQueryHandler(IDatabase database)
-        : IRequestHandler<GetTracksQuery, Task<Result<PaginatedResponse<TrackResponse>> > >
+        : IQueryHandler<GetTracksQuery, Result<PaginatedResponse<TrackResponse>> >
     {
-        public async Task<Result<PaginatedResponse<TrackResponse> >> Handle(GetTracksQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<TrackResponse> >> Handle(GetTracksQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
diff --git a/Application/Tracks/Queries/GetTrackByIdQuery.cs b/Application/Tracks/Queries/GetTrackByIdQuery.cs
index 1008b99..97a6ee6 100644
--- a/Application/Tracks/Queries/GetTrackByIdQuery.cs
+++ b/Application/Tracks/Queries/GetTrackByIdQuery.cs
@@ -1,9 +1,9 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Tracks.Responses;
 
 namespace Musify.Application.Tracks.Queries
 {
     public record GetTrackByIdQuery(Guid TrackId)
-        : IRequest<GetTrackByIdQuery, Task<Result<TrackResponse> >>;
+        : IQuery<Result<TrackResponse>>;
 }
\ No newline at end of file
diff --git a/Application/Tracks/Queries/GetTracksByUserIdQuery.cs b/Application/Tracks/Queries/GetTracksByUserIdQuery.cs
index 25afa9f..240cbbf 100644
--- a/Application/Tracks/Queries/GetTracksByUserIdQuery.cs
+++ b/Application/Tracks/Queries/GetTracksByUserIdQuery.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Tracks.Responses;
 
@@ -10,5 +10,5 @@ namespace Musify.Application.Tracks.Queries
         string Name = "",
         int PageNumber = 1,
         int PageSize = 10)
-        : IRequest<GetTracksByUserIdQuery, Task<Result<PaginatedResponse<TrackResponse> > >>;
+        : IQuery<Result<PaginatedResponse<TrackResponse> > >;
 }
\ No newline at end of file
diff --git a/Application/Tracks/Queries/GetTracksQuery.cs b/Application/Tracks/Queries/GetTracksQuery.cs
index 3a10860..d67698b 100644
--- a/Application/Tracks/Queries/GetTracksQuery.cs
+++ b/Application/Tracks/Queries/GetTracksQuery.cs
@@ -1,10 +1,10 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Tracks.Responses;
 
 namespace Musify.Application.Tracks.Queries
 {
     public record GetTracksQuery(int PageNumber = 1, int PageSize = 10)
-        : IRequest<GetTracksQuery, Task<Result<PaginatedResponse<TrackResponse> >> >;
+        : IQuery<Result<PaginatedResponse<TrackResponse> >>;
 }
\ No newline at end of file
diff --git a/Application/Users/Commands/CreateUserCommand.cs b/Application/Users/Commands/CreateUserCommand.cs
index fcc77b7..2f7d89b 100644
--- a/Application/Users/Commands/CreateUserCommand.cs
+++ b/Application/Users/Commands/CreateUserCommand.cs
@@ -1,12 +1,12 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Users.Responses;
 using Musify.Domain.Entities;
 
 namespace Musify.Application.Users.Commands
 {
     public record CreateUserCommand(Guid Id)
-        : IRequest<CreateUserCommand, Task<Result<UserResponse>> >
+        : ICommand<Result<UserResponse>>
     {
         public static User ToEntity(CreateUserCommand command)
         {
diff --git a/Application/Users/Commands/DeleteUserCommand.cs b/Application/Users/Commands/DeleteUserCommand.cs
index 2773d0a..5a64998 100644
--- a/Application/Users/Commands/DeleteUserCommand.cs
+++ b/Application/Users/Commands/DeleteUserCommand.cs
@@ -1,8 +1,8 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 
 namespace Musify.Application.Users.Commands
 {
     public record DeleteUserCommand(Guid Id)
-        : IRequest<DeleteUserCommand, Task<Result>>;
+        : ICommand<Result>;
 }
\ No newline at end of file
diff --git a/Application/Users/Handlers/CreateUserCommandHandler.cs b/Application/Users/Handlers/CreateUserCommandHandler.cs
index fab1b64..aae7176 100644
--- a/Application/Users/Handlers/CreateUserCommandHandler.cs
+++ b/Application/Users/Handlers/CreateUserCommandHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts.Infrastructure;
@@ -9,9 +9,9 @@ using Musify.Application.Users.Responses;
 namespace Musify.Application.Users.Handlers
 {
     public class CreateUserCommandHandler(IDatabase database, IKeycloakUserService keycloakUserClient, ILogger<CreateUserCommandHandler> logger)
-        : IRequestHandler<CreateUserCommand, Task<Result<UserResponse> >>
+        : ICommandHandler<CreateUserCommand, Result<UserResponse> >
     {
-        public async Task<Result<UserResponse>> Handle(CreateUserCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result<UserResponse>> Handle(CreateUserCommand request, CancellationToken cancellationToken)
         {
             var userExists = await database.Users.AnyAsync(u => u.Id == request.Id, cancellationToken);
             if (userExists)
diff --git a/Application/Users/Handlers/DeleteUserCommandHandler.cs b/Application/Users/Handlers/DeleteUserCommandHandler.cs
index 09b0c94..86d9c62 100644
--- a/Application/Users/Handlers/DeleteUserCommandHandler.cs
+++ b/Application/Users/Handlers/DeleteUserCommandHandler.cs
@@ -1,13 +1,13 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Infrastructure;
 
 namespace Musify.Application.Users.Commands
 {
     public class DeleteUserCommandHandler(IDatabase database)
-        : IRequestHandler<DeleteUserCommand, Task<Result>>
+        : ICommandHandler<DeleteUserCommand, Result>
     {
-        public async Task<Result> Handle(DeleteUserCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result> Handle(DeleteUserCommand request, CancellationToken cancellationToken)
         {
             var existingUser = await database.Users.FindAsync(request.Id, cancellationToken);
             if (existingUser is null)
diff --git a/Application/Users/Handlers/GetUserByIdQueryHandler.cs b/Application/Users/Handlers/GetUserByIdQueryHandler.cs
index 47dd1ce..bc9a311 100644
--- a/Application/Users/Handlers/GetUserByIdQueryHandler.cs
+++ b/Application/Users/Handlers/GetUserByIdQueryHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Users.Queries;
@@ -8,9 +8,9 @@ using Musify.Application.Users.Responses;
 namespace Musify.Application.Users.Handlers
 {
     public class GetUserByIdQueryHandler(IDatabase database, IKeycloakUserService keycloakUserClient)
-        : IRequestHandler<GetUserByIdQuery, Task<Result<UserResponse> >>
+        : IQueryHandler<GetUserByIdQuery, Result<UserResponse> >
     {
-        public async Task<Result<UserResponse>> Handle(GetUserByIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<UserResponse>> Handle(GetUserByIdQuery request, CancellationToken cancellationToken)
         {
             var user = await database.Users
                 .AsNoTracking()
diff --git a/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs b/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs
index b8e59f0..4dbd18b 100644
--- a/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs
+++ b/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Users.Queries;
@@ -8,9 +8,9 @@ using Musify.Application.Users.Responses;
 namespace Musify.Application.Users.Handlers
 {
     public class GetUserByKeycloakQueryHandler(IDatabase database, IKeycloakUserService keycloakUserClient)
-        : IRequestHandler<GetUserByKeycloakQuery, Task<Result<UserResponse> >>
+        : IQueryHandler<GetUserByKeycloakQuery, Result<UserResponse> >
     {
-        public async Task<Result<UserResponse>> Handle(GetUserByKeycloakQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<UserResponse>> Handle(GetUserByKeycloakQuery request, CancellationToken cancellationToken)
         {
             var user = await database.Users
                 .AsNoTracking()
diff --git a/Application/Users/Handlers/GetUsersQueryHandler.cs b/Application/Users/Handlers/GetUsersQueryHandler.cs
index 8c5d856..d52a32e 100644
--- a/Application/Users/Handlers/GetUsersQueryHandler.cs
+++ b/Application/Users/Handlers/GetUsersQueryHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Contracts.Infrastructure;
@@ -11,9 +11,9 @@ using X.PagedList.Extensions;
 namespace Musify.Application.Users.Handlers
 {
     public class GetUsersQueryHandler(IDatabase database, IKeycloakUserService keycloakUserClient)
-        : IRequestHandler<GetUsersQuery, Task<Result<PaginatedResponse<UserResponse> > >>
+        : IQueryHandler<GetUsersQuery, Result<PaginatedResponse<UserResponse> > >
     {
-        public async Task<Result<PaginatedResponse<UserResponse> >> Handle(GetUsersQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<UserResponse> >> Handle(GetUsersQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
diff --git a/Application/Users/Queries/GetUserByIdQuery.cs b/Application/Users/Queries/GetUserByIdQuery.cs
index fbdf6fd..b81c047 100644
--- a/Application/Users/Queries/GetUserByIdQuery.cs
+++ b/Application/Users/Queries/GetUserByIdQuery.cs
@@ -1,9 +1,9 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Queries
 {
     public record GetUserByIdQuery(Guid Id)
-        : IRequest<GetUserByIdQuery, Task<Result<UserResponse> >>;
+        : IQuery<Result<UserResponse> >;
 }
\ No newline at end of file
diff --git a/Application/Users/Queries/GetUserByKeycloakQuery.cs b/Application/Users/Queries/GetUserByKeycloakQuery.cs
index e53d449..4f19a7d 100644
--- a/Application/Users/Queries/GetUserByKeycloakQuery.cs
+++ b/Application/Users/Queries/GetUserByKeycloakQuery.cs
@@ -1,9 +1,9 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Queries
 {
     public record GetUserByKeycloakQuery(Guid Id)
-        : IRequest<GetUserByKeycloakQuery, Task<Result<UserResponse> >>;
+        : IQuery<Result<UserResponse> >;
 }
diff --git a/Application/Users/Queries/GetUsersQuery.cs b/Application/Users/Queries/GetUsersQuery.cs
index 338e01f..62ba046 100644
--- a/Application/Users/Queries/GetUsersQuery.cs
+++ b/Application/Users/Queries/GetUsersQuery.cs
@@ -1,10 +1,10 @@
 using Ardalis.Result;
-using DispatchR.Abstractions.Send;
+using Mediator;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Queries
 {
     public record GetUsersQuery(int PageNumber, int PageSize, string UsernameSearch)
-        : IRequest<GetUsersQuery, Task<Result<PaginatedResponse<UserResponse> >> >;
+        : IQuery<Result<PaginatedResponse<UserResponse> >>;
 }