diff --git a/SabreTools.Helper/Data/Constants.cs b/SabreTools.Helper/Data/Constants.cs
index 73a866fe..a14aa9e2 100644
--- a/SabreTools.Helper/Data/Constants.cs
+++ b/SabreTools.Helper/Data/Constants.cs
@@ -171,5 +171,16 @@ namespace SabreTools.Helper
 		public static byte[] TorrentGZHeader = new byte[] { 0x1f, 0x8b, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00 };
 
 		#endregion
+
+		#region Database schema
+
+		public static string DATabaseDbSchema = "dats";
+		public static string DATabaseFileName = "dats.sqlite";
+		public static string DATabaseConnectionString = "Data Source=" + DATabaseFileName + ";Version = 3;";
+		public static string HeadererDbSchema = "Headerer";
+		public static string HeadererFileName = "Headerer.sqlite";
+		public static string HeadererConnectionString = "Data Source=" + HeadererFileName + ";Version = 3;";
+
+		#endregion
 	}
 }
diff --git a/SabreTools.Helper/Objects/Headerer.cs b/SabreTools.Helper/Objects/Headerer.cs
index 2e75ef26..46966d12 100644
--- a/SabreTools.Helper/Objects/Headerer.cs
+++ b/SabreTools.Helper/Objects/Headerer.cs
@@ -17,11 +17,6 @@ namespace SabreTools
 		private string _outdir;
 		private Logger _logger;
 
-		// Private required variables
-		private static string _headererDbSchema = "Headerer";
-		private static string _headererDbName = "Headerer.sqlite";
-		private static string _headererConnectionString = "Data Source=" + _headererDbName + ";Version = 3;";
-
 		/// <summary>
 		/// Create a new Headerer object
 		/// </summary>
@@ -152,7 +147,7 @@ namespace SabreTools
 			bool exists = false;
 
 			string query = @"SELECT * FROM data WHERE sha1='" + SHA1 + "' AND header='" + header + "'";
-			using (SqliteConnection dbc = new SqliteConnection(_headererConnectionString))
+			using (SqliteConnection dbc = new SqliteConnection(Constants.HeadererConnectionString))
 			{
 				dbc.Open();
 				using (SqliteCommand slc = new SqliteCommand(query, dbc))
@@ -170,7 +165,7 @@ namespace SabreTools
 				SHA1 + "', " +
 				"'" + header + "', " +
 				"'" + type.ToString() + "')";
-				using (SqliteConnection dbc = new SqliteConnection(_headererConnectionString))
+				using (SqliteConnection dbc = new SqliteConnection(Constants.HeadererConnectionString))
 				{
 					dbc.Open();
 					using (SqliteCommand slc = new SqliteCommand(query, dbc))
@@ -195,7 +190,7 @@ namespace SabreTools
 			string header = "";
 
 			string query = @"SELECT header, type FROM data WHERE sha1='" + rom.HashData.SHA1 + "'";
-			using (SqliteConnection dbc = new SqliteConnection(_headererConnectionString))
+			using (SqliteConnection dbc = new SqliteConnection(Constants.HeadererConnectionString))
 			{
 				dbc.Open();
 				using (SqliteCommand slc = new SqliteCommand(query, dbc))
diff --git a/SabreTools/Partials/SabreTools_Helpers.cs b/SabreTools/Partials/SabreTools_Helpers.cs
index e5031b3d..ffac0fe1 100644
--- a/SabreTools/Partials/SabreTools_Helpers.cs
+++ b/SabreTools/Partials/SabreTools_Helpers.cs
@@ -25,9 +25,9 @@ namespace SabreTools
 			{
 				Directory.CreateDirectory(_outroot);
 			}
-			DBTools.EnsureDatabase(_databaseDbSchema, _databaseDbName, _databaseConnectionString);
+			DBTools.EnsureDatabase(Constants.DATabaseDbSchema, Constants.DATabaseFileName, Constants.DATabaseConnectionString);
 
-			using (SqliteConnection dbc = new SqliteConnection(_databaseConnectionString))
+			using (SqliteConnection dbc = new SqliteConnection(Constants.DATabaseConnectionString))
 			{
 				dbc.Open();
 
@@ -50,7 +50,7 @@ namespace SabreTools
 				}
 			}
 
-			DBTools.EnsureDatabase(_headererDbSchema, _headererDbName, _headererConnectionString);
+			DBTools.EnsureDatabase(Constants.HeadererDbSchema, Constants.HeadererFileName, Constants.HeadererConnectionString);
 		}
 
 		/// <summary>
@@ -63,7 +63,7 @@ namespace SabreTools
 SELECT DISTINCT source.id, source.name, source.url
 FROM source
 ORDER BY source.name";
-			using (SqliteConnection dbc = new SqliteConnection(_databaseConnectionString))
+			using (SqliteConnection dbc = new SqliteConnection(Constants.DATabaseConnectionString))
 			{
 				dbc.Open();
 				using (SqliteCommand slc = new SqliteCommand(query, dbc))
@@ -97,7 +97,7 @@ ORDER BY source.name";
 SELECT DISTINCT system.id, system.manufacturer, system.name
 FROM system
 ORDER BY system.manufacturer, system.name";
-			using (SqliteConnection dbc = new SqliteConnection(_databaseConnectionString))
+			using (SqliteConnection dbc = new SqliteConnection(Constants.DATabaseConnectionString))
 			{
 				dbc.Open();
 				using (SqliteCommand slc = new SqliteCommand(query, dbc))
diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs
index af1e27a4..c4637a59 100644
--- a/SabreTools/Partials/SabreTools_Inits.cs
+++ b/SabreTools/Partials/SabreTools_Inits.cs
@@ -18,7 +18,7 @@ namespace SabreTools
 		/// <param name="url">Source URL(s)</param>
 		private static void InitAddSource(string name, string url)
 		{
-			if (DBTools.AddSource(name, url, _databaseConnectionString))
+			if (DBTools.AddSource(name, url, Constants.DATabaseConnectionString))
 			{
 				_logger.Log("Source " + name + " added!");
 			}
@@ -35,7 +35,7 @@ namespace SabreTools
 		/// <param name="system">System name</param>
 		private static void InitAddSystem(string manufacturer, string system)
 		{
-			if (DBTools.AddSystem(manufacturer, system, _databaseConnectionString))
+			if (DBTools.AddSystem(manufacturer, system, Constants.DATabaseConnectionString))
 			{
 				_logger.Log("System " + manufacturer + " - " + system + " added!");
 			}
@@ -241,7 +241,7 @@ namespace SabreTools
 		/// <param name="old">True if the output file should be in ClrMamePro format (default false)</param>
 		private static void InitGenerate(string systemid, bool norename, bool old)
 		{
-			IGenerate gen = new GenerateTwo(systemid, "" /* sourceid */, _datroot, _outroot, _databaseConnectionString, _logger, norename, old);
+			IGenerate gen = new GenerateTwo(systemid, "" /* sourceid */, _datroot, _outroot, Constants.DATabaseConnectionString, _logger, norename, old);
 			gen.Export();
 		}
 
@@ -251,7 +251,7 @@ namespace SabreTools
 		private static void InitGenerateAll(bool norename, bool old)
 		{
 			List<string> systems = new List<string>();
-			using (SqliteConnection dbc = new SqliteConnection(_databaseConnectionString))
+			using (SqliteConnection dbc = new SqliteConnection(Constants.DATabaseConnectionString))
 			{
 				dbc.Open();
 
@@ -333,7 +333,7 @@ namespace SabreTools
 		/// <param name="ignore"></param>
 		private static void InitImport(bool ignore)
 		{
-			IImport imp = new ImportTwo(_datroot, _databaseConnectionString, _logger, ignore);
+			IImport imp = new ImportTwo(_datroot, Constants.DATabaseConnectionString, _logger, ignore);
 			imp.UpdateDatabase();
 		}
 
@@ -346,7 +346,7 @@ namespace SabreTools
 			int srcid = -1;
 			if (Int32.TryParse(sourceid, out srcid))
 			{
-				if (DBTools.RemoveSource(srcid, _databaseConnectionString))
+				if (DBTools.RemoveSource(srcid, Constants.DATabaseConnectionString))
 				{
 					_logger.Log("Source '" + srcid + "' removed!");
 				}
@@ -370,7 +370,7 @@ namespace SabreTools
 			int sysid = -1;
 			if (Int32.TryParse(systemid, out sysid))
 			{
-				if (DBTools.RemoveSystem(sysid, _databaseConnectionString))
+				if (DBTools.RemoveSystem(sysid, Constants.DATabaseConnectionString))
 				{
 					_logger.Log("System '" + sysid + "' removed!");
 				}
diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index 8a54b125..61d27df2 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -27,14 +27,6 @@ namespace SabreTools
 		private static string _datroot = "DATS";
 		private static string _outroot = "Output";
 
-		// Database schema variables
-		private static string _databaseDbSchema = "dats";
-		private static string _databaseDbName = "dats.sqlite";
-		private static string _databaseConnectionString = "Data Source=" + _databaseDbName + ";Version = 3;";
-		private static string _headererDbSchema = "Headerer";
-		private static string _headererDbName = "Headerer.sqlite";
-		private static string _headererConnectionString = "Data Source=" + _headererDbName + ";Version = 3;";
-
 		private static Logger _logger;
 
 		/// <summary>