diff --git a/SabreTools.Serialization/ClrMamePro.Deserializer.cs b/SabreTools.Serialization/ClrMamePro.Deserializer.cs
index adf70d7f..f19ddb79 100644
--- a/SabreTools.Serialization/ClrMamePro.Deserializer.cs
+++ b/SabreTools.Serialization/ClrMamePro.Deserializer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using SabreTools.IO.Readers;
 using SabreTools.Models.ClrMamePro;
@@ -828,5 +829,350 @@ namespace SabreTools.Serialization
             driver.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
             return driver;
         }
+    
+        // TODO: Add deserialization of entire MetadataFile
+        #region Internal
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.ClrMamePro.ClrMamePro"/>
+        /// </summary>
+        public static Models.ClrMamePro.ClrMamePro? ConvertHeaderFromInternalModel(Models.Internal.Header? item)
+        {
+            if (item == null)
+                return null;
+
+            var clrMamePro = new Models.ClrMamePro.ClrMamePro
+            {
+                Name = item.ReadString(Models.Internal.Header.NameKey),
+                Description = item.ReadString(Models.Internal.Header.DescriptionKey),
+                RootDir = item.ReadString(Models.Internal.Header.RootDirKey),
+                Category = item.ReadString(Models.Internal.Header.CategoryKey),
+                Version = item.ReadString(Models.Internal.Header.VersionKey),
+                Date = item.ReadString(Models.Internal.Header.DateKey),
+                Author = item.ReadString(Models.Internal.Header.AuthorKey),
+                Homepage = item.ReadString(Models.Internal.Header.HomepageKey),
+                Url = item.ReadString(Models.Internal.Header.UrlKey),
+                Comment = item.ReadString(Models.Internal.Header.CommentKey),
+                Header = item.ReadString(Models.Internal.Header.HeaderKey),
+                Type = item.ReadString(Models.Internal.Header.TypeKey),
+                ForceMerging = item.ReadString(Models.Internal.Header.ForceMergingKey),
+                ForceZipping = item.ReadString(Models.Internal.Header.ForceZippingKey),
+                ForcePacking = item.ReadString(Models.Internal.Header.ForcePackingKey),
+            };
+            return clrMamePro;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.ClrMamePro.Machine"/>
+        /// </summary>
+        public static GameBase? ConvertMachineFromInternalModel(Models.Internal.Machine? item, bool game = false)
+        {
+            if (item == null)
+                return null;
+
+            GameBase gameBase = game ? new Models.ClrMamePro.Game() : new Models.ClrMamePro.Machine();
+
+            gameBase.Name = item.ReadString(Models.Internal.Machine.NameKey);
+            gameBase.Description = item.ReadString(Models.Internal.Machine.DescriptionKey);
+            gameBase.Year = item.ReadString(Models.Internal.Machine.YearKey);
+            gameBase.Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey);
+            gameBase.Category = item.ReadString(Models.Internal.Machine.CategoryKey);
+            gameBase.CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey);
+            gameBase.RomOf = item.ReadString(Models.Internal.Machine.RomOfKey);
+            gameBase.SampleOf = item.ReadString(Models.Internal.Machine.SampleOfKey);
+
+            var releases = item.Read<Models.Internal.Release[]>(Models.Internal.Machine.ReleaseKey);
+            gameBase.Release = releases?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var biosSets = item.Read<Models.Internal.BiosSet[]>(Models.Internal.Machine.BiosSetKey);
+            gameBase.BiosSet = biosSets?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            gameBase.Rom = roms?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey);
+            gameBase.Disk = disks?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var medias = item.Read<Models.Internal.Media[]>(Models.Internal.Machine.MediaKey);
+            gameBase.Media = medias?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var samples = item.Read<Models.Internal.Sample[]>(Models.Internal.Machine.SampleKey);
+            gameBase.Sample = samples?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var archives = item.Read<Models.Internal.Archive[]>(Models.Internal.Machine.ArchiveKey);
+            gameBase.Archive = archives?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var chips = item.Read<Models.Internal.Chip[]>(Models.Internal.Machine.ChipKey);
+            gameBase.Chip = chips?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var video = item.Read<Models.Internal.Video>(Models.Internal.Machine.VideoKey);
+            gameBase.Video = ConvertFromInternalModel(video);
+
+            var sound = item.Read<Models.Internal.Sound>(Models.Internal.Machine.SoundKey);
+            gameBase.Sound = ConvertFromInternalModel(sound);
+
+            var input = item.Read<Models.Internal.Input>(Models.Internal.Machine.InputKey);
+            gameBase.Input = ConvertFromInternalModel(input);
+
+            var dipSwitches = item.Read<Models.Internal.DipSwitch[]>(Models.Internal.Machine.DipSwitchKey);
+            gameBase.DipSwitch = dipSwitches?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var driver = item.Read<Models.Internal.Driver>(Models.Internal.Machine.DriverKey);
+            gameBase.Driver = ConvertFromInternalModel(driver);
+
+            return gameBase;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.ClrMamePro.Archive"/>
+        /// </summary>
+        private static Archive? ConvertFromInternalModel(Models.Internal.Archive? item)
+        {
+            if (item == null)
+                return null;
+
+            var archive = new Archive
+            {
+                Name = item.ReadString(Models.Internal.Archive.NameKey),
+            };
+            return archive;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.BiosSet"/> to <cref="Models.ClrMamePro.BiosSet"/>
+        /// </summary>
+        private static BiosSet? ConvertFromInternalModel(Models.Internal.BiosSet? item)
+        {
+            if (item == null)
+                return null;
+
+            var biosset = new BiosSet
+            {
+                Name = item.ReadString(Models.Internal.BiosSet.NameKey),
+                Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey),
+                Default = item.ReadString(Models.Internal.BiosSet.DefaultKey),
+            };
+            return biosset;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Chip"/> to <cref="Models.ClrMamePro.Chip"/>
+        /// </summary>
+        private static Chip? ConvertFromInternalModel(Models.Internal.Chip? item)
+        {
+            if (item == null)
+                return null;
+
+            var chip = new Chip
+            {
+                Type = item.ReadString(Models.Internal.Chip.ChipTypeKey),
+                Name = item.ReadString(Models.Internal.Chip.NameKey),
+                Flags = item.ReadString(Models.Internal.Chip.FlagsKey),
+                Clock = item.ReadString(Models.Internal.Chip.ClockKey),
+            };
+            return chip;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.DipSwitch"/> to <cref="Models.ClrMamePro.DipSwitch"/>
+        /// </summary>
+        private static DipSwitch? ConvertFromInternalModel(Models.Internal.DipSwitch? item)
+        {
+            if (item == null)
+                return null;
+
+            var dipswitch = new DipSwitch
+            {
+                Name = item.ReadString(Models.Internal.DipSwitch.NameKey),
+                Entry = item[Models.Internal.DipSwitch.EntryKey] as string[],
+                Default = item.ReadString(Models.Internal.DipSwitch.DefaultKey),
+            };
+            return dipswitch;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.ClrMamePro.Disk"/>
+        /// </summary>
+        private static Disk? ConvertFromInternalModel(Models.Internal.Disk? item)
+        {
+            if (item == null)
+                return null;
+
+            var disk = new Disk
+            {
+                Name = item.ReadString(Models.Internal.Disk.NameKey),
+                MD5 = item.ReadString(Models.Internal.Disk.MD5Key),
+                SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key),
+                Merge = item.ReadString(Models.Internal.Disk.MergeKey),
+                Status = item.ReadString(Models.Internal.Disk.StatusKey),
+                Flags = item.ReadString(Models.Internal.Disk.FlagsKey),
+            };
+            return disk;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Driver"/> to <cref="Models.ClrMamePro.Driver"/>
+        /// </summary>
+        private static Driver? ConvertFromInternalModel(Models.Internal.Driver? item)
+        {
+            if (item == null)
+                return null;
+
+            var driver = new Driver
+            {
+                Status = item.ReadString(Models.Internal.Driver.StatusKey),
+                Color = item.ReadString(Models.Internal.Driver.ColorKey),
+                Sound = item.ReadString(Models.Internal.Driver.SoundKey),
+                PaletteSize = item.ReadString(Models.Internal.Driver.PaletteSizeKey),
+                Blit = item.ReadString(Models.Internal.Driver.BlitKey),
+            };
+            return driver;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Input"/> to <cref="Models.ClrMamePro.Input"/>
+        /// </summary>
+        private static Input? ConvertFromInternalModel(Models.Internal.Input? item)
+        {
+            if (item == null)
+                return null;
+
+            var input = new Input
+            {
+                Players = item.ReadString(Models.Internal.Input.PlayersKey),
+                Control = item.ReadString(Models.Internal.Input.ControlKey),
+                Buttons = item.ReadString(Models.Internal.Input.ButtonsKey),
+                Coins = item.ReadString(Models.Internal.Input.CoinsKey),
+                Tilt = item.ReadString(Models.Internal.Input.TiltKey),
+                Service = item.ReadString(Models.Internal.Input.ServiceKey),
+            };
+            return input;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Media"/> to <cref="Models.ClrMamePro.Media"/>
+        /// </summary>
+        private static Media? ConvertFromInternalModel(Models.Internal.Media? item)
+        {
+            if (item == null)
+                return null;
+
+            var media = new Media
+            {
+                Name = item.ReadString(Models.Internal.Media.NameKey),
+                MD5 = item.ReadString(Models.Internal.Media.MD5Key),
+                SHA1 = item.ReadString(Models.Internal.Media.SHA1Key),
+                SHA256 = item.ReadString(Models.Internal.Media.SHA256Key),
+                SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey),
+            };
+            return media;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Release"/> to <cref="Models.ClrMamePro.Release"/>
+        /// </summary>
+        private static Release? ConvertFromInternalModel(Models.Internal.Release? item)
+        {
+            if (item == null)
+                return null;
+
+            var release = new Release
+            {
+                Name = item.ReadString(Models.Internal.Release.NameKey),
+                Region = item.ReadString(Models.Internal.Release.RegionKey),
+                Language = item.ReadString(Models.Internal.Release.LanguageKey),
+                Date = item.ReadString(Models.Internal.Release.DateKey),
+                Default = item.ReadString(Models.Internal.Release.DefaultKey),
+            };
+            return release;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.ClrMamePro.Rom"/>
+        /// </summary>
+        private static Rom? ConvertFromInternalModel(Models.Internal.Rom? item)
+        {
+            if (item == null)
+                return null;
+
+            var rom = new Rom
+            {
+                Name = item.ReadString(Models.Internal.Rom.NameKey),
+                Size = item.ReadString(Models.Internal.Rom.SizeKey),
+                CRC = item.ReadString(Models.Internal.Rom.CRCKey),
+                MD5 = item.ReadString(Models.Internal.Rom.MD5Key),
+                SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key),
+                SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key),
+                SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key),
+                SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key),
+                SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey),
+                xxHash364 = item.ReadString(Models.Internal.Rom.xxHash364Key),
+                xxHash3128 = item.ReadString(Models.Internal.Rom.xxHash3128Key),
+                Merge = item.ReadString(Models.Internal.Rom.MergeKey),
+                Status = item.ReadString(Models.Internal.Rom.StatusKey),
+                Region = item.ReadString(Models.Internal.Rom.RegionKey),
+                Flags = item.ReadString(Models.Internal.Rom.FlagsKey),
+                Offs = item.ReadString(Models.Internal.Rom.OffsetKey),
+                Serial = item.ReadString(Models.Internal.Rom.SerialKey),
+                Header = item.ReadString(Models.Internal.Rom.HeaderKey),
+                Date = item.ReadString(Models.Internal.Rom.DateKey),
+                Inverted = item.ReadString(Models.Internal.Rom.InvertedKey),
+                MIA = item.ReadString(Models.Internal.Rom.MIAKey),
+            };
+            return rom;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Sample"/> to <cref="Models.ClrMamePro.Sample"/>
+        /// </summary>
+        private static Sample? ConvertFromInternalModel(Models.Internal.Sample? item)
+        {
+            if (item == null)
+                return null;
+
+            var sample = new Sample
+            {
+                Name = item.ReadString(Models.Internal.Sample.NameKey),
+            };
+            return sample;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Sound"/> to <cref="Models.ClrMamePro.Sound"/>
+        /// </summary>
+        private static Sound? ConvertFromInternalModel(Models.Internal.Sound? item)
+        {
+            if (item == null)
+                return null;
+
+            var sound = new Sound
+            {
+                Channels = item.ReadString(Models.Internal.Sound.ChannelsKey),
+            };
+            return sound;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Video"/> to <cref="Models.ClrMamePro.Video"/>
+        /// </summary>
+        private static Video? ConvertFromInternalModel(Models.Internal.Video? item)
+        {
+            if (item == null)
+                return null;
+
+            var video = new Video
+            {
+                Screen = item.ReadString(Models.Internal.Video.ScreenKey),
+                Orientation = item.ReadString(Models.Internal.Video.OrientationKey),
+                X = item.ReadString(Models.Internal.Video.WidthKey),
+                Y = item.ReadString(Models.Internal.Video.HeightKey),
+                AspectX = item.ReadString(Models.Internal.Video.AspectXKey),
+                AspectY = item.ReadString(Models.Internal.Video.AspectYKey),
+                Freq = item.ReadString(Models.Internal.Video.RefreshKey),
+            };
+            return video;
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Serialization/ClrMamePro.Serializer.cs b/SabreTools.Serialization/ClrMamePro.Serializer.cs
index 527810ec..5c42c9ec 100644
--- a/SabreTools.Serialization/ClrMamePro.Serializer.cs
+++ b/SabreTools.Serialization/ClrMamePro.Serializer.cs
@@ -455,5 +455,321 @@ namespace SabreTools.Serialization
             writer.WriteOptionalAttributeString("blit", driver.Blit);
             writer.WriteEndElement(); // driver
         }
+
+        #region Internal
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.MetadataFile"/> to <cref="Models.Internal.MetadataFile"/>
+        /// </summary>
+        public static Models.Internal.MetadataFile ConvertToInternalModel(MetadataFile item)
+        {
+            var metadataFile = new Models.Internal.MetadataFile();
+
+            if (item?.ClrMamePro != null)
+                metadataFile[Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item.ClrMamePro);
+
+            if (item?.Game != null && item.Game.Any())
+                metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
+
+            return metadataFile;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.ClrMamePro"/> to <cref="Models.Internal.Header"/>
+        /// </summary>
+        private static Models.Internal.Header ConvertHeaderToInternalModel(Models.ClrMamePro.ClrMamePro item)
+        {
+            var header = new Models.Internal.Header
+            {
+                [Models.Internal.Header.NameKey] = item.Name,
+                [Models.Internal.Header.DescriptionKey] = item.Description,
+                [Models.Internal.Header.RootDirKey] = item.RootDir,
+                [Models.Internal.Header.CategoryKey] = item.Category,
+                [Models.Internal.Header.VersionKey] = item.Version,
+                [Models.Internal.Header.DateKey] = item.Date,
+                [Models.Internal.Header.AuthorKey] = item.Author,
+                [Models.Internal.Header.HomepageKey] = item.Homepage,
+                [Models.Internal.Header.UrlKey] = item.Url,
+                [Models.Internal.Header.CommentKey] = item.Comment,
+                [Models.Internal.Header.HeaderKey] = item.Header,
+                [Models.Internal.Header.TypeKey] = item.Type,
+                [Models.Internal.Header.ForceMergingKey] = item.ForceMerging,
+                [Models.Internal.Header.ForceZippingKey] = item.ForceZipping,
+                [Models.Internal.Header.ForcePackingKey] = item.ForcePacking,
+            };
+            return header;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.GameBase"/> to <cref="Models.Internal.Machine"/>
+        /// </summary>
+        private static Models.Internal.Machine ConvertMachineToInternalModel(GameBase item)
+        {
+            var machine = new Models.Internal.Machine
+            {
+                [Models.Internal.Machine.NameKey] = item.Name,
+                [Models.Internal.Machine.DescriptionKey] = item.Description,
+                [Models.Internal.Machine.YearKey] = item.Year,
+                [Models.Internal.Machine.ManufacturerKey] = item.Manufacturer,
+                [Models.Internal.Machine.CategoryKey] = item.Category,
+                [Models.Internal.Machine.CloneOfKey] = item.CloneOf,
+                [Models.Internal.Machine.RomOfKey] = item.RomOf,
+                [Models.Internal.Machine.SampleOfKey] = item.SampleOf,
+            };
+
+            if (item.Release != null && item.Release.Any())
+                machine[Models.Internal.Machine.ReleaseKey] = item.Release?.Select(ConvertToInternalModel)?.ToArray();
+
+            if (item.BiosSet != null && item.BiosSet.Any())
+                machine[Models.Internal.Machine.BiosSetKey] = item.BiosSet?.Select(ConvertToInternalModel)?.ToArray();
+
+            if (item.Rom != null && item.Rom.Any())
+                machine[Models.Internal.Machine.RomKey] = item.Rom?.Select(ConvertToInternalModel)?.ToArray();
+
+            if (item.Disk != null && item.Disk.Any())
+                machine[Models.Internal.Machine.DiskKey] = item.Disk?.Select(ConvertToInternalModel)?.ToArray();
+
+            if (item.Media != null && item.Media.Any())
+                machine[Models.Internal.Machine.MediaKey] = item.Media?.Select(ConvertToInternalModel)?.ToArray();
+
+            if (item.Sample != null && item.Sample.Any())
+                machine[Models.Internal.Machine.SampleKey] = item.Sample?.Select(ConvertToInternalModel)?.ToArray();
+
+            if (item.Archive != null && item.Archive.Any())
+                machine[Models.Internal.Machine.ArchiveKey] = item.Archive?.Select(ConvertToInternalModel)?.ToArray();
+
+            if (item.Chip != null && item.Chip.Any())
+                machine[Models.Internal.Machine.ChipKey] = item.Chip?.Select(ConvertToInternalModel)?.ToArray();
+
+            if (item.Video != null)
+                machine[Models.Internal.Machine.VideoKey] = ConvertToInternalModel(item.Video);
+
+            if (item.Sound != null)
+                machine[Models.Internal.Machine.SoundKey] = ConvertToInternalModel(item.Sound);
+
+            if (item.Input != null)
+                machine[Models.Internal.Machine.InputKey] = ConvertToInternalModel(item.Input);
+
+            if (item.DipSwitch != null && item.DipSwitch.Any())
+                machine[Models.Internal.Machine.DipSwitchKey] = item.DipSwitch?.Select(ConvertToInternalModel)?.ToArray();
+
+            if (item.Driver != null)
+                machine[Models.Internal.Machine.DriverKey] = ConvertToInternalModel(item.Driver);
+
+            return machine;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Archive"/> to <cref="Models.Internal.Archive"/>
+        /// </summary>
+        private static Models.Internal.Archive ConvertToInternalModel(Archive item)
+        {
+            var archive = new Models.Internal.Archive
+            {
+                [Models.Internal.Archive.NameKey] = item.Name,
+            };
+            return archive;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.BiosSet"/> to <cref="Models.Internal.BiosSet"/>
+        /// </summary>
+        private static Models.Internal.BiosSet ConvertToInternalModel(BiosSet item)
+        {
+            var biosset = new Models.Internal.BiosSet
+            {
+                [Models.Internal.BiosSet.NameKey] = item.Name,
+                [Models.Internal.BiosSet.DescriptionKey] = item.Description,
+                [Models.Internal.BiosSet.DefaultKey] = item.Default,
+            };
+            return biosset;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Chip"/> to <cref="Models.Internal.Chip"/>
+        /// </summary>
+        private static Models.Internal.Chip ConvertToInternalModel(Chip item)
+        {
+            var chip = new Models.Internal.Chip
+            {
+                [Models.Internal.Chip.ChipTypeKey] = item.Type,
+                [Models.Internal.Chip.NameKey] = item.Name,
+                [Models.Internal.Chip.FlagsKey] = item.Flags,
+                [Models.Internal.Chip.ClockKey] = item.Clock,
+            };
+            return chip;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.DipSwitch"/> to <cref="Models.Internal.DipSwitch"/>
+        /// </summary>
+        private static Models.Internal.DipSwitch ConvertToInternalModel(DipSwitch item)
+        {
+            var dipswitch = new Models.Internal.DipSwitch
+            {
+                [Models.Internal.DipSwitch.NameKey] = item.Name,
+                [Models.Internal.DipSwitch.EntryKey] = item.Entry,
+                [Models.Internal.DipSwitch.DefaultKey] = item.Default,
+            };
+            return dipswitch;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Disk"/> to <cref="Models.Internal.Disk"/>
+        /// </summary>
+        private static Models.Internal.Disk ConvertToInternalModel(Disk item)
+        {
+            var disk = new Models.Internal.Disk
+            {
+                [Models.Internal.Disk.NameKey] = item.Name,
+                [Models.Internal.Disk.MD5Key] = item.MD5,
+                [Models.Internal.Disk.SHA1Key] = item.SHA1,
+                [Models.Internal.Disk.MergeKey] = item.Merge,
+                [Models.Internal.Disk.StatusKey] = item.Status,
+                [Models.Internal.Disk.FlagsKey] = item.Flags,
+            };
+            return disk;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Driver"/> to <cref="Models.Internal.Driver"/>
+        /// </summary>
+        private static Models.Internal.Driver ConvertToInternalModel(Driver item)
+        {
+            var driver = new Models.Internal.Driver
+            {
+                [Models.Internal.Driver.StatusKey] = item.Status,
+                [Models.Internal.Driver.ColorKey] = item.Color,
+                [Models.Internal.Driver.SoundKey] = item.Sound,
+                [Models.Internal.Driver.PaletteSizeKey] = item.PaletteSize,
+                [Models.Internal.Driver.BlitKey] = item.Blit,
+            };
+            return driver;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Input"/> to <cref="Models.Internal.Input"/>
+        /// </summary>
+        private static Models.Internal.Input ConvertToInternalModel(Input item)
+        {
+            var input = new Models.Internal.Input
+            {
+                [Models.Internal.Input.PlayersKey] = item.Players,
+                [Models.Internal.Input.ControlKey] = item.Control,
+                [Models.Internal.Input.ButtonsKey] = item.Buttons,
+                [Models.Internal.Input.CoinsKey] = item.Coins,
+                [Models.Internal.Input.TiltKey] = item.Tilt,
+                [Models.Internal.Input.ServiceKey] = item.Service,
+            };
+            return input;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Media"/> to <cref="Models.Internal.Media"/>
+        /// </summary>
+        private static Models.Internal.Media ConvertToInternalModel(Media item)
+        {
+            var media = new Models.Internal.Media
+            {
+                [Models.Internal.Media.NameKey] = item.Name,
+                [Models.Internal.Media.MD5Key] = item.MD5,
+                [Models.Internal.Media.SHA1Key] = item.SHA1,
+                [Models.Internal.Media.SHA256Key] = item.SHA256,
+                [Models.Internal.Media.SpamSumKey] = item.SpamSum,
+            };
+            return media;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Release"/> to <cref="Models.Internal.Release"/>
+        /// </summary>
+        private static Models.Internal.Release ConvertToInternalModel(Release item)
+        {
+            var release = new Models.Internal.Release
+            {
+                [Models.Internal.Release.NameKey] = item.Name,
+                [Models.Internal.Release.RegionKey] = item.Region,
+                [Models.Internal.Release.LanguageKey] = item.Language,
+                [Models.Internal.Release.DateKey] = item.Date,
+                [Models.Internal.Release.DefaultKey] = item.Default,
+            };
+            return release;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Rom"/> to <cref="Models.Internal.Rom"/>
+        /// </summary>
+        private static Models.Internal.Rom ConvertToInternalModel(Rom item)
+        {
+            var rom = new Models.Internal.Rom
+            {
+                [Models.Internal.Rom.NameKey] = item.Name,
+                [Models.Internal.Rom.SizeKey] = item.Size,
+                [Models.Internal.Rom.CRCKey] = item.CRC,
+                [Models.Internal.Rom.MD5Key] = item.MD5,
+                [Models.Internal.Rom.SHA1Key] = item.SHA1,
+                [Models.Internal.Rom.SHA256Key] = item.SHA256,
+                [Models.Internal.Rom.SHA384Key] = item.SHA384,
+                [Models.Internal.Rom.SHA512Key] = item.SHA512,
+                [Models.Internal.Rom.SpamSumKey] = item.SpamSum,
+                [Models.Internal.Rom.xxHash364Key] = item.xxHash364,
+                [Models.Internal.Rom.xxHash3128Key] = item.xxHash3128,
+                [Models.Internal.Rom.MergeKey] = item.Merge,
+                [Models.Internal.Rom.StatusKey] = item.Status,
+                [Models.Internal.Rom.RegionKey] = item.Region,
+                [Models.Internal.Rom.FlagsKey] = item.Flags,
+                [Models.Internal.Rom.OffsetKey] = item.Offs,
+                [Models.Internal.Rom.SerialKey] = item.Serial,
+                [Models.Internal.Rom.HeaderKey] = item.Header,
+                [Models.Internal.Rom.DateKey] = item.Date,
+                [Models.Internal.Rom.InvertedKey] = item.Inverted,
+                [Models.Internal.Rom.MIAKey] = item.MIA,
+            };
+            return rom;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Sample"/> to <cref="Models.Internal.Sample"/>
+        /// </summary>
+        private static Models.Internal.Sample ConvertToInternalModel(Sample item)
+        {
+            var sample = new Models.Internal.Sample
+            {
+                [Models.Internal.Sample.NameKey] = item.Name,
+            };
+            return sample;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Sound"/> to <cref="Models.Internal.Sound"/>
+        /// </summary>
+        private static Models.Internal.Sound ConvertToInternalModel(Sound item)
+        {
+            var sound = new Models.Internal.Sound
+            {
+                [Models.Internal.Sound.ChannelsKey] = item.Channels,
+            };
+            return sound;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.ClrMamePro.Video"/> to <cref="Models.Internal.Video"/>
+        /// </summary>
+        private static Models.Internal.Video ConvertToInternalModel(Video item)
+        {
+            var video = new Models.Internal.Video
+            {
+                [Models.Internal.Video.ScreenKey] = item.Screen,
+                [Models.Internal.Video.OrientationKey] = item.Orientation,
+                [Models.Internal.Video.WidthKey] = item.X,
+                [Models.Internal.Video.HeightKey] = item.Y,
+                [Models.Internal.Video.AspectXKey] = item.AspectX,
+                [Models.Internal.Video.AspectYKey] = item.AspectY,
+                [Models.Internal.Video.RefreshKey] = item.Freq,
+            };
+            return video;
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Serialization/Internal.ClrMamePro.cs b/SabreTools.Serialization/Internal.ClrMamePro.cs
deleted file mode 100644
index d09a7a1f..00000000
--- a/SabreTools.Serialization/Internal.ClrMamePro.cs
+++ /dev/null
@@ -1,735 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using SabreTools.Models.Internal;
-
-namespace SabreTools.Serialization
-{
-    /// <summary>
-    /// Serializer for ClrMamePro models to internal structure
-    /// </summary>
-    public partial class Internal
-    {
-        #region Serialize
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.MetadataFile"/> to <cref="MetadataFile"/>
-        /// </summary>
-        public static MetadataFile ConvertToInternalModel(Models.ClrMamePro.MetadataFile item)
-        {
-            var metadataFile = new MetadataFile();
-
-            if (item?.ClrMamePro != null)
-                metadataFile[MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item.ClrMamePro);
-
-            if (item?.Game != null && item.Game.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
-
-            return metadataFile;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.ClrMamePro"/> to <cref="Header"/>
-        /// </summary>
-        private static Header ConvertHeaderToInternalModel(Models.ClrMamePro.ClrMamePro item)
-        {
-            var header = new Header
-            {
-                [Header.NameKey] = item.Name,
-                [Header.DescriptionKey] = item.Description,
-                [Header.RootDirKey] = item.RootDir,
-                [Header.CategoryKey] = item.Category,
-                [Header.VersionKey] = item.Version,
-                [Header.DateKey] = item.Date,
-                [Header.AuthorKey] = item.Author,
-                [Header.HomepageKey] = item.Homepage,
-                [Header.UrlKey] = item.Url,
-                [Header.CommentKey] = item.Comment,
-                [Header.HeaderKey] = item.Header,
-                [Header.TypeKey] = item.Type,
-                [Header.ForceMergingKey] = item.ForceMerging,
-                [Header.ForceZippingKey] = item.ForceZipping,
-                [Header.ForcePackingKey] = item.ForcePacking,
-            };
-            return header;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.GameBase"/> to <cref="Machine"/>
-        /// </summary>
-        private static Machine ConvertMachineToInternalModel(Models.ClrMamePro.GameBase item)
-        {
-            var machine = new Machine
-            {
-                [Machine.NameKey] = item.Name,
-                [Machine.DescriptionKey] = item.Description,
-                [Machine.YearKey] = item.Year,
-                [Machine.ManufacturerKey] = item.Manufacturer,
-                [Machine.CategoryKey] = item.Category,
-                [Machine.CloneOfKey] = item.CloneOf,
-                [Machine.RomOfKey] = item.RomOf,
-                [Machine.SampleOfKey] = item.SampleOf,
-            };
-
-            if (item.Release != null && item.Release.Any())
-            {
-                var releases = new List<Release>();
-                foreach (var release in item.Release)
-                {
-                    releases.Add(ConvertToInternalModel(release));
-                }
-                machine[Machine.ReleaseKey] = releases.ToArray();
-            }
-
-            if (item.BiosSet != null && item.BiosSet.Any())
-            {
-                var biosSets = new List<BiosSet>();
-                foreach (var biosSet in item.BiosSet)
-                {
-                    biosSets.Add(ConvertToInternalModel(biosSet));
-                }
-                machine[Machine.BiosSetKey] = biosSets.ToArray();
-            }
-
-            if (item.Rom != null && item.Rom.Any())
-            {
-                var roms = new List<Rom>();
-                foreach (var rom in item.Rom)
-                {
-                    roms.Add(ConvertToInternalModel(rom));
-                }
-                machine[Machine.RomKey] = roms.ToArray();
-            }
-
-            if (item.Disk != null && item.Disk.Any())
-            {
-                var disks = new List<Disk>();
-                foreach (var disk in item.Disk)
-                {
-                    disks.Add(ConvertToInternalModel(disk));
-                }
-                machine[Machine.DiskKey] = disks.ToArray();
-            }
-
-            if (item.Media != null && item.Media.Any())
-            {
-                var medias = new List<Media>();
-                foreach (var media in item.Media)
-                {
-                    medias.Add(ConvertToInternalModel(media));
-                }
-                machine[Machine.MediaKey] = medias.ToArray();
-            }
-
-            if (item.Sample != null && item.Sample.Any())
-            {
-                var samples = new List<Sample>();
-                foreach (var sample in item.Sample)
-                {
-                    samples.Add(ConvertToInternalModel(sample));
-                }
-                machine[Machine.SampleKey] = samples.ToArray();
-            }
-
-            if (item.Archive != null && item.Archive.Any())
-            {
-                var archives = new List<Archive>();
-                foreach (var archive in item.Archive)
-                {
-                    archives.Add(ConvertToInternalModel(archive));
-                }
-                machine[Machine.ArchiveKey] = archives.ToArray();
-            }
-
-            if (item.Chip != null && item.Chip.Any())
-            {
-                var chips = new List<Chip>();
-                foreach (var chip in item.Chip)
-                {
-                    chips.Add(ConvertToInternalModel(chip));
-                }
-                machine[Machine.ChipKey] = chips.ToArray();
-            }
-
-            if (item.Video != null)
-                machine[Machine.VideoKey] = ConvertToInternalModel(item.Video);
-
-            if (item.Sound != null)
-                machine[Machine.SoundKey] = ConvertToInternalModel(item.Sound);
-
-            if (item.Input != null)
-                machine[Machine.InputKey] = ConvertToInternalModel(item.Input);
-
-            if (item.DipSwitch != null && item.DipSwitch.Any())
-            {
-                var dipSwitches = new List<DipSwitch>();
-                foreach (var dipSwitch in item.DipSwitch)
-                {
-                    dipSwitches.Add(ConvertToInternalModel(dipSwitch));
-                }
-                machine[Machine.DipSwitchKey] = dipSwitches.ToArray();
-            }
-
-            if (item.Driver != null)
-                machine[Machine.DriverKey] = ConvertToInternalModel(item.Driver);
-
-            return machine;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Archive"/> to <cref="Archive"/>
-        /// </summary>
-        private static Archive ConvertToInternalModel(Models.ClrMamePro.Archive item)
-        {
-            var archive = new Archive
-            {
-                [Archive.NameKey] = item.Name,
-            };
-            return archive;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.BiosSet"/> to <cref="BiosSet"/>
-        /// </summary>
-        private static BiosSet ConvertToInternalModel(Models.ClrMamePro.BiosSet item)
-        {
-            var biosset = new BiosSet
-            {
-                [BiosSet.NameKey] = item.Name,
-                [BiosSet.DescriptionKey] = item.Description,
-                [BiosSet.DefaultKey] = item.Default,
-            };
-            return biosset;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Chip"/> to <cref="Chip"/>
-        /// </summary>
-        private static Chip ConvertToInternalModel(Models.ClrMamePro.Chip item)
-        {
-            var chip = new Chip
-            {
-                [Chip.ChipTypeKey] = item.Type,
-                [Chip.NameKey] = item.Name,
-                [Chip.FlagsKey] = item.Flags,
-                [Chip.ClockKey] = item.Clock,
-            };
-            return chip;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.DipSwitch"/> to <cref="DipSwitch"/>
-        /// </summary>
-        private static DipSwitch ConvertToInternalModel(Models.ClrMamePro.DipSwitch item)
-        {
-            var dipswitch = new DipSwitch
-            {
-                [DipSwitch.NameKey] = item.Name,
-                [DipSwitch.EntryKey] = item.Entry,
-                [DipSwitch.DefaultKey] = item.Default,
-            };
-            return dipswitch;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Disk"/> to <cref="Disk"/>
-        /// </summary>
-        private static Disk ConvertToInternalModel(Models.ClrMamePro.Disk item)
-        {
-            var disk = new Disk
-            {
-                [Disk.NameKey] = item.Name,
-                [Disk.MD5Key] = item.MD5,
-                [Disk.SHA1Key] = item.SHA1,
-                [Disk.MergeKey] = item.Merge,
-                [Disk.StatusKey] = item.Status,
-                [Disk.FlagsKey] = item.Flags,
-            };
-            return disk;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Driver"/> to <cref="Driver"/>
-        /// </summary>
-        private static Driver ConvertToInternalModel(Models.ClrMamePro.Driver item)
-        {
-            var driver = new Driver
-            {
-                [Driver.StatusKey] = item.Status,
-                [Driver.ColorKey] = item.Color,
-                [Driver.SoundKey] = item.Sound,
-                [Driver.PaletteSizeKey] = item.PaletteSize,
-                [Driver.BlitKey] = item.Blit,
-            };
-            return driver;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Input"/> to <cref="Input"/>
-        /// </summary>
-        private static Input ConvertToInternalModel(Models.ClrMamePro.Input item)
-        {
-            var input = new Input
-            {
-                [Input.PlayersKey] = item.Players,
-                [Input.ControlKey] = item.Control,
-                [Input.ButtonsKey] = item.Buttons,
-                [Input.CoinsKey] = item.Coins,
-                [Input.TiltKey] = item.Tilt,
-                [Input.ServiceKey] = item.Service,
-            };
-            return input;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Media"/> to <cref="Media"/>
-        /// </summary>
-        private static Media ConvertToInternalModel(Models.ClrMamePro.Media item)
-        {
-            var media = new Media
-            {
-                [Media.NameKey] = item.Name,
-                [Media.MD5Key] = item.MD5,
-                [Media.SHA1Key] = item.SHA1,
-                [Media.SHA256Key] = item.SHA256,
-                [Media.SpamSumKey] = item.SpamSum,
-            };
-            return media;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Release"/> to <cref="Release"/>
-        /// </summary>
-        private static Release ConvertToInternalModel(Models.ClrMamePro.Release item)
-        {
-            var release = new Release
-            {
-                [Release.NameKey] = item.Name,
-                [Release.RegionKey] = item.Region,
-                [Release.LanguageKey] = item.Language,
-                [Release.DateKey] = item.Date,
-                [Release.DefaultKey] = item.Default,
-            };
-            return release;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Rom"/> to <cref="Rom"/>
-        /// </summary>
-        private static Rom ConvertToInternalModel(Models.ClrMamePro.Rom item)
-        {
-            var rom = new Rom
-            {
-                [Rom.NameKey] = item.Name,
-                [Rom.SizeKey] = item.Size,
-                [Rom.CRCKey] = item.CRC,
-                [Rom.MD5Key] = item.MD5,
-                [Rom.SHA1Key] = item.SHA1,
-                [Rom.SHA256Key] = item.SHA256,
-                [Rom.SHA384Key] = item.SHA384,
-                [Rom.SHA512Key] = item.SHA512,
-                [Rom.SpamSumKey] = item.SpamSum,
-                [Rom.xxHash364Key] = item.xxHash364,
-                [Rom.xxHash3128Key] = item.xxHash3128,
-                [Rom.MergeKey] = item.Merge,
-                [Rom.StatusKey] = item.Status,
-                [Rom.RegionKey] = item.Region,
-                [Rom.FlagsKey] = item.Flags,
-                [Rom.OffsetKey] = item.Offs,
-                [Rom.SerialKey] = item.Serial,
-                [Rom.HeaderKey] = item.Header,
-                [Rom.DateKey] = item.Date,
-                [Rom.InvertedKey] = item.Inverted,
-                [Rom.MIAKey] = item.MIA,
-            };
-            return rom;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Sample"/> to <cref="Sample"/>
-        /// </summary>
-        private static Sample ConvertToInternalModel(Models.ClrMamePro.Sample item)
-        {
-            var sample = new Sample
-            {
-                [Sample.NameKey] = item.Name,
-            };
-            return sample;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Sound"/> to <cref="Sound"/>
-        /// </summary>
-        private static Sound ConvertToInternalModel(Models.ClrMamePro.Sound item)
-        {
-            var sound = new Sound
-            {
-                [Sound.ChannelsKey] = item.Channels,
-            };
-            return sound;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Video"/> to <cref="Video"/>
-        /// </summary>
-        private static Video ConvertToInternalModel(Models.ClrMamePro.Video item)
-        {
-            var video = new Video
-            {
-                [Video.ScreenKey] = item.Screen,
-                [Video.OrientationKey] = item.Orientation,
-                [Video.WidthKey] = item.X,
-                [Video.HeightKey] = item.Y,
-                [Video.AspectXKey] = item.AspectX,
-                [Video.AspectYKey] = item.AspectY,
-                [Video.RefreshKey] = item.Freq,
-            };
-            return video;
-        }
-
-        #endregion
-
-        #region Deserialize
-
-        /// <summary>
-        /// Convert from <cref="Header"/> to <cref="Models.ClrMamePro.ClrMamePro"/>
-        /// </summary>
-        public static Models.ClrMamePro.ClrMamePro? ConvertHeaderToClrMamePro(Header? item)
-        {
-            if (item == null)
-                return null;
-
-            var clrMamePro = new Models.ClrMamePro.ClrMamePro
-            {
-                Name = item.ReadString(Header.NameKey),
-                Description = item.ReadString(Header.DescriptionKey),
-                RootDir = item.ReadString(Header.RootDirKey),
-                Category = item.ReadString(Header.CategoryKey),
-                Version = item.ReadString(Header.VersionKey),
-                Date = item.ReadString(Header.DateKey),
-                Author = item.ReadString(Header.AuthorKey),
-                Homepage = item.ReadString(Header.HomepageKey),
-                Url = item.ReadString(Header.UrlKey),
-                Comment = item.ReadString(Header.CommentKey),
-                Header = item.ReadString(Header.HeaderKey),
-                Type = item.ReadString(Header.TypeKey),
-                ForceMerging = item.ReadString(Header.ForceMergingKey),
-                ForceZipping = item.ReadString(Header.ForceZippingKey),
-                ForcePacking = item.ReadString(Header.ForcePackingKey),
-            };
-            return clrMamePro;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Archive"/> to <cref="Models.ClrMamePro.Machine"/>
-        /// </summary>
-        public static Models.ClrMamePro.GameBase? ConvertMachineToClrMamePro(Machine? item, bool game = false)
-        {
-            if (item == null)
-                return null;
-
-            Models.ClrMamePro.GameBase gameBase = game ? new Models.ClrMamePro.Game() : new Models.ClrMamePro.Machine();
-
-            gameBase.Name = item.ReadString(Machine.NameKey);
-            gameBase.Description = item.ReadString(Machine.DescriptionKey);
-            gameBase.Year = item.ReadString(Machine.YearKey);
-            gameBase.Manufacturer = item.ReadString(Machine.ManufacturerKey);
-            gameBase.Category = item.ReadString(Machine.CategoryKey);
-            gameBase.CloneOf = item.ReadString(Machine.CloneOfKey);
-            gameBase.RomOf = item.ReadString(Machine.RomOfKey);
-            gameBase.SampleOf = item.ReadString(Machine.SampleOfKey);
-
-            var releases = item.Read<Release[]>(Machine.ReleaseKey);
-            gameBase.Release = releases?.Select(ConvertToClrMamePro)?.ToArray();
-
-            var biosSets = item.Read<BiosSet[]>(Machine.BiosSetKey);
-            gameBase.BiosSet = biosSets?.Select(ConvertToClrMamePro)?.ToArray();
-
-            var roms = item.Read<Rom[]>(Machine.RomKey);
-            gameBase.Rom = roms?.Select(ConvertToClrMamePro)?.ToArray();
-
-            var disks = item.Read<Disk[]>(Machine.DiskKey);
-            gameBase.Disk = disks?.Select(ConvertToClrMamePro)?.ToArray();
-
-            var medias = item.Read<Media[]>(Machine.MediaKey);
-            gameBase.Media = medias?.Select(ConvertToClrMamePro)?.ToArray();
-
-            var samples = item.Read<Sample[]>(Machine.SampleKey);
-            gameBase.Sample = samples?.Select(ConvertToClrMamePro)?.ToArray();
-
-            var archives = item.Read<Archive[]>(Machine.ArchiveKey);
-            gameBase.Archive = archives?.Select(ConvertToClrMamePro)?.ToArray();
-
-            var chips = item.Read<Chip[]>(Machine.ChipKey);
-            gameBase.Chip = chips?.Select(ConvertToClrMamePro)?.ToArray();
-
-            var video = item.Read<Video>(Machine.VideoKey);
-            gameBase.Video = ConvertToClrMamePro(video);
-
-            var sound = item.Read<Sound>(Machine.SoundKey);
-            gameBase.Sound = ConvertToClrMamePro(sound);
-
-            var input = item.Read<Input>(Machine.InputKey);
-            gameBase.Input = ConvertToClrMamePro(input);
-
-            var dipSwitches = item.Read<DipSwitch[]>(Machine.DipSwitchKey);
-            gameBase.DipSwitch = dipSwitches?.Select(ConvertToClrMamePro)?.ToArray();
-
-            var driver = item.Read<Driver>(Machine.DriverKey);
-            gameBase.Driver = ConvertToClrMamePro(driver);
-
-            return gameBase;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Archive"/> to <cref="Models.ClrMamePro.Archive"/>
-        /// </summary>
-        private static Models.ClrMamePro.Archive? ConvertToClrMamePro(Archive? item)
-        {
-            if (item == null)
-                return null;
-
-            var archive = new Models.ClrMamePro.Archive
-            {
-                Name = item.ReadString(Archive.NameKey),
-            };
-            return archive;
-        }
-
-        /// <summary>
-        /// Convert from <cref="BiosSet"/> to <cref="Models.ClrMamePro.BiosSet"/>
-        /// </summary>
-        private static Models.ClrMamePro.BiosSet? ConvertToClrMamePro(BiosSet? item)
-        {
-            if (item == null)
-                return null;
-
-            var biosset = new Models.ClrMamePro.BiosSet
-            {
-                Name = item.ReadString(BiosSet.NameKey),
-                Description = item.ReadString(BiosSet.DescriptionKey),
-                Default = item.ReadString(BiosSet.DefaultKey),
-            };
-            return biosset;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Chip"/> to <cref="Models.ClrMamePro.Chip"/>
-        /// </summary>
-        private static Models.ClrMamePro.Chip? ConvertToClrMamePro(Chip? item)
-        {
-            if (item == null)
-                return null;
-
-            var chip = new Models.ClrMamePro.Chip
-            {
-                Type = item.ReadString(Chip.ChipTypeKey),
-                Name = item.ReadString(Chip.NameKey),
-                Flags = item.ReadString(Chip.FlagsKey),
-                Clock = item.ReadString(Chip.ClockKey),
-            };
-            return chip;
-        }
-
-        /// <summary>
-        /// Convert from <cref="DipSwitch"/> to <cref="Models.ClrMamePro.DipSwitch"/>
-        /// </summary>
-        private static Models.ClrMamePro.DipSwitch? ConvertToClrMamePro(DipSwitch? item)
-        {
-            if (item == null)
-                return null;
-
-            var dipswitch = new Models.ClrMamePro.DipSwitch
-            {
-                Name = item.ReadString(DipSwitch.NameKey),
-                Entry = item[DipSwitch.EntryKey] as string[],
-                Default = item.ReadString(DipSwitch.DefaultKey),
-            };
-            return dipswitch;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Disk"/> to <cref="Models.ClrMamePro.Disk"/>
-        /// </summary>
-        private static Models.ClrMamePro.Disk? ConvertToClrMamePro(Disk? item)
-        {
-            if (item == null)
-                return null;
-
-            var disk = new Models.ClrMamePro.Disk
-            {
-                Name = item.ReadString(Disk.NameKey),
-                MD5 = item.ReadString(Disk.MD5Key),
-                SHA1 = item.ReadString(Disk.SHA1Key),
-                Merge = item.ReadString(Disk.MergeKey),
-                Status = item.ReadString(Disk.StatusKey),
-                Flags = item.ReadString(Disk.FlagsKey),
-            };
-            return disk;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Driver"/> to <cref="Models.ClrMamePro.Driver"/>
-        /// </summary>
-        private static Models.ClrMamePro.Driver? ConvertToClrMamePro(Driver? item)
-        {
-            if (item == null)
-                return null;
-
-            var driver = new Models.ClrMamePro.Driver
-            {
-                Status = item.ReadString(Driver.StatusKey),
-                Color = item.ReadString(Driver.ColorKey),
-                Sound = item.ReadString(Driver.SoundKey),
-                PaletteSize = item.ReadString(Driver.PaletteSizeKey),
-                Blit = item.ReadString(Driver.BlitKey),
-            };
-            return driver;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Input"/> to <cref="Models.ClrMamePro.Input"/>
-        /// </summary>
-        private static Models.ClrMamePro.Input? ConvertToClrMamePro(Input? item)
-        {
-            if (item == null)
-                return null;
-
-            var input = new Models.ClrMamePro.Input
-            {
-                Players = item.ReadString(Input.PlayersKey),
-                Control = item.ReadString(Input.ControlKey),
-                Buttons = item.ReadString(Input.ButtonsKey),
-                Coins = item.ReadString(Input.CoinsKey),
-                Tilt = item.ReadString(Input.TiltKey),
-                Service = item.ReadString(Input.ServiceKey),
-            };
-            return input;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Media"/> to <cref="Models.ClrMamePro.Media"/>
-        /// </summary>
-        private static Models.ClrMamePro.Media? ConvertToClrMamePro(Media? item)
-        {
-            if (item == null)
-                return null;
-
-            var media = new Models.ClrMamePro.Media
-            {
-                Name = item.ReadString(Media.NameKey),
-                MD5 = item.ReadString(Media.MD5Key),
-                SHA1 = item.ReadString(Media.SHA1Key),
-                SHA256 = item.ReadString(Media.SHA256Key),
-                SpamSum = item.ReadString(Media.SpamSumKey),
-            };
-            return media;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Release"/> to <cref="Models.ClrMamePro.Release"/>
-        /// </summary>
-        private static Models.ClrMamePro.Release? ConvertToClrMamePro(Release? item)
-        {
-            if (item == null)
-                return null;
-
-            var release = new Models.ClrMamePro.Release
-            {
-                Name = item.ReadString(Release.NameKey),
-                Region = item.ReadString(Release.RegionKey),
-                Language = item.ReadString(Release.LanguageKey),
-                Date = item.ReadString(Release.DateKey),
-                Default = item.ReadString(Release.DefaultKey),
-            };
-            return release;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Rom"/> to <cref="Models.ClrMamePro.Rom"/>
-        /// </summary>
-        private static Models.ClrMamePro.Rom? ConvertToClrMamePro(Rom? item)
-        {
-            if (item == null)
-                return null;
-
-            var rom = new Models.ClrMamePro.Rom
-            {
-                Name = item.ReadString(Rom.NameKey),
-                Size = item.ReadString(Rom.SizeKey),
-                CRC = item.ReadString(Rom.CRCKey),
-                MD5 = item.ReadString(Rom.MD5Key),
-                SHA1 = item.ReadString(Rom.SHA1Key),
-                SHA256 = item.ReadString(Rom.SHA256Key),
-                SHA384 = item.ReadString(Rom.SHA384Key),
-                SHA512 = item.ReadString(Rom.SHA512Key),
-                SpamSum = item.ReadString(Rom.SpamSumKey),
-                xxHash364 = item.ReadString(Rom.xxHash364Key),
-                xxHash3128 = item.ReadString(Rom.xxHash3128Key),
-                Merge = item.ReadString(Rom.MergeKey),
-                Status = item.ReadString(Rom.StatusKey),
-                Region = item.ReadString(Rom.RegionKey),
-                Flags = item.ReadString(Rom.FlagsKey),
-                Offs = item.ReadString(Rom.OffsetKey),
-                Serial = item.ReadString(Rom.SerialKey),
-                Header = item.ReadString(Rom.HeaderKey),
-                Date = item.ReadString(Rom.DateKey),
-                Inverted = item.ReadString(Rom.InvertedKey),
-                MIA = item.ReadString(Rom.MIAKey),
-            };
-            return rom;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Sample"/> to <cref="Models.ClrMamePro.Sample"/>
-        /// </summary>
-        private static Models.ClrMamePro.Sample? ConvertToClrMamePro(Sample? item)
-        {
-            if (item == null)
-                return null;
-
-            var sample = new Models.ClrMamePro.Sample
-            {
-                Name = item.ReadString(Sample.NameKey),
-            };
-            return sample;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Sound"/> to <cref="Models.ClrMamePro.Sound"/>
-        /// </summary>
-        private static Models.ClrMamePro.Sound? ConvertToClrMamePro(Sound? item)
-        {
-            if (item == null)
-                return null;
-
-            var sound = new Models.ClrMamePro.Sound
-            {
-                Channels = item.ReadString(Sound.ChannelsKey),
-            };
-            return sound;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Video"/> to <cref="Models.ClrMamePro.Video"/>
-        /// </summary>
-        private static Models.ClrMamePro.Video? ConvertToClrMamePro(Video? item)
-        {
-            if (item == null)
-                return null;
-
-            var video = new Models.ClrMamePro.Video
-            {
-                Screen = item.ReadString(Video.ScreenKey),
-                Orientation = item.ReadString(Video.OrientationKey),
-                X = item.ReadString(Video.WidthKey),
-                Y = item.ReadString(Video.HeightKey),
-                AspectX = item.ReadString(Video.AspectXKey),
-                AspectY = item.ReadString(Video.AspectYKey),
-                Freq = item.ReadString(Video.RefreshKey),
-            };
-            return video;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file