diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/AggregateRoot.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/AggregateRoot.cs
index c157a49ed..9f1aad92b 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/AggregateRoot.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/AggregateRoot.cs
@@ -5,7 +5,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 
 public abstract record AggregateRoot
 {
-    // TODO: change 'set' to 'private init' when no longer seeding from json
+    // TODO: change 'set' to 'init' when no longer seeding from json
     public bool IsApproved { get; set; }
 }
 
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
index aa8848461..e92de6db7 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
@@ -8,9 +8,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 public record Dependent
 {
     public int DependencyFilterListId { get; init; }
-    public FilterList DependencyFilterList { get; } = null!;
+    public FilterList DependencyFilterList { get; init; } = null!;
     public int DependentFilterListId { get; init; }
-    public FilterList DependentFilterList { get; } = null!;
+    public FilterList DependentFilterList { get; init; } = null!;
 }
 
 internal class DependentTypeConfiguration : IEntityTypeConfiguration<Dependent>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
index 0a11e84f9..944ea9758 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
@@ -9,11 +9,11 @@ public record FilterList : AggregateRoot
     public string Name { get; init; } = null!;
     public string? Description { get; init; }
     public int LicenseId { get; init; }
-    public License License { get; } = null!;
-    public IReadOnlyCollection<FilterListSyntax> FilterListSyntaxes { get; } = new HashSet<FilterListSyntax>();
-    public IReadOnlyCollection<FilterListLanguage> FilterListLanguages { get; } = new HashSet<FilterListLanguage>();
-    public IReadOnlyCollection<FilterListTag> FilterListTags { get; } = new HashSet<FilterListTag>();
-    public IReadOnlyCollection<FilterListViewUrl> ViewUrls { get; } = new HashSet<FilterListViewUrl>();
+    public License License { get; init; } = null!;
+    public IReadOnlyCollection<FilterListSyntax> FilterListSyntaxes { get; init; } = new HashSet<FilterListSyntax>();
+    public IReadOnlyCollection<FilterListLanguage> FilterListLanguages { get; init; } = new HashSet<FilterListLanguage>();
+    public IReadOnlyCollection<FilterListTag> FilterListTags { get; init; } = new HashSet<FilterListTag>();
+    public IReadOnlyCollection<FilterListViewUrl> ViewUrls { get; init; } = new HashSet<FilterListViewUrl>();
     public Uri? HomeUrl { get; init; }
     public Uri? OnionUrl { get; init; }
     public Uri? PolicyUrl { get; init; }
@@ -23,13 +23,13 @@ public record FilterList : AggregateRoot
     public Uri? ChatUrl { get; init; }
     public string? EmailAddress { get; init; }
     public Uri? DonateUrl { get; init; }
-    public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; } = new HashSet<FilterListMaintainer>();
-    public IReadOnlyCollection<Fork> UpstreamFilterLists { get; } = new HashSet<Fork>();
-    public IReadOnlyCollection<Fork> ForkFilterLists { get; } = new HashSet<Fork>();
-    public IReadOnlyCollection<Merge> IncludedInFilterLists { get; } = new HashSet<Merge>();
-    public IReadOnlyCollection<Merge> IncludesFilterLists { get; } = new HashSet<Merge>();
-    public IReadOnlyCollection<Dependent> DependencyFilterLists { get; } = new HashSet<Dependent>();
-    public IReadOnlyCollection<Dependent> DependentFilterLists { get; } = new HashSet<Dependent>();
+    public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; init; } = new HashSet<FilterListMaintainer>();
+    public IReadOnlyCollection<Fork> UpstreamFilterLists { get; init; } = new HashSet<Fork>();
+    public IReadOnlyCollection<Fork> ForkFilterLists { get; init; } = new HashSet<Fork>();
+    public IReadOnlyCollection<Merge> IncludedInFilterLists { get; init; } = new HashSet<Merge>();
+    public IReadOnlyCollection<Merge> IncludesFilterLists { get; init; } = new HashSet<Merge>();
+    public IReadOnlyCollection<Dependent> DependencyFilterLists { get; init; } = new HashSet<Dependent>();
+    public IReadOnlyCollection<Dependent> DependentFilterLists { get; init; } = new HashSet<Dependent>();
 }
 
 internal class FilterListTypeConfiguration : AggregateRootTypeConfiguration<FilterList>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
index ab753edb4..2266b5e07 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
@@ -8,9 +8,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 public record FilterListLanguage
 {
     public int FilterListId { get; init; }
-    public FilterList FilterList { get; } = null!;
+    public FilterList FilterList { get; init; } = null!;
     public string Iso6391 { get; init; } = null!;
-    public Language Language { get; } = null!;
+    public Language Language { get; init; } = null!;
 }
 
 internal class FilterListLanguageTypeConfiguration : IEntityTypeConfiguration<FilterListLanguage>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
index b368d5981..4ac75410b 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
@@ -8,9 +8,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 public record FilterListMaintainer
 {
     public int FilterListId { get; init; }
-    public FilterList FilterList { get; } = null!;
+    public FilterList FilterList { get; init; } = null!;
     public int MaintainerId { get; init; }
-    public Maintainer Maintainer { get; } = null!;
+    public Maintainer Maintainer { get; init; } = null!;
 }
 
 internal class FilterListMaintainerTypeConfiguration : IEntityTypeConfiguration<FilterListMaintainer>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
index 80c1b0b4b..6552897f9 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
@@ -8,9 +8,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 public record FilterListSyntax
 {
     public int FilterListId { get; init; }
-    public FilterList FilterList { get; } = null!;
+    public FilterList FilterList { get; init; } = null!;
     public int SyntaxId { get; init; }
-    public Syntax Syntax { get; } = null!;
+    public Syntax Syntax { get; init; } = null!;
 }
 
 internal class FilterListSyntaxTypeConfiguration : IEntityTypeConfiguration<FilterListSyntax>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
index e340f5d0d..404fa21ec 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
@@ -8,9 +8,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 public record FilterListTag
 {
     public int FilterListId { get; init; }
-    public FilterList FilterList { get; } = null!;
+    public FilterList FilterList { get; init; } = null!;
     public int TagId { get; init; }
-    public Tag Tag { get; } = null!;
+    public Tag Tag { get; init; } = null!;
 }
 
 internal class FilterListTagTypeConfiguration : IEntityTypeConfiguration<FilterListTag>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
index 5c0aba9fe..89bc01389 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
@@ -9,7 +9,7 @@ public record FilterListViewUrl
 {
     public int Id { get; init; }
     public int FilterListId { get; init; }
-    public FilterList FilterList { get; } = null!;
+    public FilterList FilterList { get; init; } = null!;
     public short SegmentNumber { get; init; }
     public short Primariness { get; init; }
     public Uri Url { get; init; } = null!;
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
index da51e66c0..1a0421821 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
@@ -8,9 +8,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 public record Fork
 {
     public int UpstreamFilterListId { get; init; }
-    public FilterList UpstreamFilterList { get; } = null!;
+    public FilterList UpstreamFilterList { get; init; } = null!;
     public int ForkFilterListId { get; init; }
-    public FilterList ForkFilterList { get; } = null!;
+    public FilterList ForkFilterList { get; init; } = null!;
 }
 
 internal class ForkTypeConfiguration : IEntityTypeConfiguration<Fork>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
index 0df0538ce..ce1fb8259 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
@@ -7,7 +7,7 @@ public record Language : AggregateRoot
 {
     public string Iso6391 { get; init; } = null!;
     public string Name { get; init; } = null!;
-    public IReadOnlyCollection<FilterListLanguage> FilterListLanguages { get; } = new HashSet<FilterListLanguage>();
+    public IReadOnlyCollection<FilterListLanguage> FilterListLanguages { get; init; } = new HashSet<FilterListLanguage>();
 }
 
 internal class LanguageTypeConfiguration : AggregateRootTypeConfiguration<Language>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
index 0315ca0df..ffb044e51 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
@@ -11,7 +11,7 @@ public record License : AggregateRoot
     public bool PermitsModification { get; init; }
     public bool PermitsDistribution { get; init; }
     public bool PermitsCommercialUse { get; init; }
-    public IReadOnlyCollection<FilterList> FilterLists { get; } = new HashSet<FilterList>();
+    public IReadOnlyCollection<FilterList> FilterLists { get; init; } = new HashSet<FilterList>();
 }
 
 internal class LicenseTypeConfiguration : AggregateRootTypeConfiguration<License>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
index fcfcd1b57..33d97b365 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
@@ -10,7 +10,7 @@ public record Maintainer : AggregateRoot
     public Uri? Url { get; init; }
     public string? EmailAddress { get; init; }
     public string? TwitterHandle { get; init; }
-    public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; } = new HashSet<FilterListMaintainer>();
+    public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; init; } = new HashSet<FilterListMaintainer>();
 }
 
 internal class MaintainerTypeConfiguration : AggregateRootTypeConfiguration<Maintainer>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
index a9c88e772..9b5387aeb 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
@@ -8,9 +8,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 public record Merge
 {
     public int IncludedInFilterListId { get; init; }
-    public FilterList IncludedInFilterList { get; } = null!;
+    public FilterList IncludedInFilterList { get; init; } = null!;
     public int IncludesFilterListId { get; init; }
-    public FilterList IncludesFilterList { get; } = null!;
+    public FilterList IncludesFilterList { get; init; } = null!;
 }
 
 internal class MergeTypeConfiguration : IEntityTypeConfiguration<Merge>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
index a74a1bbd6..a5db1febd 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
@@ -11,7 +11,7 @@ public record Software : AggregateRoot
     public Uri? HomeUrl { get; init; }
     public Uri? DownloadUrl { get; init; }
     public bool SupportsAbpUrlScheme { get; init; }
-    public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; } = new HashSet<SoftwareSyntax>();
+    public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; init; } = new HashSet<SoftwareSyntax>();
 }
 
 internal class SoftwareTypeConfiguration : AggregateRootTypeConfiguration<Software>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
index 723f4af72..6b1db5d83 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
@@ -8,9 +8,9 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 public record SoftwareSyntax
 {
     public int SoftwareId { get; init; }
-    public Software Software { get; } = null!;
+    public Software Software { get; init; } = null!;
     public int SyntaxId { get; init; }
-    public Syntax Syntax { get; } = null!;
+    public Syntax Syntax { get; init; } = null!;
 }
 
 internal class SoftwareSyntaxTypeConfiguration : IEntityTypeConfiguration<SoftwareSyntax>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
index 42ba2306d..0e38396bd 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
@@ -9,8 +9,8 @@ public record Syntax : AggregateRoot
     public string Name { get; init; } = null!;
     public string? Description { get; init; }
     public Uri? Url { get; init; }
-    public IReadOnlyCollection<FilterListSyntax> FilterListSyntaxes { get; } = new HashSet<FilterListSyntax>();
-    public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; } = new HashSet<SoftwareSyntax>();
+    public IReadOnlyCollection<FilterListSyntax> FilterListSyntaxes { get; init; } = new HashSet<FilterListSyntax>();
+    public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; init; } = new HashSet<SoftwareSyntax>();
 }
 
 internal class SyntaxTypeConfiguration : AggregateRootTypeConfiguration<Syntax>
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
index 949c3cdc5..42b43e2e3 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
@@ -8,7 +8,7 @@ public record Tag : AggregateRoot
     public int Id { get; init; }
     public string Name { get; init; } = null!;
     public string? Description { get; init; }
-    public IReadOnlyCollection<FilterListTag> FilterListTags { get; } = new HashSet<FilterListTag>();
+    public IReadOnlyCollection<FilterListTag> FilterListTags { get; init; } = new HashSet<FilterListTag>();
 }
 
 internal class TagTypeConfiguration : AggregateRootTypeConfiguration<Tag>