diff --git a/CrossModel/Logiqx.Deserializer.cs b/CrossModel/Logiqx.Deserializer.cs
new file mode 100644
index 00000000..c0233e1b
--- /dev/null
+++ b/CrossModel/Logiqx.Deserializer.cs
@@ -0,0 +1,398 @@
+using System;
+using System.Linq;
+using SabreTools.Models.Logiqx;
+
+namespace SabreTools.Serialization.CrossModel
+{
+    public partial class Logiqx : IModelSerializer<Datafile, Models.Metadata.MetadataFile>
+    {
+        /// <inheritdoc/>
+#if NET48
+        public Datafile Deserialize(Models.Metadata.MetadataFile obj) => Deserialize(obj, false);
+#else
+        public Datafile? Deserialize(Models.Metadata.MetadataFile? obj) => Deserialize(obj, false);
+#endif
+
+        /// <inheritdoc/>
+#if NET48
+        public Datafile Deserialize(Models.Metadata.MetadataFile obj, bool game)
+#else
+        public Datafile? Deserialize(Models.Metadata.MetadataFile? obj, bool game)
+#endif
+        {
+            if (obj == null)
+                return null;
+
+            var datafile = new Datafile
+            {
+                Build = obj.ReadString(Models.Metadata.Header.BuildKey),
+                Debug = obj.ReadString(Models.Metadata.Header.DebugKey),
+                SchemaLocation = obj.ReadString(Models.Metadata.Header.SchemaLocationKey),
+            };
+
+            var header = obj.Read<Models.Metadata.Header>(Models.Metadata.MetadataFile.HeaderKey);
+            if (header != null)
+                datafile.Header = ConvertHeaderFromInternalModel(header);
+
+            // TODO: Handle Dir items - Currently need to be generated from the machines
+            var machines = obj.Read<Models.Metadata.Machine[]>(Models.Metadata.MetadataFile.MachineKey);
+            if (machines != null && machines.Any())
+            {
+                datafile.Game = machines
+                    .Where(m => m != null)
+                    .Select(machine => ConvertMachineFromInternalModel(machine, game))
+                    .ToArray();
+            }
+
+            return datafile;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.Header"/> to <cref="Models.Logiqx.Header"/>
+        /// </summary>
+        private static Header ConvertHeaderFromInternalModel(Models.Metadata.Header item)
+        {
+            var header = new Header
+            {
+                Id = item.ReadString(Models.Metadata.Header.IdKey),
+                Name = item.ReadString(Models.Metadata.Header.NameKey),
+                Description = item.ReadString(Models.Metadata.Header.DescriptionKey),
+                RootDir = item.ReadString(Models.Metadata.Header.RootDirKey),
+                Category = item.ReadString(Models.Metadata.Header.CategoryKey),
+                Version = item.ReadString(Models.Metadata.Header.VersionKey),
+                Date = item.ReadString(Models.Metadata.Header.DateKey),
+                Author = item.ReadString(Models.Metadata.Header.AuthorKey),
+                Email = item.ReadString(Models.Metadata.Header.EmailKey),
+                Homepage = item.ReadString(Models.Metadata.Header.HomepageKey),
+                Url = item.ReadString(Models.Metadata.Header.UrlKey),
+                Comment = item.ReadString(Models.Metadata.Header.CommentKey),
+                Type = item.ReadString(Models.Metadata.Header.TypeKey),
+            };
+
+            if (item.ContainsKey(Models.Metadata.Header.HeaderKey)
+                || item.ContainsKey(Models.Metadata.Header.ForceMergingKey)
+                || item.ContainsKey(Models.Metadata.Header.ForceNodumpKey)
+                || item.ContainsKey(Models.Metadata.Header.ForcePackingKey))
+            {
+                header.ClrMamePro = new Models.Logiqx.ClrMamePro
+                {
+                    Header = item.ReadString(Models.Metadata.Header.HeaderKey),
+                    ForceMerging = item.ReadString(Models.Metadata.Header.ForceMergingKey),
+                    ForceNodump = item.ReadString(Models.Metadata.Header.ForceNodumpKey),
+                    ForcePacking = item.ReadString(Models.Metadata.Header.ForcePackingKey),
+                };
+            }
+
+            if (item.ContainsKey(Models.Metadata.Header.PluginKey)
+                || item.ContainsKey(Models.Metadata.Header.RomModeKey)
+                || item.ContainsKey(Models.Metadata.Header.BiosModeKey)
+                || item.ContainsKey(Models.Metadata.Header.SampleModeKey)
+                || item.ContainsKey(Models.Metadata.Header.LockRomModeKey)
+                || item.ContainsKey(Models.Metadata.Header.LockBiosModeKey)
+                || item.ContainsKey(Models.Metadata.Header.LockSampleModeKey))
+            {
+                header.RomCenter = new Models.Logiqx.RomCenter
+                {
+                    Plugin = item.ReadString(Models.Metadata.Header.PluginKey),
+                    RomMode = item.ReadString(Models.Metadata.Header.RomModeKey),
+                    BiosMode = item.ReadString(Models.Metadata.Header.BiosModeKey),
+                    SampleMode = item.ReadString(Models.Metadata.Header.SampleModeKey),
+                    LockRomMode = item.ReadString(Models.Metadata.Header.LockRomModeKey),
+                    LockBiosMode = item.ReadString(Models.Metadata.Header.LockBiosModeKey),
+                    LockSampleMode = item.ReadString(Models.Metadata.Header.LockSampleModeKey),
+                };
+            }
+
+            return header;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.Machine"/> to <cref="Models.Logiqx.GameBase"/>
+        /// </summary>
+        private static GameBase ConvertMachineFromInternalModel(Models.Metadata.Machine item, bool game = false)
+        {
+#if NET48
+            GameBase gameBase;
+            if (game)
+                gameBase = new Game();
+            else
+                gameBase = new Machine();
+#else
+            GameBase gameBase = game ? new Game() : new Machine();
+#endif
+
+            gameBase.Name = item.ReadString(Models.Metadata.Machine.NameKey);
+            gameBase.SourceFile = item.ReadString(Models.Metadata.Machine.SourceFileKey);
+            gameBase.IsBios = item.ReadString(Models.Metadata.Machine.IsBiosKey);
+            gameBase.IsDevice = item.ReadString(Models.Metadata.Machine.IsDeviceKey);
+            gameBase.IsMechanical = item.ReadString(Models.Metadata.Machine.IsMechanicalKey);
+            gameBase.CloneOf = item.ReadString(Models.Metadata.Machine.CloneOfKey);
+            gameBase.RomOf = item.ReadString(Models.Metadata.Machine.RomOfKey);
+            gameBase.SampleOf = item.ReadString(Models.Metadata.Machine.SampleOfKey);
+            gameBase.Board = item.ReadString(Models.Metadata.Machine.BoardKey);
+            gameBase.RebuildTo = item.ReadString(Models.Metadata.Machine.RebuildToKey);
+            gameBase.Id = item.ReadString(Models.Metadata.Machine.IdKey);
+            gameBase.CloneOfId = item.ReadString(Models.Metadata.Machine.CloneOfIdKey);
+            gameBase.Runnable = item.ReadString(Models.Metadata.Machine.RunnableKey);
+            gameBase.Comment = item.ReadStringArray(Models.Metadata.Machine.CommentKey);
+            gameBase.Description = item.ReadString(Models.Metadata.Machine.DescriptionKey);
+            gameBase.Year = item.ReadString(Models.Metadata.Machine.YearKey);
+            gameBase.Manufacturer = item.ReadString(Models.Metadata.Machine.ManufacturerKey);
+            gameBase.Publisher = item.ReadString(Models.Metadata.Machine.PublisherKey);
+            gameBase.Category = item.ReadStringArray(Models.Metadata.Machine.CategoryKey);
+
+            var trurip = item.Read<Trurip>(Models.Metadata.Machine.TruripKey);
+            if (trurip != null)
+                gameBase.Trurip = trurip;
+
+            var releases = item.Read<Models.Metadata.Release[]>(Models.Metadata.Machine.ReleaseKey);
+            if (releases != null && releases.Any())
+            {
+                gameBase.Release = releases
+                    .Where(r => r != null)
+                    .Select(ConvertFromInternalModel)
+                    .ToArray();
+            }
+
+            var biosSets = item.Read<Models.Metadata.BiosSet[]>(Models.Metadata.Machine.BiosSetKey);
+            if (biosSets != null && biosSets.Any())
+            {
+                gameBase.BiosSet = biosSets
+                    .Where(b => b != null)
+                    .Select(ConvertFromInternalModel)
+                    .ToArray();
+            }
+
+            var roms = item.Read<Models.Metadata.Rom[]>(Models.Metadata.Machine.RomKey);
+            if (roms != null && roms.Any())
+            {
+                gameBase.Rom = roms
+                    .Where(r => r != null)
+                    .Select(ConvertFromInternalModel)
+                    .ToArray();
+            }
+
+            var disks = item.Read<Models.Metadata.Disk[]>(Models.Metadata.Machine.DiskKey);
+            if (disks != null && disks.Any())
+            {
+                gameBase.Disk = disks
+                    .Where(d => d != null)
+                    .Select(ConvertFromInternalModel)
+                    .ToArray();
+            }
+
+            var medias = item.Read<Models.Metadata.Media[]>(Models.Metadata.Machine.MediaKey);
+            if (medias != null && medias.Any())
+            {
+                gameBase.Media = medias
+                    .Where(m => m != null)
+                    .Select(ConvertFromInternalModel)
+                    .ToArray();
+            }
+
+            var deviceRefs = item.Read<Models.Metadata.DeviceRef[]>(Models.Metadata.Machine.DeviceRefKey);
+            if (deviceRefs != null && deviceRefs.Any())
+            {
+                gameBase.DeviceRef = deviceRefs
+                    .Where(m => m != null)
+                    .Select(ConvertFromInternalModel)
+                    .ToArray();
+            }
+
+            var samples = item.Read<Models.Metadata.Sample[]>(Models.Metadata.Machine.SampleKey);
+            if (samples != null && samples.Any())
+            {
+                gameBase.Sample = samples
+                    .Where(m => m != null)
+                    .Select(ConvertFromInternalModel)
+                    .ToArray();
+            }
+
+            var archives = item.Read<Models.Metadata.Archive[]>(Models.Metadata.Machine.ArchiveKey);
+            if (archives != null && archives.Any())
+            {
+                gameBase.Archive = archives
+                    .Where(m => m != null)
+                    .Select(ConvertFromInternalModel)
+                    .ToArray();
+            }
+
+            var driver = item.Read<Models.Metadata.Driver>(Models.Metadata.Machine.DriverKey);
+            if (driver != null)
+                gameBase.Driver = ConvertFromInternalModel(driver);
+
+            var softwareLists = item.Read<Models.Metadata.SoftwareList[]>(Models.Metadata.Machine.SoftwareListKey);
+            if (softwareLists != null && softwareLists.Any())
+            {
+                gameBase.SoftwareList = softwareLists
+                    .Where(m => m != null)
+                    .Select(ConvertFromInternalModel)
+                    .ToArray();
+            }
+
+            return gameBase;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.Archive"/> to <cref="Models.Logiqx.Archive"/>
+        /// </summary>
+        private static Archive ConvertFromInternalModel(Models.Metadata.Archive item)
+        {
+            var archive = new Archive
+            {
+                Name = item.ReadString(Models.Metadata.Archive.NameKey),
+            };
+            return archive;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.BiosSet"/> to <cref="Models.Logiqx.BiosSet"/>
+        /// </summary>
+        private static BiosSet ConvertFromInternalModel(Models.Metadata.BiosSet item)
+        {
+            var biosset = new BiosSet
+            {
+                Name = item.ReadString(Models.Metadata.BiosSet.NameKey),
+                Description = item.ReadString(Models.Metadata.BiosSet.DescriptionKey),
+                Default = item.ReadString(Models.Metadata.BiosSet.DefaultKey),
+            };
+            return biosset;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.DeviceRef"/> to <cref="Models.Logiqx.DeviceRef"/>
+        /// </summary>
+        private static DeviceRef ConvertFromInternalModel(Models.Metadata.DeviceRef item)
+        {
+            var deviceRef = new DeviceRef
+            {
+                Name = item.ReadString(Models.Metadata.DipSwitch.NameKey),
+            };
+            return deviceRef;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.Disk"/> to <cref="Models.Logiqx.Disk"/>
+        /// </summary>
+        private static Disk ConvertFromInternalModel(Models.Metadata.Disk item)
+        {
+            var disk = new Disk
+            {
+                Name = item.ReadString(Models.Metadata.Disk.NameKey),
+                MD5 = item.ReadString(Models.Metadata.Disk.MD5Key),
+                SHA1 = item.ReadString(Models.Metadata.Disk.SHA1Key),
+                Merge = item.ReadString(Models.Metadata.Disk.MergeKey),
+                Status = item.ReadString(Models.Metadata.Disk.StatusKey),
+                Region = item.ReadString(Models.Metadata.Disk.RegionKey),
+            };
+            return disk;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.Driver"/> to <cref="Models.Logiqx.Driver"/>
+        /// </summary>
+        private static Driver ConvertFromInternalModel(Models.Metadata.Driver item)
+        {
+            var driver = new Driver
+            {
+                Status = item.ReadString(Models.Metadata.Driver.StatusKey),
+                Emulation = item.ReadString(Models.Metadata.Driver.EmulationKey),
+                Cocktail = item.ReadString(Models.Metadata.Driver.CocktailKey),
+                SaveState = item.ReadString(Models.Metadata.Driver.SaveStateKey),
+                RequiresArtwork = item.ReadString(Models.Metadata.Driver.RequiresArtworkKey),
+                Unofficial = item.ReadString(Models.Metadata.Driver.UnofficialKey),
+                NoSoundHardware = item.ReadString(Models.Metadata.Driver.NoSoundHardwareKey),
+                Incomplete = item.ReadString(Models.Metadata.Driver.IncompleteKey),
+            };
+            return driver;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.Media"/> to <cref="Models.Logiqx.Media"/>
+        /// </summary>
+        private static Media ConvertFromInternalModel(Models.Metadata.Media item)
+        {
+            var media = new Media
+            {
+                Name = item.ReadString(Models.Metadata.Media.NameKey),
+                MD5 = item.ReadString(Models.Metadata.Media.MD5Key),
+                SHA1 = item.ReadString(Models.Metadata.Media.SHA1Key),
+                SHA256 = item.ReadString(Models.Metadata.Media.SHA256Key),
+                SpamSum = item.ReadString(Models.Metadata.Media.SpamSumKey),
+            };
+            return media;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.Release"/> to <cref="Models.Logiqx.Release"/>
+        /// </summary>
+        private static Release ConvertFromInternalModel(Models.Metadata.Release item)
+        {
+            var release = new Release
+            {
+                Name = item.ReadString(Models.Metadata.Release.NameKey),
+                Region = item.ReadString(Models.Metadata.Release.RegionKey),
+                Language = item.ReadString(Models.Metadata.Release.LanguageKey),
+                Date = item.ReadString(Models.Metadata.Release.DateKey),
+                Default = item.ReadString(Models.Metadata.Release.DefaultKey),
+            };
+            return release;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.Rom"/> to <cref="Models.Logiqx.Rom"/>
+        /// </summary>
+        private static Rom ConvertFromInternalModel(Models.Metadata.Rom item)
+        {
+            var rom = new Rom
+            {
+                Name = item.ReadString(Models.Metadata.Rom.NameKey),
+                Size = item.ReadString(Models.Metadata.Rom.SizeKey),
+                CRC = item.ReadString(Models.Metadata.Rom.CRCKey),
+                MD5 = item.ReadString(Models.Metadata.Rom.MD5Key),
+                SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key),
+                SHA256 = item.ReadString(Models.Metadata.Rom.SHA256Key),
+                SHA384 = item.ReadString(Models.Metadata.Rom.SHA384Key),
+                SHA512 = item.ReadString(Models.Metadata.Rom.SHA512Key),
+                SpamSum = item.ReadString(Models.Metadata.Rom.SpamSumKey),
+                xxHash364 = item.ReadString(Models.Metadata.Rom.xxHash364Key),
+                xxHash3128 = item.ReadString(Models.Metadata.Rom.xxHash3128Key),
+                Merge = item.ReadString(Models.Metadata.Rom.MergeKey),
+                Status = item.ReadString(Models.Metadata.Rom.StatusKey),
+                Serial = item.ReadString(Models.Metadata.Rom.SerialKey),
+                Header = item.ReadString(Models.Metadata.Rom.HeaderKey),
+                Date = item.ReadString(Models.Metadata.Rom.DateKey),
+                Inverted = item.ReadString(Models.Metadata.Rom.InvertedKey),
+                MIA = item.ReadString(Models.Metadata.Rom.MIAKey),
+            };
+            return rom;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.Sample"/> to <cref="Models.Logiqx.Sample"/>
+        /// </summary>
+        private static Sample ConvertFromInternalModel(Models.Metadata.Sample item)
+        {
+            var sample = new Sample
+            {
+                Name = item.ReadString(Models.Metadata.Sample.NameKey),
+            };
+            return sample;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Metadata.SoftwareList"/> to <cref="Models.Logiqx.SoftwareList"/>
+        /// </summary>
+        private static SoftwareList ConvertFromInternalModel(Models.Metadata.SoftwareList item)
+        {
+            var softwareList = new SoftwareList
+            {
+                Tag = item.ReadString(Models.Metadata.SoftwareList.TagKey),
+                Name = item.ReadString(Models.Metadata.SoftwareList.NameKey),
+                Status = item.ReadString(Models.Metadata.SoftwareList.StatusKey),
+                Filter = item.ReadString(Models.Metadata.SoftwareList.FilterKey),
+            };
+            return softwareList;
+        }
+    }
+}
\ No newline at end of file
diff --git a/CrossModel/Logiqx.Serializer.cs b/CrossModel/Logiqx.Serializer.cs
new file mode 100644
index 00000000..b3de627a
--- /dev/null
+++ b/CrossModel/Logiqx.Serializer.cs
@@ -0,0 +1,347 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SabreTools.Models.Logiqx;
+
+namespace SabreTools.Serialization.CrossModel
+{
+    public partial class Logiqx : IModelSerializer<Datafile, Models.Metadata.MetadataFile>
+    {
+#if NET48
+        public Models.Metadata.MetadataFile Serialize(Datafile item)
+#else
+        public Models.Metadata.MetadataFile? Serialize(Datafile? item)
+#endif
+        {
+            if (item == null)
+                return null;
+
+            var metadataFile = new Models.Metadata.MetadataFile
+            {
+                [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
+            };
+
+            var machines = new List<Models.Metadata.Machine>();
+
+            if (item.Game != null && item.Game.Any())
+            {
+               machines.AddRange(item.Game
+                    .Where(g => g != null)
+                    .Select(ConvertMachineToInternalModel));
+            }
+
+            if (item.Dir != null && item.Dir.Any())
+            {
+                machines.AddRange(item.Dir
+                    .Where(d => d != null)
+                    .SelectMany(ConvertDirToInternalModel));
+            }
+
+            if (machines.Any())
+                metadataFile[Models.Metadata.MetadataFile.MachineKey] = machines.ToArray();
+
+            return metadataFile;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Datafile"/> to <cref="Models.Metadata.Header"/>
+        /// </summary>
+        private static Models.Metadata.Header ConvertHeaderToInternalModel(Datafile item)
+        {
+            var header = item.Header != null ? ConvertHeaderToInternalModel(item.Header) : new Models.Metadata.Header();
+
+            header[Models.Metadata.Header.BuildKey] = item.Build;
+            header[Models.Metadata.Header.DebugKey] = item.Debug;
+            header[Models.Metadata.Header.SchemaLocationKey] = item.SchemaLocation;
+
+            return header;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Header"/> to <cref="Models.Metadata.Header"/>
+        /// </summary>
+        private static Models.Metadata.Header ConvertHeaderToInternalModel(Header item)
+        {
+            var header = new Models.Metadata.Header
+            {
+                [Models.Metadata.Header.IdKey] = item.Id,
+                [Models.Metadata.Header.NameKey] = item.Name,
+                [Models.Metadata.Header.DescriptionKey] = item.Description,
+                [Models.Metadata.Header.RootDirKey] = item.RootDir,
+                [Models.Metadata.Header.CategoryKey] = item.Category,
+                [Models.Metadata.Header.VersionKey] = item.Version,
+                [Models.Metadata.Header.DateKey] = item.Date,
+                [Models.Metadata.Header.AuthorKey] = item.Author,
+                [Models.Metadata.Header.EmailKey] = item.Email,
+                [Models.Metadata.Header.HomepageKey] = item.Homepage,
+                [Models.Metadata.Header.UrlKey] = item.Url,
+                [Models.Metadata.Header.CommentKey] = item.Comment,
+                [Models.Metadata.Header.TypeKey] = item.Type,
+            };
+
+            if (item.ClrMamePro != null)
+            {
+                header[Models.Metadata.Header.HeaderKey] = item.ClrMamePro.Header;
+                header[Models.Metadata.Header.ForceMergingKey] = item.ClrMamePro.ForceMerging;
+                header[Models.Metadata.Header.ForceNodumpKey] = item.ClrMamePro.ForceNodump;
+                header[Models.Metadata.Header.ForcePackingKey] = item.ClrMamePro.ForcePacking;
+            }
+
+            if (item.RomCenter != null)
+            {
+                header[Models.Metadata.Header.PluginKey] = item.RomCenter.Plugin;
+                header[Models.Metadata.Header.RomModeKey] = item.RomCenter.RomMode;
+                header[Models.Metadata.Header.BiosModeKey] = item.RomCenter.BiosMode;
+                header[Models.Metadata.Header.SampleModeKey] = item.RomCenter.SampleMode;
+                header[Models.Metadata.Header.LockRomModeKey] = item.RomCenter.LockRomMode;
+                header[Models.Metadata.Header.LockBiosModeKey] = item.RomCenter.LockBiosMode;
+                header[Models.Metadata.Header.LockSampleModeKey] = item.RomCenter.LockSampleMode;
+            }
+
+            return header;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Dir"/> to an array of <cref="Models.Metadata.Machine"/>
+        /// </summary>
+        private static Models.Metadata.Machine[] ConvertDirToInternalModel(Dir item)
+        {
+            if (item.Game == null || !item.Game.Any())
+                return Array.Empty<Models.Metadata.Machine>();
+
+            return item.Game
+                .Where(g => g != null)
+                .Select(game =>
+                {
+                    var machine = ConvertMachineToInternalModel(game);
+                    machine[Models.Metadata.Machine.DirNameKey] = item.Name;
+                    return machine;
+                })
+                .ToArray();
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.GameBase"/> to <cref="Models.Metadata.Machine"/>
+        /// </summary>
+        private static Models.Metadata.Machine ConvertMachineToInternalModel(GameBase item)
+        {
+            var machine = new Models.Metadata.Machine
+            {
+                [Models.Metadata.Machine.NameKey] = item.Name,
+                [Models.Metadata.Machine.SourceFileKey] = item.SourceFile,
+                [Models.Metadata.Machine.IsBiosKey] = item.IsBios,
+                [Models.Metadata.Machine.IsDeviceKey] = item.IsDevice,
+                [Models.Metadata.Machine.IsMechanicalKey] = item.IsMechanical,
+                [Models.Metadata.Machine.CloneOfKey] = item.CloneOf,
+                [Models.Metadata.Machine.RomOfKey] = item.RomOf,
+                [Models.Metadata.Machine.SampleOfKey] = item.SampleOf,
+                [Models.Metadata.Machine.BoardKey] = item.Board,
+                [Models.Metadata.Machine.RebuildToKey] = item.RebuildTo,
+                [Models.Metadata.Machine.IdKey] = item.Id,
+                [Models.Metadata.Machine.CloneOfIdKey] = item.CloneOfId,
+                [Models.Metadata.Machine.RunnableKey] = item.Runnable,
+                [Models.Metadata.Machine.CommentKey] = item.Comment,
+                [Models.Metadata.Machine.DescriptionKey] = item.Description,
+                [Models.Metadata.Machine.YearKey] = item.Year,
+                [Models.Metadata.Machine.ManufacturerKey] = item.Manufacturer,
+                [Models.Metadata.Machine.PublisherKey] = item.Publisher,
+                [Models.Metadata.Machine.CategoryKey] = item.Category,
+                [Models.Metadata.Machine.TruripKey] = item.Trurip,
+            };
+
+            if (item.Release != null && item.Release.Any())
+                machine[Models.Metadata.Machine.ReleaseKey] = item.Release.Select(ConvertToInternalModel).ToArray();
+
+            if (item.BiosSet != null && item.BiosSet.Any())
+                machine[Models.Metadata.Machine.BiosSetKey] = item.BiosSet.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Rom != null && item.Rom.Any())
+                machine[Models.Metadata.Machine.RomKey] = item.Rom.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Disk != null && item.Disk.Any())
+                machine[Models.Metadata.Machine.DiskKey] = item.Disk.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Media != null && item.Media.Any())
+                machine[Models.Metadata.Machine.MediaKey] = item.Media.Select(ConvertToInternalModel).ToArray();
+
+            if (item.DeviceRef != null && item.DeviceRef.Any())
+                machine[Models.Metadata.Machine.DeviceRefKey] = item.DeviceRef.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Sample != null && item.Sample.Any())
+                machine[Models.Metadata.Machine.SampleKey] = item.Sample.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Archive != null && item.Archive.Any())
+                machine[Models.Metadata.Machine.ArchiveKey] = item.Archive.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Driver != null)
+                machine[Models.Metadata.Machine.DriverKey] = ConvertToInternalModel(item.Driver);
+
+            if (item.SoftwareList != null && item.SoftwareList.Any())
+                machine[Models.Metadata.Machine.SoftwareListKey] = item.SoftwareList.Select(ConvertToInternalModel).ToArray();
+
+            return machine;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Archive"/> to <cref="Models.Metadata.Archive"/>
+        /// </summary>
+        private static Models.Metadata.Archive ConvertToInternalModel(Archive item)
+        {
+            var archive = new Models.Metadata.Archive
+            {
+                [Models.Metadata.Archive.NameKey] = item.Name,
+            };
+            return archive;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.BiosSet"/> to <cref="Models.Metadata.BiosSet"/>
+        /// </summary>
+        private static Models.Metadata.BiosSet ConvertToInternalModel(BiosSet item)
+        {
+            var biosset = new Models.Metadata.BiosSet
+            {
+                [Models.Metadata.BiosSet.NameKey] = item.Name,
+                [Models.Metadata.BiosSet.DescriptionKey] = item.Description,
+                [Models.Metadata.BiosSet.DefaultKey] = item.Default,
+            };
+            return biosset;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.DeviceRef"/> to <cref="Models.Metadata.DeviceRef"/>
+        /// </summary>
+        private static Models.Metadata.DeviceRef ConvertToInternalModel(DeviceRef item)
+        {
+            var deviceRef = new Models.Metadata.DeviceRef
+            {
+                [Models.Metadata.DeviceRef.NameKey] = item.Name,
+            };
+            return deviceRef;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Disk"/> to <cref="Models.Metadata.Disk"/>
+        /// </summary>
+        private static Models.Metadata.Disk ConvertToInternalModel(Disk item)
+        {
+            var disk = new Models.Metadata.Disk
+            {
+                [Models.Metadata.Disk.NameKey] = item.Name,
+                [Models.Metadata.Disk.MD5Key] = item.MD5,
+                [Models.Metadata.Disk.SHA1Key] = item.SHA1,
+                [Models.Metadata.Disk.MergeKey] = item.Merge,
+                [Models.Metadata.Disk.StatusKey] = item.Status,
+                [Models.Metadata.Disk.RegionKey] = item.Region,
+            };
+            return disk;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Driver"/> to <cref="Models.Metadata.Driver"/>
+        /// </summary>
+        private static Models.Metadata.Driver ConvertToInternalModel(Driver item)
+        {
+            var driver = new Models.Metadata.Driver
+            {
+                [Models.Metadata.Driver.StatusKey] = item.Status,
+                [Models.Metadata.Driver.EmulationKey] = item.Emulation,
+                [Models.Metadata.Driver.CocktailKey] = item.Cocktail,
+                [Models.Metadata.Driver.SaveStateKey] = item.SaveState,
+                [Models.Metadata.Driver.RequiresArtworkKey] = item.RequiresArtwork,
+                [Models.Metadata.Driver.UnofficialKey] = item.Unofficial,
+                [Models.Metadata.Driver.NoSoundHardwareKey] = item.NoSoundHardware,
+                [Models.Metadata.Driver.IncompleteKey] = item.Incomplete,
+            };
+            return driver;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Media"/> to <cref="Models.Metadata.Media"/>
+        /// </summary>
+        private static Models.Metadata.Media ConvertToInternalModel(Media item)
+        {
+            var media = new Models.Metadata.Media
+            {
+                [Models.Metadata.Media.NameKey] = item.Name,
+                [Models.Metadata.Media.MD5Key] = item.MD5,
+                [Models.Metadata.Media.SHA1Key] = item.SHA1,
+                [Models.Metadata.Media.SHA256Key] = item.SHA256,
+                [Models.Metadata.Media.SpamSumKey] = item.SpamSum,
+            };
+            return media;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Release"/> to <cref="Models.Metadata.Release"/>
+        /// </summary>
+        private static Models.Metadata.Release ConvertToInternalModel(Release item)
+        {
+            var release = new Models.Metadata.Release
+            {
+                [Models.Metadata.Release.NameKey] = item.Name,
+                [Models.Metadata.Release.RegionKey] = item.Region,
+                [Models.Metadata.Release.LanguageKey] = item.Language,
+                [Models.Metadata.Release.DateKey] = item.Date,
+                [Models.Metadata.Release.DefaultKey] = item.Default,
+            };
+            return release;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Rom"/> to <cref="Models.Metadata.Rom"/>
+        /// </summary>
+        private static Models.Metadata.Rom ConvertToInternalModel(Rom item)
+        {
+            var rom = new Models.Metadata.Rom
+            {
+                [Models.Metadata.Rom.NameKey] = item.Name,
+                [Models.Metadata.Rom.SizeKey] = item.Size,
+                [Models.Metadata.Rom.CRCKey] = item.CRC,
+                [Models.Metadata.Rom.MD5Key] = item.MD5,
+                [Models.Metadata.Rom.SHA1Key] = item.SHA1,
+                [Models.Metadata.Rom.SHA256Key] = item.SHA256,
+                [Models.Metadata.Rom.SHA384Key] = item.SHA384,
+                [Models.Metadata.Rom.SHA512Key] = item.SHA512,
+                [Models.Metadata.Rom.SpamSumKey] = item.SpamSum,
+                [Models.Metadata.Rom.xxHash364Key] = item.xxHash364,
+                [Models.Metadata.Rom.xxHash3128Key] = item.xxHash3128,
+                [Models.Metadata.Rom.MergeKey] = item.Merge,
+                [Models.Metadata.Rom.StatusKey] = item.Status,
+                [Models.Metadata.Rom.SerialKey] = item.Serial,
+                [Models.Metadata.Rom.HeaderKey] = item.Header,
+                [Models.Metadata.Rom.DateKey] = item.Date,
+                [Models.Metadata.Rom.InvertedKey] = item.Inverted,
+                [Models.Metadata.Rom.MIAKey] = item.MIA,
+            };
+            return rom;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.Sample"/> to <cref="Models.Metadata.Sample"/>
+        /// </summary>
+        private static Models.Metadata.Sample ConvertToInternalModel(Sample item)
+        {
+            var sample = new Models.Metadata.Sample
+            {
+                [Models.Metadata.Sample.NameKey] = item.Name,
+            };
+            return sample;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Logiqx.SoftwareList"/> to <cref="Models.Metadata.SoftwareList"/>
+        /// </summary>
+        private static Models.Metadata.SoftwareList ConvertToInternalModel(SoftwareList item)
+        {
+            var softwareList = new Models.Metadata.SoftwareList
+            {
+                [Models.Metadata.SoftwareList.TagKey] = item.Tag,
+                [Models.Metadata.SoftwareList.NameKey] = item.Name,
+                [Models.Metadata.SoftwareList.StatusKey] = item.Status,
+                [Models.Metadata.SoftwareList.FilterKey] = item.Filter,
+            };
+            return softwareList;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Files/Logiqx.Deserializer.cs b/Files/Logiqx.Deserializer.cs
new file mode 100644
index 00000000..70468c1c
--- /dev/null
+++ b/Files/Logiqx.Deserializer.cs
@@ -0,0 +1,7 @@
+namespace SabreTools.Serialization.Files
+{
+    public partial class Logiqx : XmlFile<Models.Logiqx.Datafile>
+    {
+        // All serialization logic is in the base class
+    }
+}
\ No newline at end of file
diff --git a/Files/Logiqx.Serializer.cs b/Files/Logiqx.Serializer.cs
new file mode 100644
index 00000000..3cfa233e
--- /dev/null
+++ b/Files/Logiqx.Serializer.cs
@@ -0,0 +1,11 @@
+using SabreTools.Models.Logiqx;
+
+namespace SabreTools.Serialization.Files
+{
+    public partial class Logiqx : XmlFile<Datafile>
+    {
+        /// <inheritdoc cref="Serialize(Datafile, string, string?, string?, string?, string?)" />
+        public bool SerializeToFileWithDocType(Datafile obj, string path)
+            => Serialize(obj, path, Serialization.Logiqx.DocTypeName, Serialization.Logiqx.DocTypePubId, Serialization.Logiqx.DocTypeSysId, Serialization.Logiqx.DocTypeSysId);
+    }
+}
\ No newline at end of file
diff --git a/Logiqx.cs b/Logiqx.cs
new file mode 100644
index 00000000..6c84bf89
--- /dev/null
+++ b/Logiqx.cs
@@ -0,0 +1,32 @@
+namespace SabreTools.Serialization
+{
+    /// <summary>
+    /// XML deserializer for Logiqx-derived metadata files
+    /// </summary>
+    public static class Logiqx
+    {
+        /// <summary>
+        /// name field for DOCTYPE
+        /// </summary>
+        public const string DocTypeName = "datafile";
+
+        /// <summary>
+        /// pubid field for DOCTYPE
+        /// </summary>
+        public const string DocTypePubId = "-//Logiqx//DTD ROM Management Datafile//EN";
+
+        /// <summary>
+        /// sysid field for DOCTYPE
+        /// </summary>
+        public const string DocTypeSysId = "http://www.logiqx.com/Dats/datafile.dtd";
+
+        /// <summary>
+        /// subset field for DOCTYPE
+        /// </summary>
+#if NET48
+        public const string DocTypeSubset = null;
+#else
+        public const string? DocTypeSubset = null;
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Streams/Logiqx.Deserializer.cs b/Streams/Logiqx.Deserializer.cs
new file mode 100644
index 00000000..a3d89d34
--- /dev/null
+++ b/Streams/Logiqx.Deserializer.cs
@@ -0,0 +1,7 @@
+namespace SabreTools.Serialization.Streams
+{
+    public partial class Logiqx : XmlFile<Models.Logiqx.Datafile>
+    {
+        // All serialization logic is in the base class
+    }
+}
\ No newline at end of file
diff --git a/Streams/Logiqx.Serializer.cs b/Streams/Logiqx.Serializer.cs
new file mode 100644
index 00000000..bf7047c6
--- /dev/null
+++ b/Streams/Logiqx.Serializer.cs
@@ -0,0 +1,16 @@
+using System.IO;
+using SabreTools.Models.Logiqx;
+
+namespace SabreTools.Serialization.Streams
+{
+    public partial class Logiqx : XmlFile<Models.Logiqx.Datafile>
+    {
+        /// <inheritdoc cref="Serialize(Datafile, string?, string?, string?, string?)" />
+#if NET48
+        public Stream SerializeToStreamWithDocType(Datafile obj, string path)
+#else
+        public Stream? SerializeToStreamWithDocType(Datafile obj, string path)
+#endif
+            => Serialize(obj, Serialization.Logiqx.DocTypeName, Serialization.Logiqx.DocTypePubId, Serialization.Logiqx.DocTypeSysId, Serialization.Logiqx.DocTypeSysId);
+    }
+}
\ No newline at end of file