diff --git a/SabreTools.DatFiles/DatFile.Removal.cs b/SabreTools.DatFiles/DatFile.Removal.cs
index e0a8dd6b..9edcb75f 100644
--- a/SabreTools.DatFiles/DatFile.Removal.cs
+++ b/SabreTools.DatFiles/DatFile.Removal.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+#if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
+#endif
 using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
@@ -35,7 +37,7 @@ namespace SabreTools.DatFiles
         private void ApplyRemovalsItemDictionary(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
         {
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(Items.Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(Items.Keys, key =>
 #else
@@ -67,7 +69,7 @@ namespace SabreTools.DatFiles
         private void ApplyRemovalsItemDictionaryDB(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
         {
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(ItemsDB.SortedKeys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(ItemsDB.SortedKeys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(ItemsDB.SortedKeys, key =>
 #else
diff --git a/SabreTools.DatFiles/ItemDictionary.cs b/SabreTools.DatFiles/ItemDictionary.cs
index 9c37e868..5f9c5252 100644
--- a/SabreTools.DatFiles/ItemDictionary.cs
+++ b/SabreTools.DatFiles/ItemDictionary.cs
@@ -688,7 +688,7 @@ namespace SabreTools.DatFiles
             List<string> oldkeys = [.. Keys];
 
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.For(0, oldkeys.Count, Globals.ParallelOptions, k =>
+            Parallel.For(0, oldkeys.Count, Core.Globals.ParallelOptions, k =>
 #elif NET40_OR_GREATER
             Parallel.For(0, oldkeys.Count, k =>
 #else
@@ -740,7 +740,7 @@ namespace SabreTools.DatFiles
 
             List<string> keys = [.. Keys];
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(keys, key =>
 #else
@@ -780,7 +780,7 @@ namespace SabreTools.DatFiles
         {
             List<string> keys = [.. Keys];
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(keys, key =>
 #else
@@ -828,7 +828,7 @@ namespace SabreTools.DatFiles
         {
             List<string> keys = [.. Keys];
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(keys, key =>
 #else
@@ -981,7 +981,7 @@ namespace SabreTools.DatFiles
         {
             // For each rom, we want to update the game to be "<game name>/<rom name>"
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(Keys, key =>
 #else
@@ -1017,7 +1017,7 @@ namespace SabreTools.DatFiles
 
             // Now process all of the roms
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(Keys, key =>
 #else
@@ -1064,7 +1064,7 @@ namespace SabreTools.DatFiles
             Dictionary<string, string> mapping = [];
 #endif
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(Keys, key =>
 #else
@@ -1134,7 +1134,7 @@ namespace SabreTools.DatFiles
         private void UpdateMachineNamesFromDescriptions(IDictionary<string, string> mapping)
         {
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(Keys, key =>
 #else
diff --git a/SabreTools.DatFiles/ItemDictionaryDB.cs b/SabreTools.DatFiles/ItemDictionaryDB.cs
index a54a654d..354ddd80 100644
--- a/SabreTools.DatFiles/ItemDictionaryDB.cs
+++ b/SabreTools.DatFiles/ItemDictionaryDB.cs
@@ -1009,7 +1009,7 @@ namespace SabreTools.DatFiles
             long[] itemIndicies = [.. _items.Keys];
 
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.For(0, itemIndicies.Length, Globals.ParallelOptions, i =>
+            Parallel.For(0, itemIndicies.Length, Core.Globals.ParallelOptions, i =>
 #elif NET40_OR_GREATER
             Parallel.For(0, itemIndicies.Length, i =>
 #else
@@ -1049,7 +1049,7 @@ namespace SabreTools.DatFiles
             string[] bucketKeys = [.. _buckets.Keys];
 
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.For(0, bucketKeys.Length, Globals.ParallelOptions, i =>
+            Parallel.For(0, bucketKeys.Length, Core.Globals.ParallelOptions, i =>
 #elif NET40_OR_GREATER
             Parallel.For(0, bucketKeys.Length, i =>
 #else
@@ -1092,7 +1092,7 @@ namespace SabreTools.DatFiles
             string[] bucketKeys = [.. _buckets.Keys];
 
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.For(0, bucketKeys.Length, Globals.ParallelOptions, i =>
+            Parallel.For(0, bucketKeys.Length, Core.Globals.ParallelOptions, i =>
 #elif NET40_OR_GREATER
             Parallel.For(0, bucketKeys.Length, i =>
 #else
@@ -1224,7 +1224,7 @@ namespace SabreTools.DatFiles
         {
             List<string> keys = [.. SortedKeys];
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(keys, key =>
 #else
@@ -1366,7 +1366,7 @@ namespace SabreTools.DatFiles
         {
             // For each rom, we want to update the game to be "<game name>/<rom name>"
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(SortedKeys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(SortedKeys, key =>
 #else
@@ -1402,7 +1402,7 @@ namespace SabreTools.DatFiles
 
             // Now process all of the roms
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(SortedKeys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(SortedKeys, key =>
 #else
@@ -1452,7 +1452,7 @@ namespace SabreTools.DatFiles
             Dictionary<string, string> mapping = [];
 #endif
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(SortedKeys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(SortedKeys, key =>
 #else
@@ -1555,7 +1555,7 @@ namespace SabreTools.DatFiles
         private void UpdateMachineNamesFromDescriptions(IDictionary<string, string> mapping)
         {
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(SortedKeys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(SortedKeys, key =>
 #else
diff --git a/SabreTools.DatTools/DatFileTool.cs b/SabreTools.DatTools/DatFileTool.cs
index cd5a8884..e35ced29 100644
--- a/SabreTools.DatTools/DatFileTool.cs
+++ b/SabreTools.DatTools/DatFileTool.cs
@@ -36,7 +36,7 @@ namespace SabreTools.DatTools
         {
             List<string> keys = [.. datFile.Items.Keys];
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(keys, key =>
 #else
@@ -107,7 +107,7 @@ namespace SabreTools.DatTools
         {
             List<string> keys = [.. datFile.ItemsDB.SortedKeys];
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(keys, key =>
 #else
@@ -186,7 +186,7 @@ namespace SabreTools.DatTools
 
                 // Then we do a hashwise comparison against the base DAT
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.ForEach(intDat.Items.Keys, Globals.ParallelOptions, key =>
+                Parallel.ForEach(intDat.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
                 Parallel.ForEach(intDat.Items.Keys, key =>
 #else
@@ -234,7 +234,7 @@ namespace SabreTools.DatTools
 
                 // Then we do a namewise comparison against the base DAT
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.ForEach(intDat.Items.Keys, Globals.ParallelOptions, key =>
+                Parallel.ForEach(intDat.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
                 Parallel.ForEach(intDat.Items.Keys, key =>
 #else
@@ -303,7 +303,7 @@ namespace SabreTools.DatTools
 
                 // Then we do a hashwise comparison against the base DAT
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.ForEach(intDat.ItemsDB.SortedKeys, Globals.ParallelOptions, key =>
+                Parallel.ForEach(intDat.ItemsDB.SortedKeys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
                 Parallel.ForEach(intDat.ItemsDB.SortedKeys, key =>
 #else
@@ -344,7 +344,7 @@ namespace SabreTools.DatTools
 
                 // Then we do a namewise comparison against the base DAT
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.ForEach(intDat.ItemsDB.SortedKeys, Globals.ParallelOptions, key =>
+                Parallel.ForEach(intDat.ItemsDB.SortedKeys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
                 Parallel.ForEach(intDat.ItemsDB.SortedKeys, key =>
 #else
@@ -401,7 +401,7 @@ namespace SabreTools.DatTools
             // Then we compare against the base DAT
             List<string> keys = [.. intDat.Items.Keys];
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(keys, key =>
 #else
@@ -503,7 +503,7 @@ namespace SabreTools.DatTools
             // Create the DatFiles from the set of headers
             DatFile[] outDatsArray = new DatFile[datHeaders.Count];
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.For(0, datHeaders.Count, Globals.ParallelOptions, j =>
+            Parallel.For(0, datHeaders.Count, Core.Globals.ParallelOptions, j =>
 #elif NET40_OR_GREATER
             Parallel.For(0, datHeaders.Count, j =>
 #else
@@ -571,7 +571,7 @@ namespace SabreTools.DatTools
             watch.Start("Populating duplicate DAT");
 
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datFile.Items.Keys, key =>
 #else
@@ -675,7 +675,7 @@ namespace SabreTools.DatTools
 
             // Loop through and add the items
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
+            Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datItems, item =>
 #else
@@ -767,7 +767,7 @@ namespace SabreTools.DatTools
             DatFile[] outDatsArray = new DatFile[inputs.Count];
 
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.For(0, inputs.Count, Globals.ParallelOptions, j =>
+            Parallel.For(0, inputs.Count, Core.Globals.ParallelOptions, j =>
 #elif NET40_OR_GREATER
             Parallel.For(0, inputs.Count, j =>
 #else
@@ -796,7 +796,7 @@ namespace SabreTools.DatTools
             watch.Start("Populating all individual DATs");
 
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datFile.Items.Keys, key =>
 #else
@@ -860,7 +860,7 @@ namespace SabreTools.DatTools
             DatFile[] outDatsArray = new DatFile[inputs.Count];
 
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.For(0, inputs.Count, Globals.ParallelOptions, j =>
+            Parallel.For(0, inputs.Count, Core.Globals.ParallelOptions, j =>
 #elif NET40_OR_GREATER
             Parallel.For(0, inputs.Count, j =>
 #else
@@ -925,7 +925,7 @@ namespace SabreTools.DatTools
 
             // Loop through and add the items
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
+            Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datItems, item =>
 #else
@@ -1006,7 +1006,7 @@ namespace SabreTools.DatTools
             watch.Start("Populating no duplicate DAT");
 
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datFile.Items.Keys, key =>
 #else
@@ -1108,7 +1108,7 @@ namespace SabreTools.DatTools
 
             // Loop through and add the items
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
+            Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datItems, item =>
 #else
@@ -1190,7 +1190,7 @@ namespace SabreTools.DatTools
 
             // Parse all of the DATs into their own DatFiles in the array
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.For(0, inputs.Count, Globals.ParallelOptions, i =>
+            Parallel.For(0, inputs.Count, Core.Globals.ParallelOptions, i =>
 #elif NET40_OR_GREATER
             Parallel.For(0, inputs.Count, i =>
 #else
@@ -1281,7 +1281,7 @@ namespace SabreTools.DatTools
 
             // Loop through and add the items
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
+            Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datItems, item =>
 #else
@@ -1320,7 +1320,7 @@ namespace SabreTools.DatTools
         {
             // Loop through and add the items for this index to the output
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datFile.Items.Keys, key =>
 #else
@@ -1386,7 +1386,7 @@ namespace SabreTools.DatTools
 
             // Loop through and add the items
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
+            Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datItems, item =>
 #else
diff --git a/SabreTools.DatTools/Rebuilder.cs b/SabreTools.DatTools/Rebuilder.cs
index eb652e90..60094d49 100644
--- a/SabreTools.DatTools/Rebuilder.cs
+++ b/SabreTools.DatTools/Rebuilder.cs
@@ -80,7 +80,7 @@ namespace SabreTools.DatTools
             // Now loop through and get only directories from the input paths
             List<string> directories = [];
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(inputs, Globals.ParallelOptions, input =>
+            Parallel.ForEach(inputs, Core.Globals.ParallelOptions, input =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(inputs, input =>
 #else
diff --git a/SabreTools.DatTools/Splitter.cs b/SabreTools.DatTools/Splitter.cs
index d90866cb..91af432f 100644
--- a/SabreTools.DatTools/Splitter.cs
+++ b/SabreTools.DatTools/Splitter.cs
@@ -66,7 +66,7 @@ namespace SabreTools.DatTools
 
             // Now separate the roms accordingly
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datFile.Items.Keys, key =>
 #else
@@ -170,7 +170,7 @@ namespace SabreTools.DatTools
 
             // Loop through and add the items
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
+            Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datItems, item =>
 #else
@@ -240,7 +240,7 @@ namespace SabreTools.DatTools
 
             // Now populate each of the DAT objects in turn
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datFile.Items.Keys, key =>
 #else
@@ -390,7 +390,7 @@ namespace SabreTools.DatTools
 
             // Loop through and add the items
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
+            Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datItems, item =>
 #else
@@ -489,7 +489,7 @@ namespace SabreTools.DatTools
 
             // Then, we loop over the games
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(keys, key =>
 #else
@@ -615,7 +615,7 @@ namespace SabreTools.DatTools
 
             // Now populate each of the DAT objects in turn
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datFile.Items.Keys, key =>
 #else
@@ -708,7 +708,7 @@ namespace SabreTools.DatTools
 
             // Loop through and add the items
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
+            Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datItems, item =>
 #else
@@ -867,7 +867,7 @@ namespace SabreTools.DatTools
 
             // Now populate each of the DAT objects in turn
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(outputTypes, Globals.ParallelOptions, itemType =>
+            Parallel.ForEach(outputTypes, Core.Globals.ParallelOptions, itemType =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(outputTypes, itemType =>
 #else
@@ -897,7 +897,7 @@ namespace SabreTools.DatTools
         {
             // Loop through and add the items for this index to the output
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key =>
+            Parallel.ForEach(datFile.Items.Keys, Core.Globals.ParallelOptions, key =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datFile.Items.Keys, key =>
 #else
@@ -962,7 +962,7 @@ namespace SabreTools.DatTools
 
             // Loop through and add the items
 #if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(datItems, Globals.ParallelOptions, item =>
+            Parallel.ForEach(datItems, Core.Globals.ParallelOptions, item =>
 #elif NET40_OR_GREATER
             Parallel.ForEach(datItems, item =>
 #else
diff --git a/SabreTools.DatTools/Statistics.cs b/SabreTools.DatTools/Statistics.cs
index 15eb3287..7a55ff40 100644
--- a/SabreTools.DatTools/Statistics.cs
+++ b/SabreTools.DatTools/Statistics.cs
@@ -165,7 +165,7 @@ namespace SabreTools.DatTools
             {
                 // Write out all required formats
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.ForEach(outfiles.Keys, SabreTools.Core.Globals.ParallelOptions, reportFormat =>
+                Parallel.ForEach(outfiles.Keys, Core.Globals.ParallelOptions, reportFormat =>
 #elif NET40_OR_GREATER
                 Parallel.ForEach(outfiles.Keys, reportFormat =>
 #else
diff --git a/SabreTools.DatTools/Writer.cs b/SabreTools.DatTools/Writer.cs
index 7f4631e2..0d880a59 100644
--- a/SabreTools.DatTools/Writer.cs
+++ b/SabreTools.DatTools/Writer.cs
@@ -80,7 +80,7 @@ namespace SabreTools.DatTools
             {
                 // Write out all required formats
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.ForEach(outfiles.Keys, SabreTools.Core.Globals.ParallelOptions, datFormat =>
+                Parallel.ForEach(outfiles.Keys, Core.Globals.ParallelOptions, datFormat =>
 #elif NET40_OR_GREATER
                 Parallel.ForEach(outfiles.Keys, datFormat =>
 #else
diff --git a/SabreTools/Features/Split.cs b/SabreTools/Features/Split.cs
index 00f93fa8..fbbec044 100644
--- a/SabreTools/Features/Split.cs
+++ b/SabreTools/Features/Split.cs
@@ -99,7 +99,7 @@ namespace SabreTools.Features
 
                     // Loop through each type DatFile
 #if NET452_OR_GREATER || NETCOREAPP
-                    Parallel.ForEach(typeDats.Keys, Globals.ParallelOptions, itemType =>
+                    Parallel.ForEach(typeDats.Keys, Core.Globals.ParallelOptions, itemType =>
 #elif NET40_OR_GREATER
                     Parallel.ForEach(typeDats.Keys, itemType =>
 #else
@@ -152,7 +152,7 @@ namespace SabreTools.Features
 
                     // Loop through each type DatFile
 #if NET452_OR_GREATER || NETCOREAPP
-                    Parallel.ForEach(sizedDats, Globals.ParallelOptions, sizedDat =>
+                    Parallel.ForEach(sizedDats, Core.Globals.ParallelOptions, sizedDat =>
 #elif NET40_OR_GREATER
                     Parallel.ForEach(sizedDats, sizedDat =>
 #else
@@ -178,7 +178,7 @@ namespace SabreTools.Features
 
                     // Loop through each type DatFile
 #if NET452_OR_GREATER || NETCOREAPP
-                    Parallel.ForEach(typeDats.Keys, Globals.ParallelOptions, itemType =>
+                    Parallel.ForEach(typeDats.Keys, Core.Globals.ParallelOptions, itemType =>
 #elif NET40_OR_GREATER
                     Parallel.ForEach(typeDats.Keys, itemType =>
 #else
diff --git a/SabreTools/Features/Update.cs b/SabreTools/Features/Update.cs
index b31f2f02..cb3ba715 100644
--- a/SabreTools/Features/Update.cs
+++ b/SabreTools/Features/Update.cs
@@ -156,7 +156,7 @@ namespace SabreTools.Features
             {
                 // Loop through each input and update
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.ForEach(inputPaths, Globals.ParallelOptions, inputPath =>
+                Parallel.ForEach(inputPaths, Core.Globals.ParallelOptions, inputPath =>
 #elif NET40_OR_GREATER
                 Parallel.ForEach(inputPaths, inputPath =>
 #else
@@ -260,7 +260,7 @@ namespace SabreTools.Features
                 InternalStopwatch watch = new("Outputting all individual DATs");
 
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.For(0, inputPaths.Count, Globals.ParallelOptions, j =>
+                Parallel.For(0, inputPaths.Count, Core.Globals.ParallelOptions, j =>
 #elif NET40_OR_GREATER
                 Parallel.For(0, inputPaths.Count, j =>
 #else
@@ -285,7 +285,7 @@ namespace SabreTools.Features
             {
                 // Preprocess the DatHeaders
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.For(0, datHeaders.Count, Globals.ParallelOptions, j =>
+                Parallel.For(0, datHeaders.Count, Core.Globals.ParallelOptions, j =>
 #elif NET40_OR_GREATER
                 Parallel.For(0, datHeaders.Count, j =>
 #else
@@ -316,7 +316,7 @@ namespace SabreTools.Features
 
                 int startIndex = GetBoolean(features, SkipFirstOutputValue) ? 1 : 0;
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.For(startIndex, inputPaths.Count, Globals.ParallelOptions, j =>
+                Parallel.For(startIndex, inputPaths.Count, Core.Globals.ParallelOptions, j =>
 #elif NET40_OR_GREATER
                 Parallel.For(startIndex, inputPaths.Count, j =>
 #else
@@ -341,7 +341,7 @@ namespace SabreTools.Features
             {
                 // Loop through each input and diff against the base
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.ForEach(inputPaths, Globals.ParallelOptions, inputPath =>
+                Parallel.ForEach(inputPaths, Core.Globals.ParallelOptions, inputPath =>
 #elif NET40_OR_GREATER
                 Parallel.ForEach(inputPaths, inputPath =>
 #else
@@ -378,7 +378,7 @@ namespace SabreTools.Features
             {
                 // Loop through each input and apply the base DatFile
 #if NET452_OR_GREATER || NETCOREAPP
-                Parallel.ForEach(inputPaths, Globals.ParallelOptions, inputPath =>
+                Parallel.ForEach(inputPaths, Core.Globals.ParallelOptions, inputPath =>
 #elif NET40_OR_GREATER
                 Parallel.ForEach(inputPaths, inputPath =>
 #else