diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..791b954
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,19 @@
+version: 2
+updates:
+  - package-ecosystem: "nuget" # See documentation for possible values
+    directory: "/src" # Location of package manifests
+    schedule:
+      interval: "daily"
+    groups:
+      nuget-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    groups:
+      actions-dependencies:
+        patterns:
+          - "*"
\ No newline at end of file
diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml
new file mode 100644
index 0000000..c92c409
--- /dev/null
+++ b/.github/workflows/code-ql.yml
@@ -0,0 +1,36 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+        
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/dotnet-cd.yml b/.github/workflows/dotnet-cd.yml
new file mode 100644
index 0000000..23fe50e
--- /dev/null
+++ b/.github/workflows/dotnet-cd.yml
@@ -0,0 +1,84 @@
+name: .NET Continuous Deployment
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - src/UniversalDiveDataFormat/**
+  workflow_dispatch:
+jobs:
+
+  test:
+    name: Test Project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Run tests
+        run: dotnet test --logger GitHubActions ./src/UniversalDiveDataFormat.sln
+
+  semantic-release:
+    needs: test
+    name: Create a Package Release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4 # Need the full commit history for conventional commit
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Bump version and push tag
+        id: tag_version
+        uses: mathieudutour/github-tag-action@v6.1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create a GitHub release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.tag_version.outputs.new_tag }}
+          name: Release ${{ steps.tag_version.outputs.new_tag }}
+          body: ${{ steps.tag_version.outputs.changelog }}
+      - name: Create Nuget Package
+        run: dotnet build -c Release ./src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj && dotnet pack -c Release -p:PackageVersion=${{ steps.tag_version.outputs.new_version }} -o . ./src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj
+      - name: Upload Package for Publishing
+        uses: actions/upload-artifact@v4
+        with:
+          name: PackedLib
+          path: ./*.nupkg
+
+
+  github-publish:
+    needs: semantic-release
+    name: Publish to Github
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download built project
+        uses: actions/download-artifact@v4
+        with:
+          name: PackedLib
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Push Package to GitHub
+        run: dotnet nuget push --api-key ${{secrets.GITHUB_TOKEN}} --source "https://nuget.pkg.github.com/hughesjs/index.json" *.nupkg
+
+
+  nuget-publish:
+    needs: semantic-release
+    name: Publish to Nuget
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download built project
+        uses: actions/download-artifact@v4
+        with:
+          name: PackedLib
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Push Package to Nuget
+        run: dotnet nuget push --api-key ${{secrets.NUGET_KEY}} --source "https://api.nuget.org/v3/index.json" *.nupkg
\ No newline at end of file
diff --git a/.github/workflows/dotnet-ci.yml b/.github/workflows/dotnet-ci.yml
new file mode 100644
index 0000000..375bafd
--- /dev/null
+++ b/.github/workflows/dotnet-ci.yml
@@ -0,0 +1,20 @@
+name: .NET Continuous Integration
+
+on:
+  pull_request:
+    branches: [ main ]
+  push:
+    branches: [ main ]
+
+jobs:
+  test:
+    name: Test Project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Run tests
+        run: dotnet test --logger GitHubActions ./src/UniversalDiveDataFormat.sln
\ No newline at end of file
diff --git a/README.md b/README.md
index 54a98b8..ef06b99 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,11 @@
 
 This is a C# library for reading and writing the [Universal Dive Data Format](https://www.streit.cc/extern/uddf_v321/en/index.html).
 
-Currently, the library primarily consists of the Models required to deserialize UDDF files using the [XmlSerializer](https://docs.microsoft.com/en-us/dotnet/api/system.xml.serialization.xmlserializer?view=net-7.0).
+Currently, the library primarily consists of the Models required to deserialize UDDF files using either the built-in [XmlSerializer](https://docs.microsoft.com/en-us/dotnet/api/system.xml.serialization.xmlserializer?view=net-7.0) or the custom `UddfDeserilizer`.
+
+The `UddfDeserializer` resolves all links within the UDDF file and maps them onto the object graph.
+
+If you use the built-in `XmlSerializer`, you have to use the `LinkResolutionService` to resolve these links.
 
 Future versions might include extra services for enforcing constraints and validation.
 
@@ -28,9 +32,7 @@ dotnet add package UniversalDiveDataFormat
 using System.Xml.Serialization;
 using UniversalDiveDataFormat.Models;
 
-// Deserialize a complete UDDF file
-var serializer = new XmlSerializer(typeof(UniversalDiveDataFormat.Models.UniversalDiveDataFormatRoot));
-var uddf = serializer.Deserialize(File.OpenRead("my_dive_log.uddf"));
+UniversalDiveDataFormatRoot uddf = _uddfDeserialiser.Deserialise<UniversalDiveDataFormatRoot>(xml);
 ```
 
 ## Contributing
diff --git a/src/UniversalDiveDataFormat/Models/BuiltTests.cs b/src/UniversalDiveDataFormat.Tests/Models/BuiltTests.cs
similarity index 80%
rename from src/UniversalDiveDataFormat/Models/BuiltTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/BuiltTests.cs
index 4774942..1c72c35 100644
--- a/src/UniversalDiveDataFormat/Models/BuiltTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/BuiltTests.cs
@@ -1,15 +1,15 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class BuiltTests
 {
 	private const string Xml = """
 	                           <built>
-	                               <shipyard>Blohm & Voss</shipyard>
+	                               <shipyard>Blohm &amp; Voss</shipyard>
 	                               <launchingdate>
 	                                   <datetime>1943-06-14</datetime>
 	                               </launchingdate>
diff --git a/src/UniversalDiveDataFormat/Models/DiveComputerAlarmTests.cs b/src/UniversalDiveDataFormat.Tests/Models/DiveComputerAlarmTests.cs
similarity index 85%
rename from src/UniversalDiveDataFormat/Models/DiveComputerAlarmTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/DiveComputerAlarmTests.cs
index 795363c..aff945f 100644
--- a/src/UniversalDiveDataFormat/Models/DiveComputerAlarmTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/DiveComputerAlarmTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class DiveComputerAlarmTests
 {
@@ -23,6 +23,6 @@ public void CanReadDcAlarm()
 		DiveComputerAlarm dcAlarm = serializer.Deserialize<DiveComputerAlarm>(Xml);
 		dcAlarm.PeriodInSeconds.ShouldBe(10.0f);
 		dcAlarm.AlarmType.ShouldBe(1);
-		dcAlarm.Acknowledge.ShouldBeNull();
+		dcAlarm.Acknowledge.ShouldNotBeNull();
 	}
 }
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs b/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs
index bab50ef..66586c0 100644
--- a/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs
@@ -3,7 +3,7 @@
 using UniversalDiveDataFormat.ExtensionMethods;
 using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Tests;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class ExposureToAltitudeTests
 {
diff --git a/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs b/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs
index 8ea52cb..2d9134d 100644
--- a/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs
@@ -3,7 +3,7 @@
 using UniversalDiveDataFormat.ExtensionMethods;
 using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Tests;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class GlobalAlarmsTests
 {
diff --git a/src/UniversalDiveDataFormat.Tests/Models/LaunchingDateTests.cs b/src/UniversalDiveDataFormat.Tests/Models/LaunchingDateTests.cs
new file mode 100644
index 0000000..8a3bee3
--- /dev/null
+++ b/src/UniversalDiveDataFormat.Tests/Models/LaunchingDateTests.cs
@@ -0,0 +1,23 @@
+using System.Xml.Serialization;
+using Shouldly;
+using UniversalDiveDataFormat.ExtensionMethods;
+using UniversalDiveDataFormat.Models;
+
+namespace UniversalDiveDataFormat.Tests.Models;
+
+public class LaunchingDateTests
+{
+	private const string Xml = """
+	                           <launchingdate>
+	                               <datetime>1943-06-14</datetime>
+	                           </launchingdate>
+	                           """;
+	
+	[Fact]
+	public void CanReadLaunchingDate()
+	{
+		XmlSerializer serializer = new(typeof(LaunchingDate));
+		LaunchingDate launchingDate = serializer.Deserialize<LaunchingDate>(Xml);
+		launchingDate.DateTime.ShouldBe(new(1943, 6, 14));
+	}
+}
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTimeTests.cs b/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerAlarmTimeTests.cs
similarity index 85%
rename from src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTimeTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerAlarmTimeTests.cs
index 6a3b448..5827a2a 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTimeTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerAlarmTimeTests.cs
@@ -1,15 +1,15 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class SetDiveComputerAlarmTimeTests
 {
 	private const string Xml = """
 	                           <setdcalarmtime>
-	                               <datetime>T14:37:00</datetime>
+	                               <datetime>2022-01-01T14:37:00</datetime>
 	                               <dcalarm>
 	                                   <!-- duration 10 seconds -->
 	                                   <period>10.0</period>
diff --git a/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs b/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs
index cbdcd1d..68a1e93 100644
--- a/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs
@@ -3,7 +3,7 @@
 using UniversalDiveDataFormat.ExtensionMethods;
 using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Tests;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class SetDiveComputerDecoModelTests
 {
diff --git a/src/UniversalDiveDataFormat/Models/ShipDimensionTests.cs b/src/UniversalDiveDataFormat.Tests/Models/ShipDimensionTests.cs
similarity index 86%
rename from src/UniversalDiveDataFormat/Models/ShipDimensionTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/ShipDimensionTests.cs
index 899465b..93e8716 100644
--- a/src/UniversalDiveDataFormat/Models/ShipDimensionTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/ShipDimensionTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class ShipDimensionTests
 {
@@ -13,7 +13,7 @@ public class ShipDimensionTests
 	                               <beam>12.6</beam>
 	                               <draught>5.7</draught>
 	                               <displacement>123456.7</displacement>
-	                               <tonnage>170000.0</tonnag>
+	                               <tonnage>170000.0</tonnage>
 	                           </shipdimension>
 	                           """;
 	
diff --git a/src/UniversalDiveDataFormat/Models/WreckTests.cs b/src/UniversalDiveDataFormat.Tests/Models/WreckTests.cs
similarity index 91%
rename from src/UniversalDiveDataFormat/Models/WreckTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/WreckTests.cs
index a6871dd..f18e5ac 100644
--- a/src/UniversalDiveDataFormat/Models/WreckTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/WreckTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class WreckTests
 {
@@ -13,7 +13,7 @@ public class WreckTests
                                    <shiptype>tanker</shiptype>
                                    <nationality>German</nationality>
                                    <built>
-                                       <shipyard>Blohm & Voss</shipyard>
+                                       <shipyard>Blohm &amp; Voss</shipyard>
                                        <launchingdate>
                                            <datetime>1943-06-14</datetime>
                                        </launchingdate>
@@ -25,7 +25,7 @@ public class WreckTests
                                        <displacement>123456.7</displacement>
                                    </shipdimension>
                                    <sunk>
-                                       <datetime>1985-05-24T15:46</datetime>
+                                       <datetime>1985-05-24T15:46:00</datetime>
                                    </sunk>
                                    <notes>
                                        <!-- here additional remarks and/or photos, videos of the wreck -->
diff --git a/src/UniversalDiveDataFormat.Tests/Services/LinkResolutionServiceTests.cs b/src/UniversalDiveDataFormat.Tests/Services/LinkResolutionServiceTests.cs
new file mode 100644
index 0000000..9490589
--- /dev/null
+++ b/src/UniversalDiveDataFormat.Tests/Services/LinkResolutionServiceTests.cs
@@ -0,0 +1,157 @@
+using System.Xml.Serialization;
+using Shouldly;
+using UniversalDiveDataFormat.ExtensionMethods;
+using UniversalDiveDataFormat.Models;
+using UniversalDiveDataFormat.Services;
+
+namespace UniversalDiveDataFormat.Tests.Services;
+
+public class LinkResolutionServiceTests
+{
+	private const string Xml = """
+	                           <uddf version="3.2.0">
+	                               <mediadata>
+	                                   <image id="img_flatfeet">
+	                                       <title>Arno's flatfeet...</title>
+	                                       <objectname>flatfeet.jpg</objectname>
+	                                   </image>
+	                               </mediadata>
+	                               <diver>
+	                                   <owner id="owner_arno">
+	                                       <personal>
+
+	                                       </personal>
+	                                       <address>
+
+	                                       </address>
+	                                       <contact>
+	
+	                                       </contact>
+	                                       <medical>
+	                                           <examination>
+	                                               <datetime>2003-04-12</datetime>
+	                                               <doctor id="doctorDusel">
+	                                                   <personal>
+	                                                       <firstname>Dirk</firstname>
+	                                                       <lastname>Dusel</lastname>
+	                                                       <honorific>Dr.</honorific>
+	                                                       <sex>male</sex>
+	                                                       <birthdate>
+	                                                       </birthdate>
+	                                                   </personal>
+	                                                   <address>
+	                                                       <street>Duddelstr. 34</street>
+	                                                       <city>Dortmund</city>
+	                                                       <postcode>54321</postcode>
+	                                                       <country>Deutschland</country>
+	                                                       <province>Nordrhein-Westfalen</province>
+	                                                   </address>
+	                                                   <contact>
+	                                                       <language>deutsch</language>
+	                                                       <phone>01234/987654</phone>
+	                                                   </contact>
+	                                               </doctor>
+	                                               <examinationresult>passed</examinationresult>
+	                                               <notes>
+	                                                   <para>
+	                                                       Flatfeet don't seem to affect dive fitness :-)
+	                                                   </para>
+	                                                   <link ref="img_flatfeet"/>
+	                                               </notes>
+	                                           </examination>
+	                                           <examination>
+	                                               <datetime>2004-04-20</datetime>
+	                                               <link ref="doctorDusel"/>
+	                                               <examinationresult>passed</examinationresult>
+	                                           </examination>
+	                                       </medical>
+	                                       <education>
+	                                           <certification>
+	                                               <level>Bronze</level>
+	                                               <organisation>VDST/CMAS</organisation>
+	                                               <issuedate>
+	                                                   <datetime>1994-03-15</datetime>
+	                                               </issuedate>
+	                                           </certification>
+	                                           <certification>
+	                                               <specialty>Orientation</specialty>
+	                                               <organisation>VDST/CMAS</organisation>
+	                                               <issuedate>
+	                                                   <datetime>1994-03-15</datetime>
+	                                               </issuedate>
+	                                           </certification>
+	                                           <certification>
+	                                               <level>Silver</level>
+	                                               <organisation>VDST/CMAS</organisation>
+	                                               <issuedate>
+	                                                   <datetime>1997-11-26</datetime>
+	                                               </issuedate>
+	                                           </certification>
+	                                           <certification>
+	                                               <level>Gold</level>
+	                                               <organisation>VDST/CMAS</organisation>
+	                                               <issuedate>
+	                                                   <datetime>2000-05-10</datetime>
+	                                               </issuedate>
+	                                           </certification>
+	                                       </education>
+	                                       <divepermissions>
+	                                           <permit>
+	                                               <name>DiveCard</name>
+	                                               <region>Austria</region>
+	                                               <issuedate>
+	                                                   <datetime>2004-08-24</datetime>
+	                                               </issuedate>
+	                                               <validdate>
+	                                                   <datetime>2005-08-23</datetime>
+	                                               </validdate>
+	                                           </permit>
+	                                           <permit>
+	                                               <name>Zeeland</name>
+	                                               <region>Zeeland (The Netherlands)</region>
+	                                               <issuedate>
+	                                                   <datetime>1996-09-03:00</datetime>
+	                                               </issuedate>
+	                                               <validdate>
+	                                                   <datetime>2001-08-31</datetime>
+	                                               </validdate>
+	                                           </permit>
+	                                       </divepermissions>
+	                                   </owner>
+	                                   <buddy id="buddy_bertie_the_airsucker">
+	                                       <personal>
+	                                           <firstname>Bertie</firstname>
+	                                           <lastname>Bammel</lastname>
+	                                       </personal>
+	                                       <contact>
+	                                           <email>airsucker@deepdiving.info</email>
+	                                           <homepage>http://www.deepdiving.info/bertie</homepage>
+	                                       </contact>
+	                                   </buddy>
+	                                   <buddy id="buddyCarl">
+	                                       <personal>
+	                                           <firstname>Carl</firstname>
+	                                           <lastname>Cabuff</lastname>
+	                                       </personal>
+	                                       <contact>
+	                                           <email>lurchi@abcde.com</email>
+	                                           <homepage>http://www.deepdiving.info/carl</homepage>
+	                                       </contact>
+	                                   </buddy>
+	                               </diver>
+	                           </uddf>
+	                           """;
+
+	[Fact]
+	public void CanResolveLinks()
+	{
+		XmlSerializer serializer = new(typeof(UniversalDiveDataFormatRoot));
+		UniversalDiveDataFormatRoot uddf = serializer.Deserialize<UniversalDiveDataFormatRoot>(Xml);
+		
+		LinkResolutionService lrs = new();
+		lrs.ResolveAllLinksInObjectGraph(uddf);
+
+		var linkedImage = uddf.MediaData!.ImageFiles[0];
+		uddf.Diver!.Owner!.Medical!.Examinations[0].Notes!.Links[0].LinkedObject.ShouldBe(linkedImage);
+	}
+}
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat.Tests/Services/UddfDeserialiserTests.cs b/src/UniversalDiveDataFormat.Tests/Services/UddfDeserialiserTests.cs
new file mode 100644
index 0000000..7e5e20f
--- /dev/null
+++ b/src/UniversalDiveDataFormat.Tests/Services/UddfDeserialiserTests.cs
@@ -0,0 +1,188 @@
+using System.Text;
+using Shouldly;
+using UniversalDiveDataFormat.Models;
+using UniversalDiveDataFormat.Services;
+
+namespace UniversalDiveDataFormat.Tests.Services;
+
+public class UddfDeserialiserTests
+{
+	private readonly UddfDeserialiser _uddfDeserialiser;
+	
+	public UddfDeserialiserTests()
+	{
+		_uddfDeserialiser = new(new());
+	}
+	
+		[Fact]
+		public void LinksAreResolvedWhenDeserialising()
+		{
+			const string xml = """
+	                           <uddf version="3.2.0">
+	                               <mediadata>
+	                                   <image id="img_flatfeet">
+	                                       <title>Arno's flatfeet...</title>
+	                                       <objectname>flatfeet.jpg</objectname>
+	                                   </image>
+	                               </mediadata>
+	                               <diver>
+	                                   <owner id="owner_arno">
+	                                       <personal>
+
+	                                       </personal>
+	                                       <address>
+
+	                                       </address>
+	                                       <contact>
+	
+	                                       </contact>
+	                                       <medical>
+	                                           <examination>
+	                                               <datetime>2003-04-12</datetime>
+	                                               <doctor id="doctorDusel">
+	                                                   <personal>
+	                                                       <firstname>Dirk</firstname>
+	                                                       <lastname>Dusel</lastname>
+	                                                       <honorific>Dr.</honorific>
+	                                                       <sex>male</sex>
+	                                                       <birthdate>
+	                                                       </birthdate>
+	                                                   </personal>
+	                                                   <address>
+	                                                       <street>Duddelstr. 34</street>
+	                                                       <city>Dortmund</city>
+	                                                       <postcode>54321</postcode>
+	                                                       <country>Deutschland</country>
+	                                                       <province>Nordrhein-Westfalen</province>
+	                                                   </address>
+	                                                   <contact>
+	                                                       <language>deutsch</language>
+	                                                       <phone>01234/987654</phone>
+	                                                   </contact>
+	                                               </doctor>
+	                                               <examinationresult>passed</examinationresult>
+	                                               <notes>
+	                                                   <para>
+	                                                       Flatfeet don't seem to affect dive fitness :-)
+	                                                   </para>
+	                                                   <link ref="img_flatfeet"/>
+	                                               </notes>
+	                                           </examination>
+	                                           <examination>
+	                                               <datetime>2004-04-20</datetime>
+	                                               <link ref="doctorDusel"/>
+	                                               <examinationresult>passed</examinationresult>
+	                                           </examination>
+	                                       </medical>
+	                                       <education>
+	                                           <certification>
+	                                               <level>Bronze</level>
+	                                               <organisation>VDST/CMAS</organisation>
+	                                               <issuedate>
+	                                                   <datetime>1994-03-15</datetime>
+	                                               </issuedate>
+	                                           </certification>
+	                                           <certification>
+	                                               <specialty>Orientation</specialty>
+	                                               <organisation>VDST/CMAS</organisation>
+	                                               <issuedate>
+	                                                   <datetime>1994-03-15</datetime>
+	                                               </issuedate>
+	                                           </certification>
+	                                           <certification>
+	                                               <level>Silver</level>
+	                                               <organisation>VDST/CMAS</organisation>
+	                                               <issuedate>
+	                                                   <datetime>1997-11-26</datetime>
+	                                               </issuedate>
+	                                           </certification>
+	                                           <certification>
+	                                               <level>Gold</level>
+	                                               <organisation>VDST/CMAS</organisation>
+	                                               <issuedate>
+	                                                   <datetime>2000-05-10</datetime>
+	                                               </issuedate>
+	                                           </certification>
+	                                       </education>
+	                                       <divepermissions>
+	                                           <permit>
+	                                               <name>DiveCard</name>
+	                                               <region>Austria</region>
+	                                               <issuedate>
+	                                                   <datetime>2004-08-24</datetime>
+	                                               </issuedate>
+	                                               <validdate>
+	                                                   <datetime>2005-08-23</datetime>
+	                                               </validdate>
+	                                           </permit>
+	                                           <permit>
+	                                               <name>Zeeland</name>
+	                                               <region>Zeeland (The Netherlands)</region>
+	                                               <issuedate>
+	                                                   <datetime>1996-09-03:00</datetime>
+	                                               </issuedate>
+	                                               <validdate>
+	                                                   <datetime>2001-08-31</datetime>
+	                                               </validdate>
+	                                           </permit>
+	                                       </divepermissions>
+	                                   </owner>
+	                                   <buddy id="buddy_bertie_the_airsucker">
+	                                       <personal>
+	                                           <firstname>Bertie</firstname>
+	                                           <lastname>Bammel</lastname>
+	                                       </personal>
+	                                       <contact>
+	                                           <email>airsucker@deepdiving.info</email>
+	                                           <homepage>http://www.deepdiving.info/bertie</homepage>
+	                                       </contact>
+	                                   </buddy>
+	                                   <buddy id="buddyCarl">
+	                                       <personal>
+	                                           <firstname>Carl</firstname>
+	                                           <lastname>Cabuff</lastname>
+	                                       </personal>
+	                                       <contact>
+	                                           <email>lurchi@abcde.com</email>
+	                                           <homepage>http://www.deepdiving.info/carl</homepage>
+	                                       </contact>
+	                                   </buddy>
+	                               </diver>
+	                           </uddf>
+	                           """;
+
+			UniversalDiveDataFormatRoot uddf = _uddfDeserialiser.Deserialise<UniversalDiveDataFormatRoot>(xml);
+			Image linkedImage = uddf.MediaData!.ImageFiles[0];
+			uddf.Diver!.Owner.Medical!.Examinations[0].Notes!.Links[0].LinkedObject.ShouldBe(linkedImage);
+		}
+		
+		[Fact]
+		public void CanDeserialiseFromStream()
+		{
+			const string xml = """
+	                           <uddf version="3.2.0">
+	                               <mediadata>
+	                               
+	                               </mediadata>
+	                           </uddf>
+	                           """;
+			using MemoryStream stream = new(Encoding.UTF8.GetBytes(xml));
+			UniversalDiveDataFormatRoot uddf = _uddfDeserialiser.Deserialise<UniversalDiveDataFormatRoot>(stream);
+			uddf.ShouldNotBeNull();
+			uddf.MediaData.ShouldNotBeNull();
+		}
+		
+		[Fact]
+		public void CanDeserialiseNonRootObject()
+		{
+			const string xml = """
+								<image id="img_flatfeet">
+								   <title>Arno's flatfeet...</title>
+								   <objectname>flatfeet.jpg</objectname>
+								</image>
+								""";
+			Image image = _uddfDeserialiser.Deserialise<Image>(xml);
+			image.Id.ShouldBe("img_flatfeet");
+			image.ObjectName.ShouldBe("flatfeet.jpg");
+		}	
+}
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat.Tests/UniversalDiveDataFormat.Tests.csproj b/src/UniversalDiveDataFormat.Tests/UniversalDiveDataFormat.Tests.csproj
index 6fee83b..dff3c56 100644
--- a/src/UniversalDiveDataFormat.Tests/UniversalDiveDataFormat.Tests.csproj
+++ b/src/UniversalDiveDataFormat.Tests/UniversalDiveDataFormat.Tests.csproj
@@ -11,6 +11,10 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
         <PackageReference Include="Shouldly" Version="4.2.1" />
         <PackageReference Include="xunit" Version="2.4.2"/>
diff --git a/src/UniversalDiveDataFormat/Models/Abundance.cs b/src/UniversalDiveDataFormat/Models/Abundance.cs
index 9399050..84e784c 100644
--- a/src/UniversalDiveDataFormat/Models/Abundance.cs
+++ b/src/UniversalDiveDataFormat/Models/Abundance.cs
@@ -1,10 +1,9 @@
-using System.Globalization;
 using System.Xml.Serialization;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("abundance")]
-public class Abundance
+public class Abundance: UddfModel
 {
 	[XmlAttribute("quality")]
 	public Quality Quality { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Accommodation.cs b/src/UniversalDiveDataFormat/Models/Accommodation.cs
index 39c8084..c92077c 100644
--- a/src/UniversalDiveDataFormat/Models/Accommodation.cs
+++ b/src/UniversalDiveDataFormat/Models/Accommodation.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("accommodation")]
-public class Accommodation
+public class Accommodation: UddfModel
 {
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Acknowledge.cs b/src/UniversalDiveDataFormat/Models/Acknowledge.cs
index a7e9355..8317c0c 100644
--- a/src/UniversalDiveDataFormat/Models/Acknowledge.cs
+++ b/src/UniversalDiveDataFormat/Models/Acknowledge.cs
@@ -3,4 +3,4 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("acknowledge")]
-public class Acknowledge;
\ No newline at end of file
+public class Acknowledge: UddfModel;
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/Address.cs b/src/UniversalDiveDataFormat/Models/Address.cs
index d68bf83..b8051a2 100644
--- a/src/UniversalDiveDataFormat/Models/Address.cs
+++ b/src/UniversalDiveDataFormat/Models/Address.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("address")]
-public class Address
+public class Address: UddfModel
 {
     [XmlElement("street")]
     public string? Street { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/AlcoholBeforeDive.cs b/src/UniversalDiveDataFormat/Models/AlcoholBeforeDive.cs
index 53f9d95..dbeb601 100644
--- a/src/UniversalDiveDataFormat/Models/AlcoholBeforeDive.cs
+++ b/src/UniversalDiveDataFormat/Models/AlcoholBeforeDive.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("alcoholbeforedive")]
-public class AlcoholBeforeDive
+public class AlcoholBeforeDive: UddfModel
 {
 	[XmlElement("drink")]
 	public List<Drink> Drinks { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/AnySymptoms.cs b/src/UniversalDiveDataFormat/Models/AnySymptoms.cs
index 1e5de04..3c210e3 100644
--- a/src/UniversalDiveDataFormat/Models/AnySymptoms.cs
+++ b/src/UniversalDiveDataFormat/Models/AnySymptoms.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("anysymptoms")]
-public class AnySymptoms
+public class AnySymptoms: UddfModel
 {
 	[XmlElement("notes")]
 	public Notes? Notes { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Ascent.cs b/src/UniversalDiveDataFormat/Models/Ascent.cs
index e03332f..16b1ace 100644
--- a/src/UniversalDiveDataFormat/Models/Ascent.cs
+++ b/src/UniversalDiveDataFormat/Models/Ascent.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("ascent")]
-public class Ascent
+public class Ascent: UddfModel
 {
 	[XmlElement("waypoint")]
 	public List<Waypoint> Waypoints { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Audio.cs b/src/UniversalDiveDataFormat/Models/Audio.cs
index 8819bc8..8427b27 100644
--- a/src/UniversalDiveDataFormat/Models/Audio.cs
+++ b/src/UniversalDiveDataFormat/Models/Audio.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("audio")]
-public class Audio: ILinkable
+public class Audio: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	[XmlElement("objectname")]
 	public required string ObjectName { get; init; }
 	[XmlElement("title")]
diff --git a/src/UniversalDiveDataFormat/Models/BirthDate.cs b/src/UniversalDiveDataFormat/Models/BirthDate.cs
index 87fa805..cdfafe5 100644
--- a/src/UniversalDiveDataFormat/Models/BirthDate.cs
+++ b/src/UniversalDiveDataFormat/Models/BirthDate.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("birthdate")]
-public class BirthDate
+public class BirthDate: UddfModel
 {
 	[XmlElement("datetime")]
 	public required DateTime DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/BottomTimeTable.cs b/src/UniversalDiveDataFormat/Models/BottomTimeTable.cs
index 2ef773f..8d1877c 100644
--- a/src/UniversalDiveDataFormat/Models/BottomTimeTable.cs
+++ b/src/UniversalDiveDataFormat/Models/BottomTimeTable.cs
@@ -1,13 +1,14 @@
 using System.Xml;
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("bottomtimetable")]
-public class BottomTimeTable: ILinkable
+public class BottomTimeTable: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("link")]
 	public List<Link> Links { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/BottomTimeTableScope.cs b/src/UniversalDiveDataFormat/Models/BottomTimeTableScope.cs
index 197654a..06ab45d 100644
--- a/src/UniversalDiveDataFormat/Models/BottomTimeTableScope.cs
+++ b/src/UniversalDiveDataFormat/Models/BottomTimeTableScope.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("bottomtimetablescope")]
-public class BottomTimeTableScope
+public class BottomTimeTableScope: UddfModel
 {
 	[XmlElement("breathingconsumptionvolumebegin")]
 	public required float BreathingConsumptionVolumeBeginInCubicMetersPerSecond { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Buehlmann.cs b/src/UniversalDiveDataFormat/Models/Buehlmann.cs
index 3b0e46e..eb6f786 100644
--- a/src/UniversalDiveDataFormat/Models/Buehlmann.cs
+++ b/src/UniversalDiveDataFormat/Models/Buehlmann.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("buehlmann")]
-public class Buehlmann: ILinkable
+public class Buehlmann: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 
 	[XmlElement("gradientfactorhigh")]
 	public float? GradientFactorHigh { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Built.cs b/src/UniversalDiveDataFormat/Models/Built.cs
index a4a3311..f3ab580 100644
--- a/src/UniversalDiveDataFormat/Models/Built.cs
+++ b/src/UniversalDiveDataFormat/Models/Built.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("built")]
-public class Built
+public class Built: UddfModel
 {
 	[XmlElement("shipyard")]
 	public string? Shipyard { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Business.cs b/src/UniversalDiveDataFormat/Models/Business.cs
index ecd7ac2..99dfd60 100644
--- a/src/UniversalDiveDataFormat/Models/Business.cs
+++ b/src/UniversalDiveDataFormat/Models/Business.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("business")]
-public class Business
+public class Business: UddfModel
 {
 	[XmlElement("shop")]
 	public List<Shop> Shops { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/CalculateBottomTimeTable.cs b/src/UniversalDiveDataFormat/Models/CalculateBottomTimeTable.cs
index 2d5a491..2c5fd63 100644
--- a/src/UniversalDiveDataFormat/Models/CalculateBottomTimeTable.cs
+++ b/src/UniversalDiveDataFormat/Models/CalculateBottomTimeTable.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("calculatebottomtimetable")]
-public class CalculateBottomTimeTable
+public class CalculateBottomTimeTable: UddfModel
 {
 	[XmlElement("bottomtimetable")]
 	public List<BottomTimeTable> BottomTimeTables { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/CalculateProfile.cs b/src/UniversalDiveDataFormat/Models/CalculateProfile.cs
index 37bd4f3..492021d 100644
--- a/src/UniversalDiveDataFormat/Models/CalculateProfile.cs
+++ b/src/UniversalDiveDataFormat/Models/CalculateProfile.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("calculateprofile")]
-public class CalculateProfile
+public class CalculateProfile: UddfModel
 {
 	[XmlElement("profile")]
 	public List<Profile> Profiles { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/CalculateTable.cs b/src/UniversalDiveDataFormat/Models/CalculateTable.cs
index 3a0b7ce..cdcb8ad 100644
--- a/src/UniversalDiveDataFormat/Models/CalculateTable.cs
+++ b/src/UniversalDiveDataFormat/Models/CalculateTable.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("calculatetable")]
-public class CalculateTable
+public class CalculateTable: UddfModel
 {
 	[XmlElement("table")]
 	public List<Table> Tables { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Camera.cs b/src/UniversalDiveDataFormat/Models/Camera.cs
index 309b6bc..5a66bcd 100644
--- a/src/UniversalDiveDataFormat/Models/Camera.cs
+++ b/src/UniversalDiveDataFormat/Models/Camera.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("camera")]
-public class Camera: ILinkable
+public class Camera: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
 	public required string Id{ get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Certification.cs b/src/UniversalDiveDataFormat/Models/Certification.cs
index 59a0cf8..024bbee 100644
--- a/src/UniversalDiveDataFormat/Models/Certification.cs
+++ b/src/UniversalDiveDataFormat/Models/Certification.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("certification")]
-public class Certification
+public class Certification: UddfModel
 {
 	[XmlElement("level")]
 	public string? Level { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Contact.cs b/src/UniversalDiveDataFormat/Models/Contact.cs
index f8a1874..58c8f72 100644
--- a/src/UniversalDiveDataFormat/Models/Contact.cs
+++ b/src/UniversalDiveDataFormat/Models/Contact.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("contact")]
-public class Contact
+public class Contact: UddfModel
 {
     [XmlElement("email")]
     public List<string> Emails { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/DateOfFlight.cs b/src/UniversalDiveDataFormat/Models/DateOfFlight.cs
index 7801906..50167d2 100644
--- a/src/UniversalDiveDataFormat/Models/DateOfFlight.cs
+++ b/src/UniversalDiveDataFormat/Models/DateOfFlight.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("dateofflight")]
-public class DateOfFlight
+public class DateOfFlight: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime? DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/DateOfTrip.cs b/src/UniversalDiveDataFormat/Models/DateOfTrip.cs
index 1edbe14..3a982ef 100644
--- a/src/UniversalDiveDataFormat/Models/DateOfTrip.cs
+++ b/src/UniversalDiveDataFormat/Models/DateOfTrip.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("dateoftrip")]
-public class DateOfTrip
+public class DateOfTrip: UddfModel
 {
 	[XmlAttribute("startdate")]
 	public required DateTime StartDate { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/DecoModel.cs b/src/UniversalDiveDataFormat/Models/DecoModel.cs
index cd8346d..bf512df 100644
--- a/src/UniversalDiveDataFormat/Models/DecoModel.cs
+++ b/src/UniversalDiveDataFormat/Models/DecoModel.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("decomodel")]
-public class DecoModel
+public class DecoModel: UddfModel
 {
 	[XmlElement("buehlmann")]
 	public List<Buehlmann> BuehlmannModels { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Descent.cs b/src/UniversalDiveDataFormat/Models/Descent.cs
index c070959..b214b43 100644
--- a/src/UniversalDiveDataFormat/Models/Descent.cs
+++ b/src/UniversalDiveDataFormat/Models/Descent.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("descent")]
-public class Descent
+public class Descent: UddfModel
 {
 	[XmlElement("waypoint")]
 	public List<Waypoint> Waypoints { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Dive.cs b/src/UniversalDiveDataFormat/Models/Dive.cs
index 1110688..1d9bdb7 100644
--- a/src/UniversalDiveDataFormat/Models/Dive.cs
+++ b/src/UniversalDiveDataFormat/Models/Dive.cs
@@ -1,13 +1,14 @@
 using System.Xml;
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("dive")]
-public class Dive : ILinkable
+public class Dive: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("link")]
 	public List<Link> Links { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/DiveBase.cs b/src/UniversalDiveDataFormat/Models/DiveBase.cs
index 13559c1..f8bad11 100644
--- a/src/UniversalDiveDataFormat/Models/DiveBase.cs
+++ b/src/UniversalDiveDataFormat/Models/DiveBase.cs
@@ -1,12 +1,13 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("divebase")]
-public class DiveBase : ILinkable
+public class DiveBase: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/DiveComputerAlarm.cs b/src/UniversalDiveDataFormat/Models/DiveComputerAlarm.cs
index 26acbc2..db4107b 100644
--- a/src/UniversalDiveDataFormat/Models/DiveComputerAlarm.cs
+++ b/src/UniversalDiveDataFormat/Models/DiveComputerAlarm.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("dcalarm")]
-public class DiveComputerAlarm
+public class DiveComputerAlarm: UddfModel
 {
 	[XmlElement("acknowledge")]
 	public Acknowledge? Acknowledge { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/DiveComputerControl.cs b/src/UniversalDiveDataFormat/Models/DiveComputerControl.cs
index 867c73a..c4195ab 100644
--- a/src/UniversalDiveDataFormat/Models/DiveComputerControl.cs
+++ b/src/UniversalDiveDataFormat/Models/DiveComputerControl.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("divecomputercontrol")]
-public class DiveComputerControl
+public class DiveComputerControl: UddfModel
 {
 	[XmlElement("divecomputerdump")]
 	public List<DiveComputerDump> DiveComputerDumps { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/DiveComputerDump.cs b/src/UniversalDiveDataFormat/Models/DiveComputerDump.cs
index 0d8fdf9..25ad45e 100644
--- a/src/UniversalDiveDataFormat/Models/DiveComputerDump.cs
+++ b/src/UniversalDiveDataFormat/Models/DiveComputerDump.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("divecomputerdump")]
-public class DiveComputerDump
+public class DiveComputerDump: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime? DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/DiveInsurances.cs b/src/UniversalDiveDataFormat/Models/DiveInsurances.cs
index 28f0e92..7ad9282 100644
--- a/src/UniversalDiveDataFormat/Models/DiveInsurances.cs
+++ b/src/UniversalDiveDataFormat/Models/DiveInsurances.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("diveinsurances")]
-public class DiveInsurances
+public class DiveInsurances: UddfModel
 {
 	[XmlElement("insurance")]
 	public List<Insurance> Insurances { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/DivePermissions.cs b/src/UniversalDiveDataFormat/Models/DivePermissions.cs
index eedd99a..5fc17b6 100644
--- a/src/UniversalDiveDataFormat/Models/DivePermissions.cs
+++ b/src/UniversalDiveDataFormat/Models/DivePermissions.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("divepermissions")]
-public class DivePermissions
+public class DivePermissions: UddfModel
 {
 	[XmlElement("permit")]
 	public List<Permit> Permits { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/DiveSite.cs b/src/UniversalDiveDataFormat/Models/DiveSite.cs
index 6e46c15..8ad1988 100644
--- a/src/UniversalDiveDataFormat/Models/DiveSite.cs
+++ b/src/UniversalDiveDataFormat/Models/DiveSite.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("divesite")]
-public class DiveSite
+public class DiveSite: UddfModel
 {
 	[XmlElement("site")]
 	public List<Site> Sites { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/DiveTrips.cs b/src/UniversalDiveDataFormat/Models/DiveTrips.cs
index c337e2e..c4a4058 100644
--- a/src/UniversalDiveDataFormat/Models/DiveTrips.cs
+++ b/src/UniversalDiveDataFormat/Models/DiveTrips.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("divetrip")]
-public class DiveTrips
+public class DiveTrips: UddfModel
 {
 	[XmlElement("trip")]
 	public List<Trip> Trips { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Diver.cs b/src/UniversalDiveDataFormat/Models/Diver.cs
index 8b4f5a9..e3d7777 100644
--- a/src/UniversalDiveDataFormat/Models/Diver.cs
+++ b/src/UniversalDiveDataFormat/Models/Diver.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("diver")]
-public class Diver
+public class Diver: UddfModel
 {
 	[XmlElement("owner")]
 	public required Owner Owner { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/DiverDetails.cs b/src/UniversalDiveDataFormat/Models/DiverDetails.cs
index 991a54d..36fa29b 100644
--- a/src/UniversalDiveDataFormat/Models/DiverDetails.cs
+++ b/src/UniversalDiveDataFormat/Models/DiverDetails.cs
@@ -2,10 +2,10 @@
 
 namespace UniversalDiveDataFormat.Models;
 
-public abstract class DiverDetails : ILinkable
+public abstract class DiverDetails: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("address")]
 	public Address? Address { get; init; }
@@ -44,10 +44,10 @@ public abstract class DiverDetails : ILinkable
 }
 
 [XmlRoot("buddy")]
-public class Buddy : DiverDetails;
+public class Buddy: DiverDetails;
 
 [XmlRoot("owner")]
-public class Owner : DiverDetails;
+public class Owner: DiverDetails;
 
 [XmlRoot("student")]
-public class Student;
\ No newline at end of file
+public class Student: UddfModel;
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/Doctor.cs b/src/UniversalDiveDataFormat/Models/Doctor.cs
index c183f8e..5fe382c 100644
--- a/src/UniversalDiveDataFormat/Models/Doctor.cs
+++ b/src/UniversalDiveDataFormat/Models/Doctor.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("doctor")]
-public class Doctor: ILinkable
+public class Doctor: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("address")]
 	public Address? Address { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Drug.cs b/src/UniversalDiveDataFormat/Models/Drug.cs
index a87282a..eeb5b20 100644
--- a/src/UniversalDiveDataFormat/Models/Drug.cs
+++ b/src/UniversalDiveDataFormat/Models/Drug.cs
@@ -2,7 +2,7 @@
 
 namespace UniversalDiveDataFormat.Models;
 
-public abstract class Drug
+public abstract class Drug: UddfModel
 {
 	[XmlElement("aliasname")]
 	public List<string> AliasNames { get; init; } = [];
@@ -21,8 +21,8 @@ public abstract class Drug
 }
 
 [XmlRoot("drink")]
-public class Drink : Drug;
+public class Drink: Drug;
 
 
 [XmlRoot("medicine")]
-public class Medicine : Drug;
\ No newline at end of file
+public class Medicine: Drug;
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/Ecology.cs b/src/UniversalDiveDataFormat/Models/Ecology.cs
index 37b5512..c7b7419 100644
--- a/src/UniversalDiveDataFormat/Models/Ecology.cs
+++ b/src/UniversalDiveDataFormat/Models/Ecology.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("ecology")]
-public class Ecology
+public class Ecology: UddfModel
 {
 	[XmlElement("flora")]
 	public Flora? Flora { get; init; } 
diff --git a/src/UniversalDiveDataFormat/Models/Education.cs b/src/UniversalDiveDataFormat/Models/Education.cs
index 3871270..2bf3672 100644
--- a/src/UniversalDiveDataFormat/Models/Education.cs
+++ b/src/UniversalDiveDataFormat/Models/Education.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("education")]
-public class Education
+public class Education: UddfModel
 {
 	[XmlElement("certification")]
 	public required List<Certification> Certifications { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Equipment.cs b/src/UniversalDiveDataFormat/Models/Equipment.cs
index 8b37303..0f55e45 100644
--- a/src/UniversalDiveDataFormat/Models/Equipment.cs
+++ b/src/UniversalDiveDataFormat/Models/Equipment.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("equipment")]
-public class Equipment
+public class Equipment: UddfModel
 {
 	[XmlElement("boots")]
 	public List<Boots> Boots { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/EquipmentConfiguration.cs b/src/UniversalDiveDataFormat/Models/EquipmentConfiguration.cs
index bf28c02..3d3d6a5 100644
--- a/src/UniversalDiveDataFormat/Models/EquipmentConfiguration.cs
+++ b/src/UniversalDiveDataFormat/Models/EquipmentConfiguration.cs
@@ -1,12 +1,13 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("equipmentconfiguration")]
-public class EquipmentConfiguration : ILinkable
+public class EquipmentConfiguration: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/EquipmentDetails.cs b/src/UniversalDiveDataFormat/Models/EquipmentDetails.cs
index 128ed2b..70d42b0 100644
--- a/src/UniversalDiveDataFormat/Models/EquipmentDetails.cs
+++ b/src/UniversalDiveDataFormat/Models/EquipmentDetails.cs
@@ -1,11 +1,12 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
-public abstract class EquipmentDetails : ILinkable
+public abstract class EquipmentDetails: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 
 	[XmlElement("name")]
 	public required string Name { get; init; }
@@ -40,56 +41,56 @@ public abstract class EquipmentDetails : ILinkable
 }
 
 [XmlRoot("buoyancycontroldevice")]
-public class BuoyancyControlDevice : EquipmentDetails;
+public class BuoyancyControlDevice: EquipmentDetails;
 
 [XmlRoot("boots")]
-public class Boots : EquipmentDetails;
+public class Boots: EquipmentDetails;
 
 [XmlRoot("compass")]
-public class Compass : EquipmentDetails;
+public class Compass: EquipmentDetails;
 
 [XmlRoot("compressor")]
-public class Compressor : EquipmentDetails;
+public class Compressor: EquipmentDetails;
 
 [XmlRoot("divecomputer")]
-public class DiveComputer : EquipmentDetails;
+public class DiveComputer: EquipmentDetails;
 
 [XmlRoot("fins")]
-public class Fins : EquipmentDetails;
+public class Fins: EquipmentDetails;
 
 [XmlRoot("gloves")]
-public class Gloves : EquipmentDetails;
+public class Gloves: EquipmentDetails;
 
 [XmlRoot("knife")]
-public class Knife : EquipmentDetails;
+public class Knife: EquipmentDetails;
 
 [XmlRoot("lead")]
-public class Lead : EquipmentDetails;
+public class Lead: EquipmentDetails;
 
 [XmlRoot("light")]
-public class Light : EquipmentDetails;
+public class Light: EquipmentDetails;
 
 [XmlRoot("mask")]
-public class Mask : EquipmentDetails;
+public class Mask: EquipmentDetails;
 
 [XmlRoot("rebreather")]
-public class Rebreather : EquipmentDetails;
+public class Rebreather: EquipmentDetails;
 
 [XmlRoot("regulator")]
-public class Regulator : EquipmentDetails;
+public class Regulator: EquipmentDetails;
 
 [XmlRoot("scooter")]
-public class Scooter : EquipmentDetails;
+public class Scooter: EquipmentDetails;
 
 [XmlRoot("suit")]
-public class Suit : EquipmentDetails
+public class Suit: EquipmentDetails
 { 
 	[XmlElement("suittype")]
 	public SuitType? SuitType { get; init; }
 }
 
 [XmlRoot("tank")]
-public class Tank : EquipmentDetails
+public class Tank: EquipmentDetails
 {
 	[XmlElement("tankmaterial")]
 	public TankMaterial? TankMaterial { get; init; }
@@ -99,19 +100,19 @@ public class Tank : EquipmentDetails
 }
 
 [XmlRoot("variouspieces")]
-public class VariousPieces : EquipmentDetails;
+public class VariousPieces: EquipmentDetails;
 
 [XmlRoot("watch")]
-public class Watch : EquipmentDetails;
+public class Watch: EquipmentDetails;
 
 [XmlRoot("body")]
 public class Body: EquipmentDetails;
 
 [XmlRoot("flash")]
-public class Flash : EquipmentDetails;
+public class Flash: EquipmentDetails;
 
 [XmlRoot("housing")]
-public class Housing : EquipmentDetails;
+public class Housing: EquipmentDetails;
 
 [XmlRoot("lens")]
-public class Lens : EquipmentDetails;  
+public class Lens: EquipmentDetails;  
diff --git a/src/UniversalDiveDataFormat/Models/EquipmentUsed.cs b/src/UniversalDiveDataFormat/Models/EquipmentUsed.cs
index 35bcda9..6485a50 100644
--- a/src/UniversalDiveDataFormat/Models/EquipmentUsed.cs
+++ b/src/UniversalDiveDataFormat/Models/EquipmentUsed.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("equipmentused")]
-public class EquipmentUsed
+public class EquipmentUsed: UddfModel
 {
 	[XmlElement("leadquantity")]
 	public float? LeadQuantityInKg { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/ExposureToAltitude.cs b/src/UniversalDiveDataFormat/Models/ExposureToAltitude.cs
index 17e1b08..28cb9d6 100644
--- a/src/UniversalDiveDataFormat/Models/ExposureToAltitude.cs
+++ b/src/UniversalDiveDataFormat/Models/ExposureToAltitude.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("exposuretoaltitude")]
-public class ExposureToAltitude
+public class ExposureToAltitude: UddfModel
 {
 	
 	[XmlElement("altitudeofexposure")]
diff --git a/src/UniversalDiveDataFormat/Models/Fauna.cs b/src/UniversalDiveDataFormat/Models/Fauna.cs
index 02598ef..adf1fb2 100644
--- a/src/UniversalDiveDataFormat/Models/Fauna.cs
+++ b/src/UniversalDiveDataFormat/Models/Fauna.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("fauna")]
-public class Fauna
+public class Fauna: UddfModel
 {
 	[XmlElement("vertebrata")]
 	public Vertebrata? Vertebrata { get; init; } 
diff --git a/src/UniversalDiveDataFormat/Models/Flora.cs b/src/UniversalDiveDataFormat/Models/Flora.cs
index 222bd45..7cc435c 100644
--- a/src/UniversalDiveDataFormat/Models/Flora.cs
+++ b/src/UniversalDiveDataFormat/Models/Flora.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("flora")]
-public class Flora
+public class Flora: UddfModel
 {
 	[XmlElement("chlorophyceae")]
 	public List<Chlorophyceae> Chlorophyceae { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/GasDefinitions.cs b/src/UniversalDiveDataFormat/Models/GasDefinitions.cs
index acc799f..31f59f6 100644
--- a/src/UniversalDiveDataFormat/Models/GasDefinitions.cs
+++ b/src/UniversalDiveDataFormat/Models/GasDefinitions.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("gasdefinitions")]
-public class GasDefinitions
+public class GasDefinitions: UddfModel
 {
 	[XmlElement("mix")]
 	public List<Mix> Mixes { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Generator.cs b/src/UniversalDiveDataFormat/Models/Generator.cs
index d682f1b..9ad431b 100644
--- a/src/UniversalDiveDataFormat/Models/Generator.cs
+++ b/src/UniversalDiveDataFormat/Models/Generator.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("generator")]
-public class Generator
+public class Generator: UddfModel
 {
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Geography.cs b/src/UniversalDiveDataFormat/Models/Geography.cs
index fbe7c8e..18d678c 100644
--- a/src/UniversalDiveDataFormat/Models/Geography.cs
+++ b/src/UniversalDiveDataFormat/Models/Geography.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("geography")]
-public class Geography
+public class Geography: UddfModel
 {
 	[XmlElement("address")]
 	public Address? Address { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/GetDiveComputerData.cs b/src/UniversalDiveDataFormat/Models/GetDiveComputerData.cs
index 2073fed..77d7dd0 100644
--- a/src/UniversalDiveDataFormat/Models/GetDiveComputerData.cs
+++ b/src/UniversalDiveDataFormat/Models/GetDiveComputerData.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("getdcdata")]
-public class GetDiveComputerData
+public class GetDiveComputerData: UddfModel
 {
 	[XmlElement("getdcalldata")]
 	public GetDcAllData? GetDiveComputerAllData { get; init; }
@@ -32,25 +32,25 @@ public class GetDiveComputerData
 
 
 [XmlRoot("getdcdata")]
-public class GetDcAllData; 
+public class GetDcAllData: UddfModel; 
 
 [XmlRoot("getdcbuddydata")]
-public class GetDcBuddyData; 
+public class GetDcBuddyData: UddfModel; 
 
 [XmlRoot("getdcdivesitedata")]
-public class GetDcDiveSiteData; 
+public class GetDcDiveSiteData: UddfModel; 
 
 [XmlRoot("getdcdivetripdata")]
-public class GetDcDiveTripData; 
+public class GetDcDiveTripData: UddfModel; 
 
 [XmlRoot("getdcgasdefinitionsdata")]
-public class GetDcGasDefinitionsData; 
+public class GetDcGasDefinitionsData: UddfModel; 
 
 [XmlRoot("getdcgeneratordata")]
-public class GetDcGeneratorData; 
+public class GetDcGeneratorData: UddfModel; 
 
 [XmlRoot("getdcownerdata")]
-public class GetDcOwnerData; 
+public class GetDcOwnerData: UddfModel; 
 
 [XmlRoot("getdcprofiledata")]
-public class GetDcProfileData; 
\ No newline at end of file
+public class GetDcProfileData: UddfModel; 
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/GlobalAlarmsGiven.cs b/src/UniversalDiveDataFormat/Models/GlobalAlarmsGiven.cs
index 6ddcc76..726b38b 100644
--- a/src/UniversalDiveDataFormat/Models/GlobalAlarmsGiven.cs
+++ b/src/UniversalDiveDataFormat/Models/GlobalAlarmsGiven.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("globalalarmsgiven")]
-public class GlobalAlarmsGiven
+public class GlobalAlarmsGiven: UddfModel
 {
 	[XmlElement("globalalarm")]
 	public List<GlobalAlarm> GlobalAlarms { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Guide.cs b/src/UniversalDiveDataFormat/Models/Guide.cs
index 2e62452..6ebc2b8 100644
--- a/src/UniversalDiveDataFormat/Models/Guide.cs
+++ b/src/UniversalDiveDataFormat/Models/Guide.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("guide")]
-public class Guide: ILinkable
+public class Guide: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
 	public string Id { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Image.cs b/src/UniversalDiveDataFormat/Models/Image.cs
index 390ea1f..7d3ec72 100644
--- a/src/UniversalDiveDataFormat/Models/Image.cs
+++ b/src/UniversalDiveDataFormat/Models/Image.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("image")]
-public class Image : ILinkable
+public class Image: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	// These should ideally be int? but the serializer doesn't like that
 	[XmlAttribute("height")]
diff --git a/src/UniversalDiveDataFormat/Models/ImageData.cs b/src/UniversalDiveDataFormat/Models/ImageData.cs
index 3a883a9..579d2df 100644
--- a/src/UniversalDiveDataFormat/Models/ImageData.cs
+++ b/src/UniversalDiveDataFormat/Models/ImageData.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("imagedata")]
-public class ImageData
+public class ImageData: UddfModel
 {
 	[XmlElement("aperture")]
 	public float? Aperture { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Infinity.cs b/src/UniversalDiveDataFormat/Models/Infinity.cs
index a8db056..a243292 100644
--- a/src/UniversalDiveDataFormat/Models/Infinity.cs
+++ b/src/UniversalDiveDataFormat/Models/Infinity.cs
@@ -3,4 +3,4 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("infinity")]
-public class Infinity;
\ No newline at end of file
+public class Infinity: UddfModel;
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/InformationAfterDive.cs b/src/UniversalDiveDataFormat/Models/InformationAfterDive.cs
index 1319b8e..0fa0d4f 100644
--- a/src/UniversalDiveDataFormat/Models/InformationAfterDive.cs
+++ b/src/UniversalDiveDataFormat/Models/InformationAfterDive.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("informationafterdive")]
-public class InformationAfterDive
+public class InformationAfterDive: UddfModel
 {
 	
 	[XmlElement("anysymptoms")]
diff --git a/src/UniversalDiveDataFormat/Models/InformationBeforeDive.cs b/src/UniversalDiveDataFormat/Models/InformationBeforeDive.cs
index 591d95f..9af94a9 100644
--- a/src/UniversalDiveDataFormat/Models/InformationBeforeDive.cs
+++ b/src/UniversalDiveDataFormat/Models/InformationBeforeDive.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("informationbeforedive")]
-public class InformationBeforeDive
+public class InformationBeforeDive: UddfModel
 {
 	[XmlElement("airtemperature")]
 	public float? AirTemperatureInKelvin { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/InputProfile.cs b/src/UniversalDiveDataFormat/Models/InputProfile.cs
index b036919..7ba7eba 100644
--- a/src/UniversalDiveDataFormat/Models/InputProfile.cs
+++ b/src/UniversalDiveDataFormat/Models/InputProfile.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("inputprofile")]
-public class InputProfile
+public class InputProfile: UddfModel
 {
 	[XmlElement("link")]
 	public List<Link> Links { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Instructor.cs b/src/UniversalDiveDataFormat/Models/Instructor.cs
index b480ed6..49e34cc 100644
--- a/src/UniversalDiveDataFormat/Models/Instructor.cs
+++ b/src/UniversalDiveDataFormat/Models/Instructor.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("instructor")]
-public class Instructor: ILinkable
+public class Instructor: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("personal")]
 	public required Personal Personal { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Insurance.cs b/src/UniversalDiveDataFormat/Models/Insurance.cs
index c6974ab..95769e1 100644
--- a/src/UniversalDiveDataFormat/Models/Insurance.cs
+++ b/src/UniversalDiveDataFormat/Models/Insurance.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("insurance")]
-public class Insurance
+public class Insurance: UddfModel
 {
 	[XmlElement("name")]
 	public string? Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Invertebrata.cs b/src/UniversalDiveDataFormat/Models/Invertebrata.cs
index 6222b78..6f06bc2 100644
--- a/src/UniversalDiveDataFormat/Models/Invertebrata.cs
+++ b/src/UniversalDiveDataFormat/Models/Invertebrata.cs
@@ -4,7 +4,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("invertebrata")]
-public class Invertebrata
+public class Invertebrata: UddfModel
 {
 	[XmlElement("amphibia")]
 	public Amphibia? Amphibia { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/IssueDate.cs b/src/UniversalDiveDataFormat/Models/IssueDate.cs
index 6eef5e0..30dca8a 100644
--- a/src/UniversalDiveDataFormat/Models/IssueDate.cs
+++ b/src/UniversalDiveDataFormat/Models/IssueDate.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("issuedate")]
-public class IssueDate
+public class IssueDate: UddfModel
 {
 	[XmlElement("datetime")]
 	public required DateTime DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/LaunchingDate.cs b/src/UniversalDiveDataFormat/Models/LaunchingDate.cs
index 5e04631..93f52f5 100644
--- a/src/UniversalDiveDataFormat/Models/LaunchingDate.cs
+++ b/src/UniversalDiveDataFormat/Models/LaunchingDate.cs
@@ -2,9 +2,9 @@
 
 namespace UniversalDiveDataFormat.Models;
 
-[XmlRoot("LaunchingDate")]
+[XmlRoot("launchingdate")]
 public class LaunchingDate
 {
 	[XmlElement("datetime")]
-	public DateTime? DateTime { get; init; }
+	public DateTime DateTime { get; init; }
 }
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/Link.cs b/src/UniversalDiveDataFormat/Models/Link.cs
deleted file mode 100644
index a600c58..0000000
--- a/src/UniversalDiveDataFormat/Models/Link.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Xml.Serialization;
-
-namespace UniversalDiveDataFormat.Models;
-
-[XmlRoot("link")]
-public class Link
-{
-	[XmlAttribute("ref")]
-	public required string Ref { get; init; }
-	
-	// public ILinkable? LinkedObject { get; init; }
-}
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/ILinkable.cs b/src/UniversalDiveDataFormat/Models/Linking/ILinkable.cs
similarity index 79%
rename from src/UniversalDiveDataFormat/Models/ILinkable.cs
rename to src/UniversalDiveDataFormat/Models/Linking/ILinkable.cs
index b1c4d6b..7fdfa52 100644
--- a/src/UniversalDiveDataFormat/Models/ILinkable.cs
+++ b/src/UniversalDiveDataFormat/Models/Linking/ILinkable.cs
@@ -5,5 +5,5 @@ namespace UniversalDiveDataFormat.Models;
 public interface ILinkable
 {
 	[XmlAttribute("id")]
-	public string Id { get; init; }
+	public string? Id { get; init; }
 }
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/Linking/Link.cs b/src/UniversalDiveDataFormat/Models/Linking/Link.cs
new file mode 100644
index 0000000..62d7f51
--- /dev/null
+++ b/src/UniversalDiveDataFormat/Models/Linking/Link.cs
@@ -0,0 +1,21 @@
+using System.Xml.Serialization;
+
+namespace UniversalDiveDataFormat.Models.Linking;
+
+[XmlRoot("link")]
+public class Link: UddfModel
+{
+	[XmlAttribute("ref")]
+	public required string Ref { get; init; }
+	
+	[XmlIgnore]
+	public ILinkable? LinkedObject { get; private set; }
+	
+	[XmlIgnore]
+	public bool IsResolved => LinkedObject is not null;
+	
+	public void SetLinkedObject(ILinkable? linkedObject)
+	{
+		LinkedObject = linkedObject;
+	}
+}
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/Maker.cs b/src/UniversalDiveDataFormat/Models/Maker.cs
index d7588e9..acac3a4 100644
--- a/src/UniversalDiveDataFormat/Models/Maker.cs
+++ b/src/UniversalDiveDataFormat/Models/Maker.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("maker")]
-public class Maker
+public class Maker: UddfModel
 {
 	[XmlElement("manufacturer")]
 	public List<Manufacturer> Manufacturers { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Manufacturer.cs b/src/UniversalDiveDataFormat/Models/Manufacturer.cs
index 92d24d5..b28e522 100644
--- a/src/UniversalDiveDataFormat/Models/Manufacturer.cs
+++ b/src/UniversalDiveDataFormat/Models/Manufacturer.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("manufacturer")]
-public class Manufacturer: ILinkable
+public class Manufacturer: UddfModel, ILinkable
 {
     [XmlAttribute("id")] 
-    public required string Id { get; init; }
+    public string? Id { get; init; }
 
     [XmlElement("name")]
     public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/MediaData.cs b/src/UniversalDiveDataFormat/Models/MediaData.cs
index 085ef72..e15b7a6 100644
--- a/src/UniversalDiveDataFormat/Models/MediaData.cs
+++ b/src/UniversalDiveDataFormat/Models/MediaData.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("mediadata")]
-public class MediaData
+public class MediaData: UddfModel
 {
 	[XmlElement("audio")]
 	public List<Audio> AudioFiles { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Medical.cs b/src/UniversalDiveDataFormat/Models/Medical.cs
index 5db5b63..958ed10 100644
--- a/src/UniversalDiveDataFormat/Models/Medical.cs
+++ b/src/UniversalDiveDataFormat/Models/Medical.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("medical")]
-public class Medical
+public class Medical: UddfModel
 {
 	[XmlElement("examination")]
 	public List<MedicalExamination> Examinations { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/MedicalExamination.cs b/src/UniversalDiveDataFormat/Models/MedicalExamination.cs
index ce87136..9edc126 100644
--- a/src/UniversalDiveDataFormat/Models/MedicalExamination.cs
+++ b/src/UniversalDiveDataFormat/Models/MedicalExamination.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("examination")]
-public class MedicalExamination
+public class MedicalExamination: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime? DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/MedicationBeforeDive.cs b/src/UniversalDiveDataFormat/Models/MedicationBeforeDive.cs
index 2cc9566..58e0af0 100644
--- a/src/UniversalDiveDataFormat/Models/MedicationBeforeDive.cs
+++ b/src/UniversalDiveDataFormat/Models/MedicationBeforeDive.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("medicationbeforedive")]
-public class MedicationBeforeDive
+public class MedicationBeforeDive: UddfModel
 {
 	[XmlElement("medicine")]
 	public List<Medicine> Medicines { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Mix.cs b/src/UniversalDiveDataFormat/Models/Mix.cs
index 66feddd..ff64ebf 100644
--- a/src/UniversalDiveDataFormat/Models/Mix.cs
+++ b/src/UniversalDiveDataFormat/Models/Mix.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("mix")]
-public class Mix: ILinkable
+public class Mix: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/MixChange.cs b/src/UniversalDiveDataFormat/Models/MixChange.cs
index dcfc7d5..77b98ce 100644
--- a/src/UniversalDiveDataFormat/Models/MixChange.cs
+++ b/src/UniversalDiveDataFormat/Models/MixChange.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("mixchange")]
-public class MixChange
+public class MixChange: UddfModel
 {
 	[XmlElement("ascent")]
 	public required Ascent Ascent { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/NextServiceDate.cs b/src/UniversalDiveDataFormat/Models/NextServiceDate.cs
index b504570..9f06d8c 100644
--- a/src/UniversalDiveDataFormat/Models/NextServiceDate.cs
+++ b/src/UniversalDiveDataFormat/Models/NextServiceDate.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("nextservicedate")]
-public class NextServiceDate
+public class NextServiceDate: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime? DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/NoSuit.cs b/src/UniversalDiveDataFormat/Models/NoSuit.cs
index de8cd3f..e12e6b1 100644
--- a/src/UniversalDiveDataFormat/Models/NoSuit.cs
+++ b/src/UniversalDiveDataFormat/Models/NoSuit.cs
@@ -3,4 +3,4 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("NoSuit")]
-public class NoSuit;
\ No newline at end of file
+public class NoSuit: UddfModel;
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/Notes.cs b/src/UniversalDiveDataFormat/Models/Notes.cs
index df6be9c..7eb3050 100644
--- a/src/UniversalDiveDataFormat/Models/Notes.cs
+++ b/src/UniversalDiveDataFormat/Models/Notes.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("notes")]
-public class Notes
+public class Notes: UddfModel
 {
 	[XmlElement("para")]
 	public List<string> Paragraphs { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/NumberOfDives.cs b/src/UniversalDiveDataFormat/Models/NumberOfDives.cs
index 2300c91..8e2d97b 100644
--- a/src/UniversalDiveDataFormat/Models/NumberOfDives.cs
+++ b/src/UniversalDiveDataFormat/Models/NumberOfDives.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("numberofdives")]
-public class NumberOfDives
+public class NumberOfDives: UddfModel
 {
 	[XmlAttribute("dives")]
 	public required int Dives { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Observations.cs b/src/UniversalDiveDataFormat/Models/Observations.cs
index 888f684..3d2adb5 100644
--- a/src/UniversalDiveDataFormat/Models/Observations.cs
+++ b/src/UniversalDiveDataFormat/Models/Observations.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("observations")]
-public class Observations
+public class Observations: UddfModel
 {
 	[XmlElement("flora")]
 	public List<Flora> Flora { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Operator.cs b/src/UniversalDiveDataFormat/Models/Operator.cs
index 6835734..ff37b0f 100644
--- a/src/UniversalDiveDataFormat/Models/Operator.cs
+++ b/src/UniversalDiveDataFormat/Models/Operator.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("operator")]
-public class Operator
+public class Operator: UddfModel
 {
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Output.cs b/src/UniversalDiveDataFormat/Models/Output.cs
index f4a532d..9f39dbc 100644
--- a/src/UniversalDiveDataFormat/Models/Output.cs
+++ b/src/UniversalDiveDataFormat/Models/Output.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("output")]
-public class Output
+public class Output: UddfModel
 {
 	[XmlElement("lingo")]
 	public string? Lingo { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Permit.cs b/src/UniversalDiveDataFormat/Models/Permit.cs
index aeff1d8..5977064 100644
--- a/src/UniversalDiveDataFormat/Models/Permit.cs
+++ b/src/UniversalDiveDataFormat/Models/Permit.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("permit")]
-public class Permit
+public class Permit: UddfModel
 {
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Personal.cs b/src/UniversalDiveDataFormat/Models/Personal.cs
index f21beef..606d941 100644
--- a/src/UniversalDiveDataFormat/Models/Personal.cs
+++ b/src/UniversalDiveDataFormat/Models/Personal.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("personal")]
-public class Personal
+public class Personal: UddfModel
 {
 	[XmlElement("birthdate")]
 	public BirthDate? BirthDate { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/PlannedProfile.cs b/src/UniversalDiveDataFormat/Models/PlannedProfile.cs
index 5d3b87e..22f5264 100644
--- a/src/UniversalDiveDataFormat/Models/PlannedProfile.cs
+++ b/src/UniversalDiveDataFormat/Models/PlannedProfile.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("plannedprofile")]
-public class PlannedProfile
+public class PlannedProfile: UddfModel
 {
 	[XmlAttribute("startdivemode")]
 	public required StartDiveMode StartDiveMode { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/PointOfInterest.cs b/src/UniversalDiveDataFormat/Models/PointOfInterest.cs
index 062b0d6..89b1a0e 100644
--- a/src/UniversalDiveDataFormat/Models/PointOfInterest.cs
+++ b/src/UniversalDiveDataFormat/Models/PointOfInterest.cs
@@ -2,10 +2,10 @@
 
 namespace UniversalDiveDataFormat.Models;
 
-public abstract class PointOfInterest : ILinkable
+public abstract class PointOfInterest: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("name")]
 	public required string Name { get; init; }
@@ -18,19 +18,19 @@ public abstract class PointOfInterest : ILinkable
 }
 
 [XmlRoot("lake")]
-public class Lake : PointOfInterest;
+public class Lake:  PointOfInterest;
 
 [XmlRoot("cave")]
-public class Cave : PointOfInterest;
+public class Cave:  PointOfInterest;
 
 [XmlRoot("river")]
-public class River : PointOfInterest;
+public class River:  PointOfInterest;
 
 [XmlRoot("shore")]
-public class Shore : PointOfInterest;
+public class Shore:  PointOfInterest;
 
 [XmlRoot("wreck")]
-public class Wreck : PointOfInterest
+public class Wreck:  PointOfInterest
 {
 	[XmlElement("built")]
 	public Built? Built { get; init; }
@@ -50,7 +50,7 @@ public class Wreck : PointOfInterest
 }
 
 [XmlRoot("indoor")]
-public class Indoor: PointOfInterest
+public class Indoor:  PointOfInterest
 {
 	
 	[XmlElement("address")]
diff --git a/src/UniversalDiveDataFormat/Models/Price.cs b/src/UniversalDiveDataFormat/Models/Price.cs
index 01d0104..68eca52 100644
--- a/src/UniversalDiveDataFormat/Models/Price.cs
+++ b/src/UniversalDiveDataFormat/Models/Price.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("price")]
-public class Price
+public class Price: UddfModel
 {
 	[XmlAttribute("currency")]
 	public string? Currency { get; init; }
@@ -12,8 +12,17 @@ public class Price
 	public decimal Value { get; init; }
 }
 
+[XmlRoot("pricedivepackage")]
+public class PriceDivePackage: Price
+{
+
+	[XmlAttribute("noofdives")]
+	public required int NumberOfDives { get; init; }
+}
+
+
 [XmlRoot("priceperdive")]
-public class PricePerDive : Price;
+public class PricePerDive: Price;
 
 [XmlRoot("priceperlitre")]
-public class PricePerLiter : Price;
+public class PricePerLiter: Price;
diff --git a/src/UniversalDiveDataFormat/Models/PriceDivePackage.cs b/src/UniversalDiveDataFormat/Models/PriceDivePackage.cs
deleted file mode 100644
index bba6a84..0000000
--- a/src/UniversalDiveDataFormat/Models/PriceDivePackage.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Globalization;
-using System.Xml.Serialization;
-
-namespace UniversalDiveDataFormat.Models;
-
-[XmlRoot("pricedivepackage")]
-public class PriceDivePackage: Price
-{
-
-	[XmlAttribute("noofdives")]
-	public required int NumberOfDives { get; init; }
-	
-}
diff --git a/src/UniversalDiveDataFormat/Models/Profile.cs b/src/UniversalDiveDataFormat/Models/Profile.cs
index 68d740d..1eaf789 100644
--- a/src/UniversalDiveDataFormat/Models/Profile.cs
+++ b/src/UniversalDiveDataFormat/Models/Profile.cs
@@ -1,13 +1,14 @@
 using System.Xml;
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("profile")]
-public class Profile: ILinkable
+public class Profile: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("applicationdata")]
 	public XmlElement? ApplicationData { get; init; } // This stuff is application-specific
diff --git a/src/UniversalDiveDataFormat/Models/ProfileData.cs b/src/UniversalDiveDataFormat/Models/ProfileData.cs
index c9fb83e..bef327c 100644
--- a/src/UniversalDiveDataFormat/Models/ProfileData.cs
+++ b/src/UniversalDiveDataFormat/Models/ProfileData.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("profiledata")]
-public class ProfileData
+public class ProfileData: UddfModel
 {
 	[XmlElement("repetitiongroup")]
 	public List<RepetitionGroup> RepetitionGroups { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Purchase.cs b/src/UniversalDiveDataFormat/Models/Purchase.cs
index 5ae843a..5fc3939 100644
--- a/src/UniversalDiveDataFormat/Models/Purchase.cs
+++ b/src/UniversalDiveDataFormat/Models/Purchase.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("purchase")]
-public class Purchase
+public class Purchase: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime? DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Rating.cs b/src/UniversalDiveDataFormat/Models/Rating.cs
index d8fd9ca..8c41235 100644
--- a/src/UniversalDiveDataFormat/Models/Rating.cs
+++ b/src/UniversalDiveDataFormat/Models/Rating.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("rating")]
-public class Rating
+public class Rating: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime? DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/RelatedDives.cs b/src/UniversalDiveDataFormat/Models/RelatedDives.cs
index bae065d..9a3f3c1 100644
--- a/src/UniversalDiveDataFormat/Models/RelatedDives.cs
+++ b/src/UniversalDiveDataFormat/Models/RelatedDives.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("relateddives")]
-public class RelatedDives
+public class RelatedDives: UddfModel
 {
 	[XmlElement("link")]
 	public List<Link> Links { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/RepetitionGroup.cs b/src/UniversalDiveDataFormat/Models/RepetitionGroup.cs
index ba4577a..ad49923 100644
--- a/src/UniversalDiveDataFormat/Models/RepetitionGroup.cs
+++ b/src/UniversalDiveDataFormat/Models/RepetitionGroup.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("repetitiongroup")]
-public class RepetitionGroup : ILinkable
+public class RepetitionGroup: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 
 	[XmlElement("dive")]
 	public List<Dive> Dives { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Rgbm.cs b/src/UniversalDiveDataFormat/Models/Rgbm.cs
index 3b3130e..1119e7c 100644
--- a/src/UniversalDiveDataFormat/Models/Rgbm.cs
+++ b/src/UniversalDiveDataFormat/Models/Rgbm.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("rgbm")]
-public class Rgbm: ILinkable
+public class Rgbm: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("tissue")]
 	public List<Tissue> Tissues { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/Samples.cs b/src/UniversalDiveDataFormat/Models/Samples.cs
index 2e72109..ee6c292 100644
--- a/src/UniversalDiveDataFormat/Models/Samples.cs
+++ b/src/UniversalDiveDataFormat/Models/Samples.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("samples")]
-public class Samples
+public class Samples: UddfModel
 {
 	[XmlElement("waypoint")]
 	public List<Waypoint> Waypoints { get; init; } = [];
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTime.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTime.cs
index f54c286..b95c061 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTime.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTime.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcalarmtime")]
-public class SetDiveComputerAlarmTime
+public class SetDiveComputerAlarmTime: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerBuddyData.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerBuddyData.cs
index fd2dd4d..1fde577 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerBuddyData.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerBuddyData.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcbuddydata")]
-public class SetDiveComputerBuddyData
+public class SetDiveComputerBuddyData: UddfModel
 {
 	[XmlAttribute("buddy")]
 	public required string BuddyId { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerData.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerData.cs
index 95ea21b..c5d305d 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerData.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerData.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcdata")]
-public class SetDiveComputerData
+public class SetDiveComputerData: UddfModel
 {
 	[XmlElement("setdcalarmtime")]
 	public SetDiveComputerAlarmTime? SetDiveComputerAlarmTime { get; init; }
@@ -50,10 +50,10 @@ public class SetDiveComputerData
 }
 
 [XmlRoot("setdcgeneratordata")]
-public class SetDiveComputerGeneratorData;
+public class SetDiveComputerGeneratorData: UddfModel;
 
 [XmlRoot("setdcownerdata")]
-public class SetDiveComputerOwnerData;
+public class SetDiveComputerOwnerData: UddfModel;
 
 [XmlRoot("setgasdefinitionsdata")]
-public class SetDiveComputerGasDefinitionsData;
\ No newline at end of file
+public class SetDiveComputerGasDefinitionsData: UddfModel;
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerDateTime.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerDateTime.cs
index a329e7f..3cfb66f 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerDateTime.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerDateTime.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcdatetime")]
-public class SetDiveComputerDateTime
+public class SetDiveComputerDateTime: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime? DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerDecoModel.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerDecoModel.cs
index 846e54c..3d8442d 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerDecoModel.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerDecoModel.cs
@@ -4,7 +4,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcdecomodel")]
-public class SetDiveComputerDecoModel
+public class SetDiveComputerDecoModel: UddfModel
 {
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveDepthAlarm.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveDepthAlarm.cs
index aab55be..ec4d611 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveDepthAlarm.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveDepthAlarm.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcdivedepthalarm")]
-public class SetDiveComputerDiveDepthAlarm
+public class SetDiveComputerDiveDepthAlarm: UddfModel
 {
 	[XmlElement("dcalarm")]
 	public required DiveComputerAlarm DiveComputerAlarm { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveSiteData.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveSiteData.cs
index d4111e4..95c3318 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveSiteData.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveSiteData.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcdivesitedata")]
-public class SetDiveComputerDiveSiteData
+public class SetDiveComputerDiveSiteData: UddfModel
 {
 	[XmlAttribute("divesite")]
 	public string DiveSiteId { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveTimeAlarm.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveTimeAlarm.cs
index fb072f5..f014e95 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveTimeAlarm.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerDiveTimeAlarm.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcdivetimealarm")]
-public class SetDiveComputerDiveTimeAlarm
+public class SetDiveComputerDiveTimeAlarm: UddfModel
 {
 	[XmlElement("dcalarm")]
 	public required DiveComputerAlarm DiveComputerAlarm { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerEndNoDecoTimeAlarm.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerEndNoDecoTimeAlarm.cs
index 6d0a32d..d6590ec 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerEndNoDecoTimeAlarm.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerEndNoDecoTimeAlarm.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcendndtalarm")]
-public class SetDiveComputerEndNoDecoTimeAlarm
+public class SetDiveComputerEndNoDecoTimeAlarm: UddfModel
 {
 	[XmlElement("dcalarm")]
 	public required DiveComputerAlarm DiveComputerAlarm { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerPartialPressureOfO2Alarm.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerPartialPressureOfO2Alarm.cs
index 39db338..a9d0cce 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerPartialPressureOfO2Alarm.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerPartialPressureOfO2Alarm.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcdivepo2alarm")]
-public class SetDiveComputerPartialPressureOfO2Alarm
+public class SetDiveComputerPartialPressureOfO2Alarm: UddfModel
 {
 	[XmlElement("dcalarm")]
 	public DiveComputerAlarm DiveComputerAlarm { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerPassword.cs b/src/UniversalDiveDataFormat/Models/SetDiveComputerPassword.cs
index d5919b0..aa65e2c 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerPassword.cs
+++ b/src/UniversalDiveDataFormat/Models/SetDiveComputerPassword.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("setdcpassword")]
-public class SetDiveComputerPassword
+public class SetDiveComputerPassword: UddfModel
 {
 	[XmlText]
 	public required string Password { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/ShipDimension.cs b/src/UniversalDiveDataFormat/Models/ShipDimension.cs
index 342ab29..59f500a 100644
--- a/src/UniversalDiveDataFormat/Models/ShipDimension.cs
+++ b/src/UniversalDiveDataFormat/Models/ShipDimension.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("shipdimension")]
-public class ShipDimension
+public class ShipDimension: UddfModel
 {
 	[XmlElement("beam")]
 	public float? BeamInMeters { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Shop.cs b/src/UniversalDiveDataFormat/Models/Shop.cs
index d7f06a5..636610e 100644
--- a/src/UniversalDiveDataFormat/Models/Shop.cs
+++ b/src/UniversalDiveDataFormat/Models/Shop.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("shop")]
-public class Shop: ILinkable
+public class Shop: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Site.cs b/src/UniversalDiveDataFormat/Models/Site.cs
index 4bdad36..c4f32f6 100644
--- a/src/UniversalDiveDataFormat/Models/Site.cs
+++ b/src/UniversalDiveDataFormat/Models/Site.cs
@@ -1,12 +1,13 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("site")]
-public class Site: ILinkable
+public class Site: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SiteData.cs b/src/UniversalDiveDataFormat/Models/SiteData.cs
index cb57ceb..1c6f93c 100644
--- a/src/UniversalDiveDataFormat/Models/SiteData.cs
+++ b/src/UniversalDiveDataFormat/Models/SiteData.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("sitedata")]
-public class SiteData
+public class SiteData: UddfModel
 {
 	[XmlElement("arealength")]
 	public float? AreaLengthInMeters { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Species.cs b/src/UniversalDiveDataFormat/Models/Species.cs
index d4b4de1..689bf35 100644
--- a/src/UniversalDiveDataFormat/Models/Species.cs
+++ b/src/UniversalDiveDataFormat/Models/Species.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("species")]
-public class Species : ILinkable
+public class Species: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 
 	[XmlElement("trivialname")]
 	public string? TrivialName { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Sunk.cs b/src/UniversalDiveDataFormat/Models/Sunk.cs
index 2c25bb7..7b4d644 100644
--- a/src/UniversalDiveDataFormat/Models/Sunk.cs
+++ b/src/UniversalDiveDataFormat/Models/Sunk.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("sunk")]
-public class Sunk
+public class Sunk: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime? Date { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/SurfaceInterval.cs b/src/UniversalDiveDataFormat/Models/SurfaceInterval.cs
index ec64c72..42bb122 100644
--- a/src/UniversalDiveDataFormat/Models/SurfaceInterval.cs
+++ b/src/UniversalDiveDataFormat/Models/SurfaceInterval.cs
@@ -2,7 +2,7 @@
 
 namespace UniversalDiveDataFormat.Models;
 
-public abstract class SurfaceInterval
+public abstract class SurfaceInterval: UddfModel
 {
 	[XmlElement("exposuretoaltitude")]
 	public ExposureToAltitude? ExposureToAltitude { get; init; }
@@ -19,7 +19,7 @@ public abstract class SurfaceInterval
 
 
 [XmlRoot("surfaceintervalafterdive")]
-public class SurfaceIntervalAfterDive : SurfaceInterval;
+public class SurfaceIntervalAfterDive: SurfaceInterval;
 
 [XmlRoot("surfaceintervalbeforedive")]
-public class SurfaceIntervalBeforeDive : SurfaceInterval;
\ No newline at end of file
+public class SurfaceIntervalBeforeDive: SurfaceInterval;
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/SwitchMix.cs b/src/UniversalDiveDataFormat/Models/SwitchMix.cs
index ff3a80e..90bb791 100644
--- a/src/UniversalDiveDataFormat/Models/SwitchMix.cs
+++ b/src/UniversalDiveDataFormat/Models/SwitchMix.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("switchmix")]
-public class SwitchMix
+public class SwitchMix: UddfModel
 {
 	[XmlAttribute("ref")]
 	public required string Ref { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Table.cs b/src/UniversalDiveDataFormat/Models/Table.cs
index 1b7d8cd..6b8c54a 100644
--- a/src/UniversalDiveDataFormat/Models/Table.cs
+++ b/src/UniversalDiveDataFormat/Models/Table.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("table")]
-public class Table : Profile
+public class Table:  Profile
 {
 	[XmlElement("tablescope")]
 	public required TableScope TableScope { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/TableGeneration.cs b/src/UniversalDiveDataFormat/Models/TableGeneration.cs
index 063257f..b185658 100644
--- a/src/UniversalDiveDataFormat/Models/TableGeneration.cs
+++ b/src/UniversalDiveDataFormat/Models/TableGeneration.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("tablegeneration")]
-public class TableGeneration
+public class TableGeneration: UddfModel
 {
 	[XmlElement("calculatebottomtimetable")]
 	public CalculateBottomTimeTable? CalculateBottomTimeTable { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/TableScope.cs b/src/UniversalDiveDataFormat/Models/TableScope.cs
index 61359ba..f52e7ef 100644
--- a/src/UniversalDiveDataFormat/Models/TableScope.cs
+++ b/src/UniversalDiveDataFormat/Models/TableScope.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("tablescope")]
-public class TableScope
+public class TableScope: UddfModel
 {
 	[XmlElement("altitude")]
 	public required float AltitudeInMeters { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/TankData.cs b/src/UniversalDiveDataFormat/Models/TankData.cs
index 06dc4cd..a0e4c03 100644
--- a/src/UniversalDiveDataFormat/Models/TankData.cs
+++ b/src/UniversalDiveDataFormat/Models/TankData.cs
@@ -1,12 +1,13 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("tankdata")]
-public class TankData: ILinkable
+public class TankData: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 
 	[XmlElement("breathingconsumptionvolume")]
 	public float? BreathingConsumptionVolumeInMetersCubedPerSecond { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/TaxonomicClass.cs b/src/UniversalDiveDataFormat/Models/TaxonomicClass.cs
index ab42423..e47aaba 100644
--- a/src/UniversalDiveDataFormat/Models/TaxonomicClass.cs
+++ b/src/UniversalDiveDataFormat/Models/TaxonomicClass.cs
@@ -2,77 +2,77 @@
 
 namespace UniversalDiveDataFormat.Models;
 
-public abstract class TaxonomicClass
+public abstract class TaxonomicClass: UddfModel
 {
 	[XmlElement("species")]
 	public List<Species> Species { get; init; } = [];
 }
 
 [XmlRoot("chlorophyceae")]
-public class Chlorophyceae : TaxonomicClass;
+public class Chlorophyceae: TaxonomicClass;
 
 [XmlRoot("floravarious")]
-public class Floravarious : TaxonomicClass;
+public class Floravarious: TaxonomicClass;
 
 [XmlRoot("phaeophyceae")]
-public class Phaeophyceae : TaxonomicClass;
+public class Phaeophyceae: TaxonomicClass;
 
 [XmlRoot("rhodophyceae")]
-public class Rhodophyceae : TaxonomicClass;
+public class Rhodophyceae: TaxonomicClass;
 
 [XmlRoot("spermatophyta")]
-public class Spermatophyta : TaxonomicClass;
+public class Spermatophyta: TaxonomicClass;
 
 [XmlRoot("ascidiacea")]
-public class Ascidiacea : TaxonomicClass;
+public class Ascidiacea: TaxonomicClass;
 
 [XmlRoot("bryozoa")]
-public class Bryozoa : TaxonomicClass;
+public class Bryozoa: TaxonomicClass;
 
 [XmlRoot("cnidaria")]
-public class Cnidaria : TaxonomicClass;
+public class Cnidaria: TaxonomicClass;
 
 [XmlRoot("coelenterata")]
-public class Coelenterata : TaxonomicClass;
+public class Coelenterata: TaxonomicClass;
 
 [XmlRoot("crustacea")]
-public class Crustacea : TaxonomicClass;
+public class Crustacea: TaxonomicClass;
 
 [XmlRoot("ctenophora")]
-public class Ctenophora : TaxonomicClass;
+public class Ctenophora: TaxonomicClass;
 
 [XmlRoot("echinodermata")]
-public class Echinodermata : TaxonomicClass;
+public class Echinodermata: TaxonomicClass;
 
 [XmlRoot("mollusca")]
-public class Mollusca : TaxonomicClass;
+public class Mollusca: TaxonomicClass;
 
 [XmlRoot("phoronidea")]
-public class Phoronidea : TaxonomicClass;
+public class Phoronidea: TaxonomicClass;
 
 [XmlRoot("plathelminthes")]
-public class Plathelminthes : TaxonomicClass;
+public class Plathelminthes: TaxonomicClass;
 
 [XmlRoot("porifera")]
-public class Porifera : TaxonomicClass;
+public class Porifera: TaxonomicClass;
 
 [XmlRoot("invertebratavarious")]
-public class InvertebrataVarious : TaxonomicClass;
+public class InvertebrataVarious: TaxonomicClass;
 
 [XmlRoot("amphibia")]
-public class Amphibia : TaxonomicClass;
+public class Amphibia: TaxonomicClass;
 
 [XmlRoot("chondrichthyes")]
-public class Chondrichthyes : TaxonomicClass;
+public class Chondrichthyes: TaxonomicClass;
 
 [XmlRoot("mammalia")]
-public class Mammalia : TaxonomicClass;
+public class Mammalia: TaxonomicClass;
 
 [XmlRoot("osteichthyes")]
-public class Osteichthyes : TaxonomicClass;
+public class Osteichthyes: TaxonomicClass;
 
 [XmlRoot("reptilia")]
-public class Reptilia : TaxonomicClass;
+public class Reptilia: TaxonomicClass;
 
 [XmlRoot("vertebratavarious")]
-public class VertebrataVarious : TaxonomicClass;
\ No newline at end of file
+public class VertebrataVarious: TaxonomicClass;
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/Tissue.cs b/src/UniversalDiveDataFormat/Models/Tissue.cs
index 88f38bb..6cfc46d 100644
--- a/src/UniversalDiveDataFormat/Models/Tissue.cs
+++ b/src/UniversalDiveDataFormat/Models/Tissue.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("tissue")]
-public class Tissue
+public class Tissue: UddfModel
 {
 	[XmlAttribute("gas")]
 	public required Gas Gas { get; init; } 
diff --git a/src/UniversalDiveDataFormat/Models/Trip.cs b/src/UniversalDiveDataFormat/Models/Trip.cs
index 41720f6..62eb795 100644
--- a/src/UniversalDiveDataFormat/Models/Trip.cs
+++ b/src/UniversalDiveDataFormat/Models/Trip.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("trip")]
-public class Trip: ILinkable
+public class Trip: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/TripPart.cs b/src/UniversalDiveDataFormat/Models/TripPart.cs
index dfdc246..a42efb7 100644
--- a/src/UniversalDiveDataFormat/Models/TripPart.cs
+++ b/src/UniversalDiveDataFormat/Models/TripPart.cs
@@ -1,9 +1,10 @@
 using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models.Linking;
 
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("trippart")]
-public class TripPart
+public class TripPart: UddfModel
 {
 	[XmlElement("name")]
 	public required string Name { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/UddfModel.cs b/src/UniversalDiveDataFormat/Models/UddfModel.cs
new file mode 100644
index 0000000..a2b4860
--- /dev/null
+++ b/src/UniversalDiveDataFormat/Models/UddfModel.cs
@@ -0,0 +1,3 @@
+namespace UniversalDiveDataFormat.Models;
+
+public abstract class UddfModel; // This is used for nothing except for constraining methods to the UDDF namespace
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/UniversalDiveDataFormatRoot.cs b/src/UniversalDiveDataFormat/Models/UniversalDiveDataFormatRoot.cs
index dacea66..2fd7d7e 100644
--- a/src/UniversalDiveDataFormat/Models/UniversalDiveDataFormatRoot.cs
+++ b/src/UniversalDiveDataFormat/Models/UniversalDiveDataFormatRoot.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("uddf")]
-public class UniversalDiveDataFormatRoot
+public class UniversalDiveDataFormatRoot: UddfModel
 {
 	[XmlAttribute("version")]
 	public required string Version { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/ValidDate.cs b/src/UniversalDiveDataFormat/Models/ValidDate.cs
index ed11d5a..76fda21 100644
--- a/src/UniversalDiveDataFormat/Models/ValidDate.cs
+++ b/src/UniversalDiveDataFormat/Models/ValidDate.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("validdate")]
-public class ValidDate
+public class ValidDate: UddfModel
 {
 	[XmlElement("datetime")]
 	public DateTime? DateTime { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Vertebrata.cs b/src/UniversalDiveDataFormat/Models/Vertebrata.cs
index 0eb2d1f..6974190 100644
--- a/src/UniversalDiveDataFormat/Models/Vertebrata.cs
+++ b/src/UniversalDiveDataFormat/Models/Vertebrata.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("vertibrata")]
-public class Vertebrata
+public class Vertebrata: UddfModel
 {
 	[XmlElement("amphibia")]
 	public Amphibia? Amphibia { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Vessel.cs b/src/UniversalDiveDataFormat/Models/Vessel.cs
index 927b5b9..005d46d 100644
--- a/src/UniversalDiveDataFormat/Models/Vessel.cs
+++ b/src/UniversalDiveDataFormat/Models/Vessel.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("vessel")]
-public class Vessel
+public class Vessel: UddfModel
 {
 	[XmlElement("address")]
 	public Address? Address { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Video.cs b/src/UniversalDiveDataFormat/Models/Video.cs
index d9220f7..0e27937 100644
--- a/src/UniversalDiveDataFormat/Models/Video.cs
+++ b/src/UniversalDiveDataFormat/Models/Video.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("video")]
-public class Video: ILinkable
+public class Video: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	[XmlElement("objectname")]
 	public required string ObjectName { get; init; }
 	[XmlElement("title")]
diff --git a/src/UniversalDiveDataFormat/Models/VideoCamera.cs b/src/UniversalDiveDataFormat/Models/VideoCamera.cs
index 00517e9..1398090 100644
--- a/src/UniversalDiveDataFormat/Models/VideoCamera.cs
+++ b/src/UniversalDiveDataFormat/Models/VideoCamera.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("videocamera")]
-public class VideoCamera: ILinkable
+public class VideoCamera: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 	
 	[XmlElement("body")]
 	public Body? Body { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Vpm.cs b/src/UniversalDiveDataFormat/Models/Vpm.cs
index 8b1e9fb..7f07efe 100644
--- a/src/UniversalDiveDataFormat/Models/Vpm.cs
+++ b/src/UniversalDiveDataFormat/Models/Vpm.cs
@@ -3,10 +3,10 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("vpm")]
-public class Vpm : ILinkable
+public class Vpm: UddfModel, ILinkable
 {
 	[XmlAttribute("id")]
-	public required string Id { get; init; }
+	public string? Id { get; init; }
 
 	[XmlElement("conservatism")]
 	public float? Conservatism { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/WayAltitude.cs b/src/UniversalDiveDataFormat/Models/WayAltitude.cs
index d6dc911..55b39ce 100644
--- a/src/UniversalDiveDataFormat/Models/WayAltitude.cs
+++ b/src/UniversalDiveDataFormat/Models/WayAltitude.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("wayaltitude")]
-public class WayAltitude
+public class WayAltitude: UddfModel
 {
 	[XmlAttribute("waytime")]
 	public required float WayTimeInSeconds { get; init; }
diff --git a/src/UniversalDiveDataFormat/Models/Waypoint.cs b/src/UniversalDiveDataFormat/Models/Waypoint.cs
index 3be5855..d04d5f8 100644
--- a/src/UniversalDiveDataFormat/Models/Waypoint.cs
+++ b/src/UniversalDiveDataFormat/Models/Waypoint.cs
@@ -3,7 +3,7 @@
 namespace UniversalDiveDataFormat.Models;
 
 [XmlRoot("waypoint")]
-public class Waypoint
+public class Waypoint: UddfModel
 {
 	[XmlElement("depth")]
 	public float? DepthInMeters { get; init; }
diff --git a/src/UniversalDiveDataFormat/Services/IUddfDeserialiser.cs b/src/UniversalDiveDataFormat/Services/IUddfDeserialiser.cs
new file mode 100644
index 0000000..49a5e3e
--- /dev/null
+++ b/src/UniversalDiveDataFormat/Services/IUddfDeserialiser.cs
@@ -0,0 +1,10 @@
+using UniversalDiveDataFormat.Models;
+
+namespace UniversalDiveDataFormat.Services;
+
+public interface IUddfDeserialiser
+{
+	T Deserialise<T>(string xml) where T : UddfModel;
+	T Deserialise<T>(TextReader reader) where T : UddfModel;
+	T Deserialise<T>(Stream stream) where T : UddfModel;
+}
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Services/LinkResolutionService.cs b/src/UniversalDiveDataFormat/Services/LinkResolutionService.cs
new file mode 100644
index 0000000..bbb546b
--- /dev/null
+++ b/src/UniversalDiveDataFormat/Services/LinkResolutionService.cs
@@ -0,0 +1,88 @@
+using System.Collections;
+using System.Reflection;
+using UniversalDiveDataFormat.Models;
+using UniversalDiveDataFormat.Models.Linking;
+
+namespace UniversalDiveDataFormat.Services;
+
+// I don't generally work with XML, so if there's a built-in way to do this, let me know
+// This is also a bit smarter than the UDDF spec says it should be, not requiring elements to already
+// be declared before their link since it does a full parse before resolving the links
+public class LinkResolutionService
+{
+	private readonly Dictionary<string, ILinkable> _linkableLookup;
+	private readonly List<Link> _links;
+
+	private readonly bool _failOnMissingLink;
+	
+	private static bool IsInModelNamespace(Type t) => t.IsAssignableTo(typeof(UddfModel));
+	private static bool IsList(Type type) => type.IsGenericType && type.GetGenericTypeDefinition().IsAssignableTo(typeof(IEnumerable));
+	private static bool IsListOfModelObjects(Type type) => IsList(type) && IsInModelNamespace(type.GetGenericArguments().Single());
+
+
+	public LinkResolutionService(bool failOnMissingLink = true)
+	{
+		_failOnMissingLink = failOnMissingLink;
+		_linkableLookup = new();
+		_links = [];
+	}
+
+	public void ResolveAllLinksInObjectGraph(UddfModel root)
+	{
+		_linkableLookup.Clear();
+		_links.Clear();
+		FindAllLinkablesAndLinksInSubgraph(root);
+		BuildLinks();
+	}
+
+	private void BuildLinks()
+	{
+		foreach (Link link in _links)
+		{
+			if (!_linkableLookup.TryGetValue(link.Ref, out ILinkable? linkable) && _failOnMissingLink)
+			{
+				throw new ArgumentException($"The linkable with id {link.Ref} could not be found");
+			}
+
+			link.SetLinkedObject(linkable);
+		}
+	}
+	
+	private void FindAllLinkablesAndLinksInSubgraph(UddfModel? root)
+	{
+		if (root is null) return;
+		PropertyInfo[] properties = root.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.GetProperty);
+		ProcessModelObject(root);
+		foreach (PropertyInfo property in properties)
+		{
+			object? propertyValue = property.GetValue(root);
+			if (propertyValue is null) continue;
+			if (IsListOfModelObjects(property.PropertyType))
+			{
+				((IEnumerable)propertyValue).Cast<UddfModel?>().ToList().ForEach(FindAllLinkablesAndLinksInSubgraph);
+				continue;
+			}
+			
+			if (!IsInModelNamespace(property.PropertyType)) continue;
+			FindAllLinkablesAndLinksInSubgraph((UddfModel)propertyValue);
+		}
+	}
+	
+	private void ProcessModelObject(object model)
+	{
+		if (model.GetType().IsAssignableTo(typeof(ILinkable)))
+		{
+			ILinkable linkable = (ILinkable)model;
+			if (linkable.Id is not null)
+			{
+				_linkableLookup[linkable.Id] = linkable;
+			}
+		}
+		
+		if (model is Link link)
+		{
+			_links.Add(link);
+		}
+	}
+
+}
diff --git a/src/UniversalDiveDataFormat/Services/UddfDeserialiser.cs b/src/UniversalDiveDataFormat/Services/UddfDeserialiser.cs
new file mode 100644
index 0000000..dac603d
--- /dev/null
+++ b/src/UniversalDiveDataFormat/Services/UddfDeserialiser.cs
@@ -0,0 +1,32 @@
+using System.Xml.Serialization;
+using UniversalDiveDataFormat.Models;
+
+namespace UniversalDiveDataFormat.Services;
+
+public class UddfDeserialiser: IUddfDeserialiser
+{
+	private readonly LinkResolutionService _linkResolutionService;
+	public UddfDeserialiser(LinkResolutionService linkResolutionService)
+	{
+		_linkResolutionService = linkResolutionService;
+	}
+	
+	public T Deserialise<T>(string xml) where T : UddfModel => Deserialise<T>(new StringReader(xml));
+
+	public T Deserialise<T>(TextReader reader) where T : UddfModel
+	{
+		XmlSerializer serializer = new(typeof(T));
+		T obj = (T)serializer.Deserialize(reader)!; // This should throw if the xml is invalid
+		_linkResolutionService.ResolveAllLinksInObjectGraph(obj);
+		return obj;
+	}
+	
+	public T Deserialise<T>(Stream stream) where T : UddfModel
+	{
+		XmlSerializer serializer = new(typeof(T));
+		T obj = (T)serializer.Deserialize(stream)!; // This should throw if the xml is invalid
+		_linkResolutionService.ResolveAllLinksInObjectGraph(obj);
+		return obj;
+	}
+
+}
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Services/UddfDeserializer.cs b/src/UniversalDiveDataFormat/Services/UddfDeserializer.cs
new file mode 100644
index 0000000..7ee6a42
--- /dev/null
+++ b/src/UniversalDiveDataFormat/Services/UddfDeserializer.cs
@@ -0,0 +1,6 @@
+namespace UniversalDiveDataFormat.Services;
+
+public class UddfDeserializer
+{
+	
+}
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj b/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj
index 03f1bb1..b2260e3 100644
--- a/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj
+++ b/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj
@@ -5,15 +5,19 @@
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version>0.0.1</Version>
+    <Title>UniversalDiveDataFormat</Title>
+    <Authors />
+    <PackageProjectUrl>https://github.com/hughesjs/UniversalDiveDataFormat</PackageProjectUrl>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/hughesjs/UniversalDiveDataFormat.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Shouldly">
-      <HintPath>..\..\..\..\.nuget\packages\shouldly\4.2.1\lib\net5.0\Shouldly.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\..\..\..\.nuget\packages\xunit.extensibility.core\2.4.2\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
 
 </Project>