diff --git a/Aaru.CommonTypes.csproj b/Aaru.CommonTypes.csproj
index 7553bb4..134cb07 100644
--- a/Aaru.CommonTypes.csproj
+++ b/Aaru.CommonTypes.csproj
@@ -45,6 +45,7 @@
     <PackageReference Include="Macross.Json.Extensions" Version="3.0.0"/>
     <PackageReference Include="System.ComponentModel.Annotations" Version="6.0.0-preview.4.21253.7"/>
     <PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.5.21301.5"/>
+    <PackageReference Include="System.Text.Json" Version="7.0.0"/>
     <PackageReference Include="System.ValueTuple" Version="4.5.0"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
   </ItemGroup>
diff --git a/AaruMetadata/AaruMetadata.cs b/AaruMetadata/AaruMetadata.cs
index 931a2fd..c9cda83 100644
--- a/AaruMetadata/AaruMetadata.cs
+++ b/AaruMetadata/AaruMetadata.cs
@@ -38,6 +38,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using Schemas;
 
 // ReSharper disable UnusedMember.Global
@@ -45,6 +46,10 @@ using Schemas;
 
 namespace Aaru.CommonTypes.AaruMetadata;
 
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(MetadataJson))]
+public partial class MetadataJsonContext : JsonSerializerContext {}
+
 public class MetadataJson
 {
     public Metadata AaruMetadata { get; set; }