diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
index 44327d79b..ba0bee30f 100644
--- a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
+++ b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
@@ -1,6 +1,6 @@
 namespace FilterLists.Directory.Api.Contracts.Models;
 
-public class ListDetailsVm
+public record ListDetailsVm
 {
     public int Id { get; init; }
     public string Name { get; init; } = null!;
@@ -27,7 +27,7 @@ public class ListDetailsVm
     public IEnumerable<int>? DependencyFilterListIds { get; init; }
     public IEnumerable<int>? DependentFilterListIds { get; init; }
 
-    public class ViewUrlVm
+    public record ViewUrlVm
     {
         public short SegmentNumber { get; init; }
         public short Primariness { get; init; }
diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs
index 1fda98f36..c07ed4a64 100644
--- a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs
+++ b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs
@@ -1,6 +1,6 @@
 namespace FilterLists.Directory.Api.Contracts.Models;
 
-public class ListVm
+public record ListVm
 {
     public int Id { get; init; }
     public string Name { get; init; } = null!;
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
index ea1017b1c..8cd107658 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
@@ -9,9 +9,7 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetLanguages
 {
-    public class Query : IRequest<List<LanguageVm>>
-    {
-    }
+    public record Query : IRequest<List<LanguageVm>>;
 
     internal class Handler : IRequestHandler<Query, List<LanguageVm>>
     {
@@ -48,7 +46,7 @@ public LanguageVmProfile()
         }
     }
 
-    public class LanguageVm
+    public record LanguageVm
     {
         public string Iso6391 { get; init; } = null!;
         public string Name { get; init; } = null!;
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
index b4c6d0872..d60d4cd5d 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
@@ -9,9 +9,7 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetLicenses
 {
-    public class Query : IRequest<List<LicenseVm>>
-    {
-    }
+    public record Query : IRequest<List<LicenseVm>>;
 
     internal class Handler : IRequestHandler<Query, List<LicenseVm>>
     {
@@ -46,7 +44,7 @@ public LicenseVmProfile()
         }
     }
 
-    public class LicenseVm
+    public record LicenseVm
     {
         public int Id { get; init; }
         public string Name { get; init; } = null!;
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
index 66de05048..ad1a9aa2b 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
@@ -10,15 +10,7 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetListDetails
 {
-    public class Query : IRequest<ListDetailsVm?>
-    {
-        public Query(int id)
-        {
-            Id = id;
-        }
-
-        public int Id { get; }
-    }
+    public record Query(int Id) : IRequest<ListDetailsVm?>;
 
     internal class Handler : IRequestHandler<Query, ListDetailsVm?>
     {
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
index c9645429a..5492f7bb6 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
@@ -10,9 +10,7 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetLists
 {
-    public class Query : IRequest<List<ListVm>>
-    {
-    }
+    public record Query : IRequest<List<ListVm>>;
 
     internal class Handler : IRequestHandler<Query, List<ListVm>>
     {
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
index 7d720c904..d3a9a2fd6 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
@@ -9,9 +9,7 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetMaintainers
 {
-    public class Query : IRequest<List<MaintainerVm>>
-    {
-    }
+    public record Query : IRequest<List<MaintainerVm>>;
 
     internal class Handler : IRequestHandler<Query, List<MaintainerVm>>
     {
@@ -47,7 +45,7 @@ public MaintainerVmProfile()
         }
     }
 
-    public class MaintainerVm
+    public record MaintainerVm
     {
         public int Id { get; init; }
         public string Name { get; init; } = null!;
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
index 97b2e9c00..10ad539f8 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
@@ -9,9 +9,7 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetSoftware
 {
-    public class Query : IRequest<List<SoftwareVm>>
-    {
-    }
+    public record Query : IRequest<List<SoftwareVm>>;
 
     internal class Handler : IRequestHandler<Query, List<SoftwareVm>>
     {
@@ -46,7 +44,7 @@ public SoftwareVmProfile()
         }
     }
 
-    public class SoftwareVm
+    public record SoftwareVm
     {
         public int Id { get; init; }
         public string Name { get; init; } = null!;
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
index 8739c1ce8..dfdfc9ff1 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
@@ -9,9 +9,7 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetSyntaxes
 {
-    public class Query : IRequest<List<SyntaxVm>>
-    {
-    }
+    public record Query : IRequest<List<SyntaxVm>>;
 
     internal class Handler : IRequestHandler<Query, List<SyntaxVm>>
     {
@@ -49,7 +47,7 @@ public SyntaxVmProfile()
         }
     }
 
-    public class SyntaxVm
+    public record SyntaxVm
     {
         public int Id { get; init; }
         public string Name { get; init; } = null!;
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
index 920c2cc5d..da3a45ac2 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
@@ -9,9 +9,7 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetTags
 {
-    public class Query : IRequest<List<TagVm>>
-    {
-    }
+    public record Query : IRequest<List<TagVm>>;
 
     internal class Handler : IRequestHandler<Query, List<TagVm>>
     {
@@ -46,7 +44,7 @@ public TagVmProfile()
         }
     }
 
-    public class TagVm
+    public record TagVm
     {
         public int Id { get; init; }
         public string Name { get; init; } = null!;