diff --git a/SabreTools.Data.Models/Metadata/Machine.cs b/SabreTools.Data.Models/Metadata/Machine.cs
index 1fddb4bd..72c78f16 100644
--- a/SabreTools.Data.Models/Metadata/Machine.cs
+++ b/SabreTools.Data.Models/Metadata/Machine.cs
@@ -29,10 +29,14 @@ namespace SabreTools.Data.Models.Metadata
 
         public string? Control { get; set; }
 
+        public string? CRC { get; set; }
+
         public string? Country { get; set; }
 
         public string? Description { get; set; }
 
+        public string? Developer { get; set; }
+
         public Device[]? Device { get; set; }
 
         public DeviceRef[]? DeviceRef { get; set; }
@@ -57,6 +61,8 @@ namespace SabreTools.Data.Models.Metadata
 
         public string? Emulator { get; set; }
 
+        public string? Enabled { get; set; }
+
         public string? Extra { get; set; }
 
         public string? Favorite { get; set; }
@@ -65,6 +71,8 @@ namespace SabreTools.Data.Models.Metadata
 
         public string? GenMSXID { get; set; }
 
+        public string? Genre { get; set; }
+
         public string? Hash { get; set; }
 
         public string? History { get; set; }
@@ -116,8 +124,12 @@ namespace SabreTools.Data.Models.Metadata
 
         public RamOption[]? RamOption { get; set; }
 
+        public string? Ratings { get; set; }
+
         public string? RebuildTo { get; set; }
 
+        public string? RelatedTo { get; set; }
+
         public Release[]? Release { get; set; }
 
         public string? ReleaseNumber { get; set; }
@@ -137,6 +149,8 @@ namespace SabreTools.Data.Models.Metadata
 
         public string? SaveType { get; set; }
 
+        public string? Score { get; set; }
+
         public SharedFeat[]? SharedFeat { get; set; }
 
         public Slot[]? Slot { get; set; }
@@ -145,12 +159,16 @@ namespace SabreTools.Data.Models.Metadata
 
         public Sound? Sound { get; set; }
 
+        public string? Source { get; set; }
+
         public string? SourceFile { get; set; }
 
         public string? SourceRom { get; set; }
 
         public string? Status { get; set; }
 
+        public string? Subgenre { get; set; }
+
         /// <remarks>(yes|partial|no) "yes"</remarks>
         public Supported? Supported { get; set; }
 
@@ -158,6 +176,8 @@ namespace SabreTools.Data.Models.Metadata
 
         public string? Tags { get; set; }
 
+        public string? TitleID { get; set; }
+
         public string? Url { get; set; }
 
         public Video[]? Video { get; set; }
@@ -166,38 +186,6 @@ namespace SabreTools.Data.Models.Metadata
 
         #endregion
 
-        #region From Trurip
-
-        // public string? CloneOf { get; set; }
-
-        public string? CRC { get; set; }
-
-        public string? Developer { get; set; }
-
-        public string? Enabled { get; set; }
-
-        public string? Genre { get; set; }
-
-        // public string? Players { get; set; }
-
-        // public string? Publisher { get; set; }
-
-        public string? Ratings { get; set; }
-
-        public string? RelatedTo { get; set; }
-
-        public string? Score { get; set; }
-
-        public string? Source { get; set; }
-
-        public string? Subgenre { get; set; }
-
-        public string? TitleID { get; set; }
-
-        // public string? Year { get; set; }
-
-        #endregion
-
         #region Keys
 
         /// <remarks>string, string[]</remarks>