diff --git a/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
index 23bf62fd7..b28c235de 100644
--- a/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
+++ b/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
     <UserSecretsId>9bfe2a36-880e-4da0-994f-a9641e228ba3</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -12,5 +14,4 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
   </ItemGroup>
 
-
 </Project>
diff --git a/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
index 9f5c4f4ab..abff79ad2 100644
--- a/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
+++ b/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
 </Project>
diff --git a/directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj b/directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj
index 9f5c4f4ab..4149e3955 100644
--- a/directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj
+++ b/directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj b/directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj
index 9f5c4f4ab..4149e3955 100644
--- a/directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj
+++ b/directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
index 963def9e5..5929fc7b8 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
+++ b/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,4 +14,4 @@
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryDbContext.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryDbContext.cs
index 765c7f331..aa87d9ffb 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryDbContext.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryDbContext.cs
@@ -5,12 +5,12 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries
 {
     public class DirectoryQueryDbContext : DbContext
     {
-        public DbSet<FilterList> FilterLists { get; set; }
-        public DbSet<Language> Languages { get; set; }
-        public DbSet<License> Licenses { get; set; }
-        public DbSet<Maintainer> Maintainers { get; set; }
-        public DbSet<Software> Software { get; set; }
-        public DbSet<Syntax> Syntaxes { get; set; }
-        public DbSet<Tag> Tags { get; set; }
+        public DbSet<FilterList> FilterLists => Set<FilterList>();
+        public DbSet<Language> Languages => Set<Language>();
+        public DbSet<License> Licenses => Set<License>();
+        public DbSet<Maintainer> Maintainers => Set<Maintainer>();
+        public DbSet<Software> Software => Set<Software>();
+        public DbSet<Syntax> Syntaxes => Set<Syntax>();
+        public DbSet<Tag> Tags => Set<Tag>();
     }
 }
\ No newline at end of file
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Contracts/IHaveSurrogateKey.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Contracts/IHaveSurrogateKey.cs
index 381e009dc..72a99496c 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Contracts/IHaveSurrogateKey.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Contracts/IHaveSurrogateKey.cs
@@ -2,6 +2,6 @@
 {
     public interface IHaveSurrogateKey
     {
-        ushort Id { get; set; }
+        ushort Id { get; }
     }
 }
\ No newline at end of file