diff --git a/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj b/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj
index de06a9e..22dbd45 100644
--- a/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj
+++ b/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj
@@ -13,6 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -59,11 +61,35 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.87.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\DLL\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -85,9 +111,11 @@
     <Compile Include="HisensePlugin.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="ChanSort.Loader.Hisense.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ChanSort.Api\ChanSort.Api.csproj">
@@ -112,6 +140,13 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/ChanSort.Loader.Hisense/ChannelDb/ChannelDbSerializer.cs b/source/ChanSort.Loader.Hisense/ChannelDb/ChannelDbSerializer.cs
index ee121f9..ec329c3 100644
--- a/source/ChanSort.Loader.Hisense/ChannelDb/ChannelDbSerializer.cs
+++ b/source/ChanSort.Loader.Hisense/ChannelDb/ChannelDbSerializer.cs
@@ -2,11 +2,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data;
-using ChanSort.Api;
-using System.Data.SQLite;
 using System.IO;
 using System.Text.RegularExpressions;
+using Microsoft.Data.Sqlite;
+using ChanSort.Api;
 
 namespace ChanSort.Loader.Hisense.ChannelDb
 {
@@ -79,12 +78,12 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
     #endregion
 
-    private readonly List<ChannelList> channelLists = new List<ChannelList>();
-    private readonly Dictionary<long, Channel> channelsById = new Dictionary<long, Channel>();
+    private readonly List<ChannelList> channelLists = new ();
+    private readonly Dictionary<long, Channel> channelsById = new ();
     private List<string> tableNames;
 
     // the fav_1 - fav_4 tables in channel.db of a H50B7700UW has different column names and a primary key/unique constraint which requires specific handling
-    private bool hasCamelCaseFavSchema = false;
+    private bool hasCamelCaseFavSchema;
 
     #region ctor()
 
@@ -145,36 +144,34 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
     public override void Load()
     {
-      using (var conn = new SQLiteConnection("Data Source=" + this.FileName))
+      using (var conn = new SqliteConnection("Data Source=" + this.FileName))
       {
         conn.Open();
-        using (var cmd = conn.CreateCommand())
-        {
-          this.RepairCorruptedDatabaseImage(cmd);
-          this.LoadTableNames(cmd);
+        using var cmd = conn.CreateCommand();
+        this.RepairCorruptedDatabaseImage(cmd);
+        this.LoadTableNames(cmd);
 
-          if (!tableNames.Contains("svl_1") && !tableNames.Contains("svl_2") && !tableNames.Contains("svl_3"))
-            throw new FileLoadException("File doesn't contain svl_* tables");
+        if (!tableNames.Contains("svl_1") && !tableNames.Contains("svl_2") && !tableNames.Contains("svl_3"))
+          throw new FileLoadException("File doesn't contain svl_* tables");
 
-          this.LoadSatelliteData(cmd);
-          this.LoadTslData(cmd);
-          this.LoadSvlData(cmd);
-          this.LoadFavorites(cmd);
-        }
+        this.LoadSatelliteData(cmd);
+        this.LoadTslData(cmd);
+        this.LoadSvlData(cmd);
+        this.LoadFavorites(cmd);
       }
 
       int totalCount = 0;
       foreach (var list in this.channelLists)
         totalCount += list.Count;
       if (totalCount == 0)
-        Api.View.Default.MessageBox(Resources.Load_NoChannelsMsg, Resources.Load_NoChannelsCaption);
+        View.Default.MessageBox(Resources.Load_NoChannelsMsg, Resources.Load_NoChannelsCaption);
     }
 
     #endregion
 
     #region RepairCorruptedDatabaseImage()
 
-    private void RepairCorruptedDatabaseImage(SQLiteCommand cmd)
+    private void RepairCorruptedDatabaseImage(SqliteCommand cmd)
     {
       cmd.CommandText = "REINDEX";
       cmd.ExecuteNonQuery();
@@ -184,22 +181,20 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
     #region LoadTableNames()
 
-    private void LoadTableNames(SQLiteCommand cmd)
+    private void LoadTableNames(SqliteCommand cmd)
     {
       this.tableNames = new List<string>();
       cmd.CommandText = "SELECT name FROM sqlite_master WHERE type = 'table' order by name";
-      using (var r = cmd.ExecuteReader())
-      {
-        while (r.Read())
-          tableNames.Add(r.GetString(0));
-      }
+      using var r = cmd.ExecuteReader();
+      while (r.Read())
+        tableNames.Add(r.GetString(0));
     }
 
     #endregion
 
     #region LoadSatelliteData()
 
-    private void LoadSatelliteData(SQLiteCommand cmd)
+    private void LoadSatelliteData(SqliteCommand cmd)
     {
       var regex = new Regex(@"^satl_\d$");
       foreach (var tableName in this.tableNames)
@@ -207,16 +202,14 @@ namespace ChanSort.Loader.Hisense.ChannelDb
         if (!regex.IsMatch(tableName))
           continue;
         cmd.CommandText = "select satl_rec_id, i2_orb_pos, ac_sat_name from " + tableName;
-        using (var r = cmd.ExecuteReader())
+        using var r = cmd.ExecuteReader();
+        while (r.Read())
         {
-          while (r.Read())
-          {
-            var sat = new Satellite(r.GetInt32(0));
-            var pos = r.GetInt32(1);
-            sat.OrbitalPosition = $"{(decimal) Math.Abs(pos) / 10:n1}{(pos < 0 ? 'W' : 'E')}";
-            sat.Name = r.GetString(2);
-            this.DataRoot.AddSatellite(sat);
-          }
+          var sat = new Satellite(r.GetInt32(0));
+          var pos = r.GetInt32(1);
+          sat.OrbitalPosition = $"{(decimal) Math.Abs(pos) / 10:n1}{(pos < 0 ? 'W' : 'E')}";
+          sat.Name = r.GetString(2);
+          this.DataRoot.AddSatellite(sat);
         }
       }
     }
@@ -225,7 +218,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
     #region LoadTslData()
 
-    private void LoadTslData(SQLiteCommand cmd)
+    private void LoadTslData(SqliteCommand cmd)
     {
       var regex = new Regex(@"^tsl_(\d)$");
       foreach (var table in this.tableNames)
@@ -273,8 +266,8 @@ namespace ChanSort.Loader.Hisense.ChannelDb
       }
     }
 
-    private void LoadTslData(SQLiteCommand cmd, int tableNr, string joinTable, string joinFields,
-      Action<Transponder, SQLiteDataReader, int> enhanceTransponderInfo)
+    private void LoadTslData(SqliteCommand cmd, int tableNr, string joinTable, string joinFields,
+      Action<Transponder, SqliteDataReader, int> enhanceTransponderInfo)
     {
       if (!this.tableNames.Contains(joinTable.Replace("#", tableNr.ToString())))
         return;
@@ -283,20 +276,20 @@ namespace ChanSort.Loader.Hisense.ChannelDb
         $"select tsl_#.tsl_rec_id, `t_desc.on_id`, `t_desc.ts_id`, `t_ref.satl_rec_id`, `t_desc.e_bcst_medium` {joinFields} "
         + $" from tsl_# inner join {joinTable} on {joinTable}.tsl_rec_id=tsl_#.tsl_rec_id";
       cmd.CommandText = cmd.CommandText.Replace("#", tableNr.ToString());
-      using (var r = cmd.ExecuteReader())
+      using var r = cmd.ExecuteReader();
+      while (r.Read())
       {
-        while (r.Read())
+        int id = (tableNr << 16) | r.GetInt32(0);
+        var trans = new Transponder(id)
         {
-          int id = (tableNr << 16) | r.GetInt32(0);
-          var trans = new Transponder(id);
-          trans.OriginalNetworkId = r.GetInt32(1);
-          trans.TransportStreamId = r.GetInt32(2);
-          trans.Satellite = this.DataRoot.Satellites.TryGet(r.GetInt32(3));
+          OriginalNetworkId = r.GetInt32(1), 
+          TransportStreamId = r.GetInt32(2), 
+          Satellite = this.DataRoot.Satellites.TryGet(r.GetInt32(3))
+        };
 
-          enhanceTransponderInfo(trans, r, 5);
+        enhanceTransponderInfo(trans, r, 5);
 
-          this.DataRoot.AddTransponder(trans.Satellite, trans);
-        }
+        this.DataRoot.AddTransponder(trans.Satellite, trans);
       }
     }
 
@@ -304,7 +297,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
     #region LoadSvlData()
 
-    private void LoadSvlData(SQLiteCommand cmd)
+    private void LoadSvlData(SqliteCommand cmd)
     {
       var regex = new Regex(@"^svl_(\d)$");
       foreach (var table in this.tableNames)
@@ -319,7 +312,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
           return;
         }
 
-        this.LoadSvlData(cmd, x, "svl_#_data_analog", "", (ci, r, i0) => { });
+        this.LoadSvlData(cmd, x, "svl_#_data_analog", "", (_, _, _) => { });
         this.LoadSvlData(cmd, x, "svl_#_data_dvb", ", b_free_ca_mode, s_svc_name, sdt_service_type, cur_lcn",
           (ci, r, i0) =>
           {
@@ -345,8 +338,8 @@ namespace ChanSort.Loader.Hisense.ChannelDb
       }
     }
 
-    private void LoadSvlData(SQLiteCommand cmd, int tableNr, string joinTable, string joinFields,
-      Action<ChannelInfo, SQLiteDataReader, int> enhanceChannelInfo)
+    private void LoadSvlData(SqliteCommand cmd, int tableNr, string joinTable, string joinFields,
+      Action<ChannelInfo, SqliteDataReader, int> enhanceChannelInfo)
     {
       if (!this.tableNames.Contains(joinTable.Replace("#", tableNr.ToString())))
         return;
@@ -355,57 +348,55 @@ namespace ChanSort.Loader.Hisense.ChannelDb
         $"select svl_#.svl_rec_id, channel_id, svl_#.tsl_id, svl_#.tsl_rec_id, e_serv_type, ac_name, nw_mask, prog_id, `t_desc.e_bcst_medium` {joinFields}"
         + $" from svl_# inner join {joinTable} on {joinTable}.svl_rec_id=svl_#.svl_rec_id inner join tsl_# on tsl_#.tsl_rec_id=svl_#.tsl_rec_id";
       cmd.CommandText = cmd.CommandText.Replace("#", tableNr.ToString());
-      using (var r = cmd.ExecuteReader())
+      using var r = cmd.ExecuteReader();
+      while (r.Read())
       {
-        while (r.Read())
+        var id = ((long) tableNr << 32) | (uint) r.GetInt32(0);
+        var prNr = (int) ((uint) r.GetInt32(1)) >> 18;
+        var trans = this.DataRoot.Transponder.TryGet((r.GetInt32(2) << 16) | r.GetInt32(3));
+        var stype = (ServiceType) r.GetInt32(4);
+        var name = r.GetString(5);
+        var nwMask = (NwMask) r.GetInt32(6);
+        var sid = r.GetInt32(7);
+        var bmedium = (BroadcastMedium) r.GetInt32(8);
+
+        var ssource = DetermineSignalSource(bmedium, stype);
+        var ci = new Channel(ssource, id, prNr, name);
+        if (trans != null)
         {
-          var id = ((long) tableNr << 32) | (uint) r.GetInt32(0);
-          var prNr = (int) ((uint) r.GetInt32(1)) >> 18;
-          var trans = this.DataRoot.Transponder.TryGet((r.GetInt32(2) << 16) | r.GetInt32(3));
-          var stype = (ServiceType) r.GetInt32(4);
-          var name = r.GetString(5);
-          var nwMask = (NwMask) r.GetInt32(6);
-          var sid = r.GetInt32(7);
-          var bmedium = (BroadcastMedium) r.GetInt32(8);
-
-          var ssource = DetermineSignalSource(bmedium, stype);
-          var ci = new Channel(ssource, id, prNr, name);
-          if (trans != null)
-          {
-            ci.Transponder = trans;
-            ci.OriginalNetworkId = trans.OriginalNetworkId;
-            ci.TransportStreamId = trans.TransportStreamId;
-            ci.SymbolRate = trans.SymbolRate;
-            ci.FreqInMhz = trans.FrequencyInMhz;
-            ci.Satellite = trans.Satellite?.ToString();
-          }
-
-          ci.ServiceId = sid;
-          ci.ChannelId = r.GetInt32(1);
-          ci.NwMask = (int)nwMask;
-
-          //ci.Skip = (nwMask & NwMask.Active) == 0;
-          ci.Lock = (nwMask & NwMask.Lock) != 0;
-          ci.Hidden = (nwMask & NwMask.Visible) == 0;
-          ci.Favorites |= (Favorites) ((int) (nwMask & (NwMask.Fav1 | NwMask.Fav2 | NwMask.Fav3 | NwMask.Fav4)) >> 4);
-
-          if (stype == ServiceType.Radio)
-            ci.ServiceTypeName = "Radio";
-          else if (stype == ServiceType.Tv)
-            ci.ServiceTypeName = "TV";
-          else if (stype == ServiceType.App)
-            ci.ServiceTypeName = "Data";
-
-          enhanceChannelInfo(ci, r, 9);
-
-          var list = this.channelLists[tableNr - 1];
-          ci.Source = list.ShortCaption;
-          this.DataRoot.AddChannel(list, ci);
-
-          // add the channel to all favorites lists
-          this.DataRoot.AddChannel(this.channelLists[6], ci);
-          this.channelsById[ci.RecordIndex] = ci;
+          ci.Transponder = trans;
+          ci.OriginalNetworkId = trans.OriginalNetworkId;
+          ci.TransportStreamId = trans.TransportStreamId;
+          ci.SymbolRate = trans.SymbolRate;
+          ci.FreqInMhz = trans.FrequencyInMhz;
+          ci.Satellite = trans.Satellite?.ToString();
         }
+
+        ci.ServiceId = sid;
+        ci.ChannelId = r.GetInt32(1);
+        ci.NwMask = (int)nwMask;
+
+        //ci.Skip = (nwMask & NwMask.Active) == 0;
+        ci.Lock = (nwMask & NwMask.Lock) != 0;
+        ci.Hidden = (nwMask & NwMask.Visible) == 0;
+        ci.Favorites |= (Favorites) ((int) (nwMask & (NwMask.Fav1 | NwMask.Fav2 | NwMask.Fav3 | NwMask.Fav4)) >> 4);
+
+        if (stype == ServiceType.Radio)
+          ci.ServiceTypeName = "Radio";
+        else if (stype == ServiceType.Tv)
+          ci.ServiceTypeName = "TV";
+        else if (stype == ServiceType.App)
+          ci.ServiceTypeName = "Data";
+
+        enhanceChannelInfo(ci, r, 9);
+
+        var list = this.channelLists[tableNr - 1];
+        ci.Source = list.ShortCaption;
+        this.DataRoot.AddChannel(list, ci);
+
+        // add the channel to all favorites lists
+        this.DataRoot.AddChannel(this.channelLists[6], ci);
+        this.channelsById[ci.RecordIndex] = ci;
       }
     }
 
@@ -413,7 +404,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
     #region LoadFavorites()
 
-    private void LoadFavorites(SQLiteCommand cmd)
+    private void LoadFavorites(SqliteCommand cmd)
     {
       // detect schema used by fav_x tables
       if (tableNames.Contains("fav_1"))
@@ -483,7 +474,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
       if (tvOutputFile != this.FileName)
         File.Copy(this.FileName, tvOutputFile, true);
 
-      using var conn = new SQLiteConnection("Data Source=" + tvOutputFile);
+      using var conn = new SqliteConnection("Data Source=" + tvOutputFile);
       conn.Open();
       using var trans = conn.BeginTransaction();
       using var cmd = conn.CreateCommand();
@@ -527,7 +518,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
     #region CreateFavTables()
 
-    private void CreateFavTables(SQLiteCommand cmd)
+    private void CreateFavTables(SqliteCommand cmd)
     {
       for (int i = 1; i <= 4; i++)
       {
@@ -546,7 +537,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
     #region ResetLcn()
 
-    private void ResetLcn(SQLiteCommand cmd)
+    private void ResetLcn(SqliteCommand cmd)
     {
       var regex = new Regex(@"^svl_\d_data_dvb$");
       foreach (var table in this.tableNames)
@@ -562,7 +553,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
     #region UpdateChannel()
 
-    private void UpdateChannel(SQLiteCommand cmd, Channel ci)
+    private void UpdateChannel(SqliteCommand cmd, Channel ci)
     {
       if (ci == null || ci.IsProxy)
         return;
@@ -583,10 +574,10 @@ namespace ChanSort.Loader.Hisense.ChannelDb
                         $", nw_mask=@nwMask" +
                         $" where svl_rec_id=@id";
       cmd.Parameters.Clear();
-      cmd.Parameters.Add("@id", DbType.Int32);
-      cmd.Parameters.Add("@chnr", DbType.Int32);
-      cmd.Parameters.Add("@name", DbType.String);
-      cmd.Parameters.Add("@nwMask", DbType.Int32);
+      cmd.Parameters.Add("@id", SqliteType.Integer);
+      cmd.Parameters.Add("@chnr", SqliteType.Integer);
+      cmd.Parameters.Add("@name", SqliteType.Text);
+      cmd.Parameters.Add("@nwMask", SqliteType.Integer);
       cmd.Parameters["@id"].Value = id;
       cmd.Parameters["@chnr"].Value = ci.NewProgramNr;
       cmd.Parameters["@name"].Value = ci.Name;
@@ -604,7 +595,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
     #endregion
 
     #region UpdateFavoritesWithUnderlinedColumnNames()
-    private void UpdateFavoritesWithUnderlinedColumnNames(SQLiteCommand cmd, ChannelInfo ci)
+    private void UpdateFavoritesWithUnderlinedColumnNames(SqliteCommand cmd, ChannelInfo ci)
     {
       for (int i = 0; i < 4; i++)
       {
@@ -617,10 +608,10 @@ namespace ChanSort.Loader.Hisense.ChannelDb
         {
           cmd.CommandText = $"update fav_{i + 1} set user_defined_ch_num=@chnr, user_defined_ch_name=@name where ui2_svc_id=@svcid and ui2_svc_rec_id=@recid";
           cmd.Parameters.Clear();
-          cmd.Parameters.Add("@chnr", DbType.String); // for some reason this is a VARCHAR in the database
-          cmd.Parameters.Add("@name", DbType.String);
-          cmd.Parameters.Add("@svcid", DbType.Int32);
-          cmd.Parameters.Add("@recid", DbType.Int32);
+          cmd.Parameters.Add("@chnr", SqliteType.Text); // for some reason this is a VARCHAR in the database
+          cmd.Parameters.Add("@name", SqliteType.Text);
+          cmd.Parameters.Add("@svcid", SqliteType.Integer);
+          cmd.Parameters.Add("@recid", SqliteType.Integer);
           cmd.Parameters["@chnr"].Value = ci.GetPosition(i+1).ToString();
           cmd.Parameters["@name"].Value = ci.Name;
           cmd.Parameters["@svcid"].Value = ci.RecordIndex >> 32;
@@ -636,7 +627,7 @@ namespace ChanSort.Loader.Hisense.ChannelDb
     #endregion
 
     #region UpdateFavoritesWithCamelCaseColumnNames()
-    private void UpdateFavoritesWithCamelCaseColumnNames(SQLiteCommand cmd, Channel ci)
+    private void UpdateFavoritesWithCamelCaseColumnNames(SqliteCommand cmd, Channel ci)
     {
       for (int i = 0; i < 4; i++)
       {
@@ -645,12 +636,12 @@ namespace ChanSort.Loader.Hisense.ChannelDb
 
         cmd.CommandText = $"insert into fav_{i + 1} (sortId, channelId, svlId, channelName, svlRecId, nwMask) values (@chnr,@chanid,@svcid,@name,@recid,@nwmask)";
         cmd.Parameters.Clear();
-        cmd.Parameters.Add("@chnr", DbType.Int32);
-        cmd.Parameters.Add("@chanid", DbType.Int32);
-        cmd.Parameters.Add("@svcid", DbType.Int32);
-        cmd.Parameters.Add("@name", DbType.String);
-        cmd.Parameters.Add("@recid", DbType.Int32);
-        cmd.Parameters.Add("@nwmask", DbType.Int32);
+        cmd.Parameters.Add("@chnr", SqliteType.Integer);
+        cmd.Parameters.Add("@chanid", SqliteType.Integer);
+        cmd.Parameters.Add("@svcid", SqliteType.Integer);
+        cmd.Parameters.Add("@name", SqliteType.Text);
+        cmd.Parameters.Add("@recid", SqliteType.Integer);
+        cmd.Parameters.Add("@nwmask", SqliteType.Integer);
         cmd.Parameters["@chnr"].Value = ci.GetPosition(i+1);
         cmd.Parameters["@chanid"].Value = ci.ChannelId;
         cmd.Parameters["@name"].Value = ci.Name;
diff --git a/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs b/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs
index dc5eb56..fad8ba7 100644
--- a/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs
+++ b/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs
@@ -2,15 +2,57 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Data.SQLite;
 using System.IO;
 using ChanSort.Api;
+using Microsoft.Data.Sqlite;
 
 namespace ChanSort.Loader.Hisense.ServicelistDb
 {
   public class ServicelistDbSerializer : SerializerBase
   {
+    /// <summary>
+    ///   Fields of the ChannelInfo that will be shown in the UI
+    /// </summary>
+    private static readonly List<string> ColumnNames = new()
+    {
+      "OldPosition",
+      "Position",
+      "Source",
+      "NewProgramNr",
+      "Name",
+      "ShortName",
+      "Favorites",
+      "Skip",
+      "Lock",
+      "Hidden",
+      "Encrypted",
+      "FreqInMhz",
+      "OriginalNetworkId",
+      "TransportStreamId",
+      "ServiceId",
+      //"ServiceType",
+      "ServiceTypeName",
+      "NetworkName",
+      "Satellite"
+//        "SymbolRate"
+    };
+
+    /// <summary>
+    ///   mapping of FavoriteList.Pid => ChannelList.
+    ///   This dict does not include real user favorite lists (FAV1-FAV4).
+    /// </summary>
+    private readonly Dictionary<int, ChannelList> channelLists = new();
+
+    /// <summary>
+    ///   mapping of Service.Pid => ChannelInfo
+    /// </summary>
+    private readonly Dictionary<long, ChannelInfo> channelsById = new();
+
+    /// <summary>
+    ///   mapping of FavoriteList.Pid for FAV1-4 => index of the internal favorite list within userFavList (0-3)
+    ///   Pids that don't belong to the FAV1-4 are not included in this dictionary.
+    /// </summary>
+    private readonly Dictionary<int, int> favListIdToFavIndex = new();
     /*
      * The 2017 Hisense / Loewe data model for channel lists is a bit different than all other supported models and need some workarounds to be supported.
      * It is based on a flat "Services" table which doesn't hold program numbers and a FavoritesList/FavoritesItem table to assign numbers
@@ -33,84 +75,25 @@ namespace ChanSort.Loader.Hisense.ServicelistDb
      */
 
     /// <summary>
-    /// list of all table names in the database
+    ///   list of all table names in the database
     /// </summary>
-    private readonly List<string> tableNames = new List<string>();
+    private readonly List<string> tableNames = new();
 
     /// <summary>
-    /// mapping of Service.Pid => ChannelInfo
+    ///   This list is filled with all channels/services and serves as a holder for favorite lists 1-4
     /// </summary>
-    private readonly Dictionary<long, ChannelInfo> channelsById = new Dictionary<long, ChannelInfo>();
+    private readonly ChannelList userFavList = new(0, "Favorites");
 
     /// <summary>
-    /// mapping of FavoriteList.Pid => ChannelList. 
-    /// This dict does not include real user favorite lists (FAV1-FAV4).
-    /// </summary>
-    private readonly Dictionary<int, ChannelList> channelLists = new Dictionary<int, ChannelList>();
-    
-    /// <summary>
-    /// This list is filled with all channels/services and serves as a holder for favorite lists 1-4
-    /// </summary>
-    private readonly ChannelList userFavList = new ChannelList(0, "Favorites");
-
-    /// <summary>
-    /// mapping of FavoriteList.Pid for FAV1-4 => index of the internal favorite list within userFavList (0-3)
-    /// Pids that don't belong to the FAV1-4 are not included in this dictionary.
-    /// </summary>
-    private readonly Dictionary<int,int> favListIdToFavIndex = new Dictionary<int, int>();
-
-    /// <summary>
-    /// FavoriteList.Pid of the $all list
+    ///   FavoriteList.Pid of the $all list
     /// </summary>
     private int pidAll;
 
     /// <summary>
-    /// FavoriteList.Pid of the $av list
+    ///   FavoriteList.Pid of the $av list
     /// </summary>
     private int pidAv;
 
-    /// <summary>
-    /// Fields of the ChannelInfo that will be shown in the UI
-    /// </summary>
-    private static readonly List<string> ColumnNames = new List<string>
-      {
-        "OldPosition",
-        "Position",
-        "Source",
-        "NewProgramNr",
-        "Name",
-        "ShortName",
-        "Favorites",
-        "Skip",
-        "Lock",
-        "Hidden",
-        "Encrypted",
-        "FreqInMhz",
-        "OriginalNetworkId",
-        "TransportStreamId",
-        "ServiceId",
-        //"ServiceType",
-        "ServiceTypeName",
-        "NetworkName",
-        "Satellite"
-//        "SymbolRate"
-      };
-
-    #region class HisTransponder
-    /// <summary>
-    /// This class holds information from the Tuner table
-    /// </summary>
-    public class HisTransponder : Transponder
-    {
-      public SignalSource SignalSource { get; set; }
-      public string Source { get; set; }
-
-      public HisTransponder(int id) : base(id)
-      {
-      }
-    }
-    #endregion
-
     #region ctor()
 
     public ServicelistDbSerializer(string inputFile) : base(inputFile)
@@ -132,7 +115,7 @@ namespace ChanSort.Loader.Hisense.ServicelistDb
 
     public override void Load()
     {
-      using (var conn = new SQLiteConnection("Data Source=" + FileName))
+      using (var conn = new SqliteConnection("Data Source=" + FileName))
       {
         conn.Open();
         using (var cmd = conn.CreateCommand())
@@ -152,14 +135,14 @@ namespace ChanSort.Loader.Hisense.ServicelistDb
       }
 
       if (channelsById.Count == 0)
-        Api.View.Default.MessageBox(Resources.Load_NoChannelsMsg, Resources.Load_NoChannelsCaption);
+        View.Default.MessageBox(Resources.Load_NoChannelsMsg, Resources.Load_NoChannelsCaption);
     }
 
     #endregion
 
     #region RepairCorruptedDatabaseImage()
 
-    private void RepairCorruptedDatabaseImage(SQLiteCommand cmd)
+    private void RepairCorruptedDatabaseImage(SqliteCommand cmd)
     {
       cmd.CommandText = "REINDEX";
       cmd.ExecuteNonQuery();
@@ -169,7 +152,7 @@ namespace ChanSort.Loader.Hisense.ServicelistDb
 
     #region LoadTableNames()
 
-    private void LoadTableNames(SQLiteCommand cmd)
+    private void LoadTableNames(SqliteCommand cmd)
     {
       cmd.CommandText = "SELECT name FROM sqlite_master WHERE type = 'table' order by name";
       using (var r = cmd.ExecuteReader())
@@ -182,20 +165,25 @@ namespace ChanSort.Loader.Hisense.ServicelistDb
     #endregion
 
     #region LoadLists()
-    private void LoadLists(SQLiteCommand cmd)
+
+    private void LoadLists(SqliteCommand cmd)
     {
       cmd.CommandText = "select Pid, Name from FavoriteList";
       using (var r = cmd.ExecuteReader())
       {
         while (r.Read())
         {
-          int listId = r.GetInt32(0);
-          string name = r.GetString(1);
+          var listId = r.GetInt32(0);
+          var name = r.GetString(1);
 
           if (name == "$all")
+          {
             pidAll = listId;
+          }
           else if (name == "$av")
+          {
             pidAv = listId;
+          }
           else if (name.StartsWith("FAV"))
           {
             // all real user favorite lists are using the "userFavList"
@@ -220,66 +208,12 @@ namespace ChanSort.Loader.Hisense.ServicelistDb
       channelLists.Add(0, userFavList);
       DataRoot.AddChannelList(userFavList);
     }
-    #endregion
-
-    #region LoadTunerData()
-
-    private void LoadTunerData(SQLiteCommand cmd)
-    {
-      List<Tuple<string,SignalSource,string>> inputs = new List<Tuple<string, SignalSource, string>>
-      {
-        Tuple.Create("C", SignalSource.DvbC, "symbolrate"),
-        Tuple.Create("C2", SignalSource.DvbC, "bandwidth"),
-        Tuple.Create("S", SignalSource.DvbS, "symbolrate"),
-        Tuple.Create("S2", SignalSource.DvbS, "symbolrate"),
-        Tuple.Create("T", SignalSource.DvbT, "bandwidth"),
-        Tuple.Create("T2", SignalSource.DvbT, "bandwidth"),
-      };
-
-      foreach (var input in inputs)
-      {
-        var table = input.Item1;
-        var symrate = input.Item3;
-        LoadTunerData(cmd, "DVB" + table + "Tuner", ", Frequency," + symrate, (t, r, i0) =>
-        {
-          t.Source = "DVB-" + input.Item1;
-          t.SignalSource = input.Item2;
-          t.FrequencyInMhz = (decimal) r.GetInt32(i0 + 0) / 1000;
-          t.SymbolRate = r.GetInt32(i0 + 1);
-        });
-      }
-    }
-
-    private void LoadTunerData(SQLiteCommand cmd, string joinTable, string joinFields, Action<HisTransponder, SQLiteDataReader, int> enhanceTransponderInfo)
-    {
-      if (!tableNames.Contains(joinTable.ToLower()))
-        return;
-
-      cmd.CommandText = $"select tuner.tunerid, oid, tid, satellite {joinFields} "
-                        + $" from tuner inner join {joinTable} on {joinTable}.tunerid=tuner.tunerid";
-
-      using (var r = cmd.ExecuteReader())
-      {
-        while (r.Read())
-        {
-          var id = r.GetInt32(0);
-          var trans = new HisTransponder(id);
-          trans.OriginalNetworkId = r.GetInt32(1);
-          trans.TransportStreamId = r.GetInt32(2);
-          trans.Satellite = DataRoot.Satellites.TryGet(r.GetInt32(3));
-
-          enhanceTransponderInfo(trans, r, 4);
-
-          DataRoot.AddTransponder(trans.Satellite, trans);
-        }
-      }
-    }
 
     #endregion
 
     #region LoadServiceData()
 
-    private void LoadServiceData(SQLiteCommand cmd)
+    private void LoadServiceData(SqliteCommand cmd)
     {
       cmd.CommandText = @"
 select s.pid, s.type, anls.Frequency, digs.TunerId, digs.Sid, Name, ShortName, Encrypted, Visible, Selectable, ParentalLock, MediaType
@@ -294,7 +228,9 @@ left outer join DVBService digs on digs.ServiceId=s.Pid
         {
           ChannelInfo ci = null;
           if (!r.IsDBNull(2)) // AnalogService
+          {
             ci = new ChannelInfo(SignalSource.Analog, r.GetInt32(0), -1, r.GetString(5));
+          }
           else if (!r.IsDBNull(3)) // DvbService
           {
             var trans = (HisTransponder) DataRoot.Transponder.TryGet(r.GetInt32(3));
@@ -322,7 +258,9 @@ left outer join DVBService digs on digs.ServiceId=s.Pid
               ci.ServiceTypeName = "Radio";
             }
             else
+            {
               ci.ServiceTypeName = mediaType.ToString();
+            }
           }
           else if (r.GetInt32(1) == 0) // A/V input
           {
@@ -335,11 +273,12 @@ left outer join DVBService digs on digs.ServiceId=s.Pid
         }
       }
     }
+
     #endregion
 
     #region LoadFavorites()
 
-    private void LoadFavorites(SQLiteCommand cmd)
+    private void LoadFavorites(SqliteCommand cmd)
     {
       cmd.CommandText = @"
 select fi.FavoriteId, fi.ServiceId, fi.ChannelNum, fi.Selectable, fi.Visible, fi.isDeleted, fi.Protected, l.Lcn 
@@ -350,14 +289,14 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.FavoriteId=fi.FavoriteId
       {
         while (r.Read())
         {
-          int favListId = r.GetInt32(0);
+          var favListId = r.GetInt32(0);
           var ci = channelsById.TryGet(r.GetInt32(1));
           if (ci == null)
             continue;
-          
-          int favListIdx = favListIdToFavIndex.TryGet(favListId, -1);
+
+          var favListIdx = favListIdToFavIndex.TryGet(favListId, -1);
           if (favListIdx >= 0)
-            ci.SetOldPosition(favListIdx+1, r.GetInt32(2));
+            ci.SetOldPosition(favListIdx + 1, r.GetInt32(2));
 
           ci.SetOldPosition(favListIdx + 1, r.GetInt32(2)); // 0=main nr, 1-4=fav 1-4
           if (favListIdx < 0)
@@ -388,9 +327,10 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.FavoriteId=fi.FavoriteId
         }
       }
 
-      foreach(var ci in channelsById.Values)
+      foreach (var ci in channelsById.Values)
         DataRoot.AddChannel(userFavList, ci);
     }
+
     #endregion
 
     // Saving ====================================
@@ -402,7 +342,7 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.FavoriteId=fi.FavoriteId
       if (tvOutputFile != FileName)
         File.Copy(FileName, tvOutputFile, true);
 
-      using (var conn = new SQLiteConnection("Data Source=" + tvOutputFile))
+      using (var conn = new SqliteConnection("Data Source=" + tvOutputFile))
       {
         conn.Open();
         using (var trans = conn.BeginTransaction())
@@ -429,11 +369,12 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.FavoriteId=fi.FavoriteId
         }
       }
     }
+
     #endregion
 
     #region ResetLcn()
 
-    private void ResetLcn(SQLiteCommand cmd)
+    private void ResetLcn(SqliteCommand cmd)
     {
       cmd.CommandText = "delete from Lcn where FavoriteId<>" + pidAv;
       cmd.ExecuteNonQuery();
@@ -442,20 +383,22 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.FavoriteId=fi.FavoriteId
     #endregion
 
     #region UpdateServices()
-    private void UpdateServices(SQLiteCommand cmd)
+
+    private void UpdateServices(SqliteCommand cmd)
     {
-      cmd.CommandText = "update Service set Name=@name, ShortName=@sname, ParentalLock=@lock, Visible=@vis, Selectable=@sel, FavTag=@fav1, FavTag2=@fav1, FavTag3=@fav3, FavTag4=@fav4 where Pid=@servId";
+      cmd.CommandText =
+        "update Service set Name=@name, ShortName=@sname, ParentalLock=@lock, Visible=@vis, Selectable=@sel, FavTag=@fav1, FavTag2=@fav1, FavTag3=@fav3, FavTag4=@fav4 where Pid=@servId";
       cmd.Parameters.Clear();
-      cmd.Parameters.Add("@servId", DbType.Int32);
-      cmd.Parameters.Add("@name", DbType.String);
-      cmd.Parameters.Add("@sname", DbType.String);
-      cmd.Parameters.Add("@lock", DbType.Int32);
-      cmd.Parameters.Add("@vis", DbType.Int32);
-      cmd.Parameters.Add("@sel", DbType.Int32);
-      cmd.Parameters.Add("@fav1", DbType.Int32);
-      cmd.Parameters.Add("@fav2", DbType.Int32);
-      cmd.Parameters.Add("@fav3", DbType.Int32);
-      cmd.Parameters.Add("@fav4", DbType.Int32);
+      cmd.Parameters.Add("@servId", SqliteType.Integer);
+      cmd.Parameters.Add("@name", SqliteType.Text);
+      cmd.Parameters.Add("@sname", SqliteType.Text);
+      cmd.Parameters.Add("@lock", SqliteType.Integer);
+      cmd.Parameters.Add("@vis", SqliteType.Integer);
+      cmd.Parameters.Add("@sel", SqliteType.Integer);
+      cmd.Parameters.Add("@fav1", SqliteType.Integer);
+      cmd.Parameters.Add("@fav2", SqliteType.Integer);
+      cmd.Parameters.Add("@fav3", SqliteType.Integer);
+      cmd.Parameters.Add("@fav4", SqliteType.Integer);
       cmd.Prepare();
 
       foreach (var ci in channelsById.Values)
@@ -473,20 +416,22 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.FavoriteId=fi.FavoriteId
         cmd.ExecuteNonQuery();
       }
     }
+
     #endregion
 
     #region UpdatePhysicalChannelLists()
-    private void UpdatePhysicalChannelLists(SQLiteCommand cmd)
+
+    private void UpdatePhysicalChannelLists(SqliteCommand cmd)
     {
       cmd.CommandText = "update FavoriteItem set ChannelNum=@ch, isDeleted=@del, Protected=@prot, Selectable=@sel, Visible=@vis where FavoriteId=@favId and ServiceId=@servId";
       cmd.Parameters.Clear();
-      cmd.Parameters.Add("@favId", DbType.Int32);
-      cmd.Parameters.Add("@servId", DbType.Int32);
-      cmd.Parameters.Add("@ch", DbType.Int32);
-      cmd.Parameters.Add("@del", DbType.Int32);
-      cmd.Parameters.Add("@prot", DbType.Int32);
-      cmd.Parameters.Add("@sel", DbType.Int32);
-      cmd.Parameters.Add("@vis", DbType.Int32);
+      cmd.Parameters.Add("@favId", SqliteType.Integer);
+      cmd.Parameters.Add("@servId", SqliteType.Integer);
+      cmd.Parameters.Add("@ch", SqliteType.Integer);
+      cmd.Parameters.Add("@del", SqliteType.Integer);
+      cmd.Parameters.Add("@prot", SqliteType.Integer);
+      cmd.Parameters.Add("@sel", SqliteType.Integer);
+      cmd.Parameters.Add("@vis", SqliteType.Integer);
       cmd.Prepare();
 
       foreach (var entry in channelLists)
@@ -524,10 +469,12 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.FavoriteId=fi.FavoriteId
         }
       }
     }
+
     #endregion
 
     #region UpdateUserFavoriteLists()
-    private void UpdateUserFavoriteLists(SQLiteCommand cmd)
+
+    private void UpdateUserFavoriteLists(SqliteCommand cmd)
     {
       // delete all FavoriteItem records that belong to the FAV1-4 lists
       cmd.Parameters.Clear();
@@ -536,9 +483,9 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.FavoriteId=fi.FavoriteId
 
       // (re-)insert the user's new favorites
       cmd.CommandText = "insert into FavoriteItem (FavoriteId, ServiceId, ChannelNum) values (@favId, @servId, @ch)";
-      cmd.Parameters.Add("@favId", DbType.Int32);
-      cmd.Parameters.Add("@servId", DbType.Int32);
-      cmd.Parameters.Add("@ch", DbType.Int32);
+      cmd.Parameters.Add("@favId", SqliteType.Integer);
+      cmd.Parameters.Add("@servId", SqliteType.Integer);
+      cmd.Parameters.Add("@ch", SqliteType.Integer);
       foreach (var entry in favListIdToFavIndex)
       {
         var favIndex = entry.Value;
@@ -561,5 +508,76 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.FavoriteId=fi.FavoriteId
 
     #endregion
 
+    #region class HisTransponder
+
+    /// <summary>
+    ///   This class holds information from the Tuner table
+    /// </summary>
+    public class HisTransponder : Transponder
+    {
+      public HisTransponder(int id) : base(id)
+      {
+      }
+
+      public SignalSource SignalSource { get; set; }
+      public string Source { get; set; }
+    }
+
+    #endregion
+
+    #region LoadTunerData()
+
+    private void LoadTunerData(SqliteCommand cmd)
+    {
+      var inputs = new List<Tuple<string, SignalSource, string>>
+      {
+        Tuple.Create("C", SignalSource.DvbC, "symbolrate"),
+        Tuple.Create("C2", SignalSource.DvbC, "bandwidth"),
+        Tuple.Create("S", SignalSource.DvbS, "symbolrate"),
+        Tuple.Create("S2", SignalSource.DvbS, "symbolrate"),
+        Tuple.Create("T", SignalSource.DvbT, "bandwidth"),
+        Tuple.Create("T2", SignalSource.DvbT, "bandwidth")
+      };
+
+      foreach (var input in inputs)
+      {
+        var table = input.Item1;
+        var symrate = input.Item3;
+        LoadTunerData(cmd, "DVB" + table + "Tuner", ", Frequency," + symrate, (t, r, i0) =>
+        {
+          t.Source = "DVB-" + input.Item1;
+          t.SignalSource = input.Item2;
+          t.FrequencyInMhz = (decimal) r.GetInt32(i0 + 0) / 1000;
+          t.SymbolRate = r.GetInt32(i0 + 1);
+        });
+      }
+    }
+
+    private void LoadTunerData(SqliteCommand cmd, string joinTable, string joinFields, Action<HisTransponder, SqliteDataReader, int> enhanceTransponderInfo)
+    {
+      if (!tableNames.Contains(joinTable.ToLower()))
+        return;
+
+      cmd.CommandText = $"select tuner.tunerid, oid, tid, satellite {joinFields} "
+                        + $" from tuner inner join {joinTable} on {joinTable}.tunerid=tuner.tunerid";
+
+      using (var r = cmd.ExecuteReader())
+      {
+        while (r.Read())
+        {
+          var id = r.GetInt32(0);
+          var trans = new HisTransponder(id);
+          trans.OriginalNetworkId = r.GetInt32(1);
+          trans.TransportStreamId = r.GetInt32(2);
+          trans.Satellite = DataRoot.Satellites.TryGet(r.GetInt32(3));
+
+          enhanceTransponderInfo(trans, r, 4);
+
+          DataRoot.AddTransponder(trans.Satellite, trans);
+        }
+      }
+    }
+
+    #endregion
   }
 }
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Hisense/app.config b/source/ChanSort.Loader.Hisense/app.config
new file mode 100644
index 0000000..f10b4ac
--- /dev/null
+++ b/source/ChanSort.Loader.Hisense/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Hisense/packages.config b/source/ChanSort.Loader.Hisense/packages.config
new file mode 100644
index 0000000..2c03806
--- /dev/null
+++ b/source/ChanSort.Loader.Hisense/packages.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Data.Sqlite" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="5.0.5" targetFramework="net48" />
+  <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.4" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj b/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj
index aa25a9e..4a87a2d 100644
--- a/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj
+++ b/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj
@@ -68,8 +68,8 @@
     <Reference Include="DevExpress.Data.Desktop.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Utils.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/source/ChanSort.Loader.LG/packages.config b/source/ChanSort.Loader.LG/packages.config
index 281c145..bc2a97e 100644
--- a/source/ChanSort.Loader.LG/packages.config
+++ b/source/ChanSort.Loader.LG/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj b/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj
index 59b0e41..3a3ade8 100644
--- a/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj
+++ b/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj
@@ -14,6 +14,8 @@
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,11 +56,35 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\DLL\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -79,7 +105,18 @@
       <Name>ChanSort.Api</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/ChanSort.Loader.Panasonic/DbChannel.cs b/source/ChanSort.Loader.Panasonic/DbChannel.cs
index 379d61f..c5a96d3 100644
--- a/source/ChanSort.Loader.Panasonic/DbChannel.cs
+++ b/source/ChanSort.Loader.Panasonic/DbChannel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SQLite;
 using System.Text;
+using System.Data;
 using ChanSort.Api;
 
 namespace ChanSort.Loader.Panasonic
@@ -13,7 +13,7 @@ namespace ChanSort.Loader.Panasonic
     internal bool ValidUtf8 = true;
 
     #region ctor()
-    internal DbChannel(SQLiteDataReader r, IDictionary<string, int> field, DataRoot dataRoot, Encoding encoding)
+    internal DbChannel(IDataReader r, IDictionary<string, int> field, DataRoot dataRoot, Encoding encoding)
     {
       this.RecordIndex = r.GetInt32(field["rowid"]);
       this.RecordOrder = r.GetInt32(field["major_channel"]);
@@ -61,7 +61,7 @@ namespace ChanSort.Loader.Panasonic
     #endregion
 
     #region ParseFavorites
-    private void ParseFavorites(SQLiteDataReader r, IDictionary<string, int> field)
+    private void ParseFavorites(IDataReader r, IDictionary<string, int> field)
     {
       for (int i = 0; i < 4; i++)
       {
@@ -76,7 +76,7 @@ namespace ChanSort.Loader.Panasonic
     #endregion
 
     #region ReadAnalogData()
-    private void ReadAnalogData(SQLiteDataReader r, IDictionary<string, int> field)
+    private void ReadAnalogData(IDataReader r, IDictionary<string, int> field)
     {
       this.FreqInMhz = r.IsDBNull(field["freq"]) ? 0 : (decimal)r.GetInt32(field["freq"]) / 1000;
       this.ChannelOrTransponder = Tools.GetAnalogChannelNumber((int)this.FreqInMhz);
@@ -84,7 +84,7 @@ namespace ChanSort.Loader.Panasonic
     #endregion
 
     #region ReadDvbData()
-    protected void ReadDvbData(SQLiteDataReader r, IDictionary<string, int> field, DataRoot dataRoot, byte[] delivery)
+    protected void ReadDvbData(IDataReader r, IDictionary<string, int> field, DataRoot dataRoot, byte[] delivery)
     {
       int stype = r.GetInt32(field["stype"]);
       this.SignalSource |= LookupData.Instance.IsRadioTvOrData(stype);
@@ -129,7 +129,7 @@ namespace ChanSort.Loader.Panasonic
     /// <summary>
     /// Character encoding is a mess here. Code pages mixed with UTF-8 and raw data
     /// </summary>
-    private void ReadNamesWithEncodingDetection(SQLiteDataReader r, IDictionary<string, int> field, Encoding encoding)
+    private void ReadNamesWithEncodingDetection(IDataReader r, IDictionary<string, int> field, Encoding encoding)
     {
       byte[] buffer = new byte[100];
       int len = (int)r.GetBytes(field["sname"], 0, buffer, 0, buffer.Length);
diff --git a/source/ChanSort.Loader.Panasonic/Serializer.cs b/source/ChanSort.Loader.Panasonic/Serializer.cs
index 0462873..7710131 100644
--- a/source/ChanSort.Loader.Panasonic/Serializer.cs
+++ b/source/ChanSort.Loader.Panasonic/Serializer.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SQLite;
 using System.IO;
 using System.Text;
+using Microsoft.Data.Sqlite;
 using ChanSort.Api;
 
 namespace ChanSort.Loader.Panasonic
@@ -76,7 +76,7 @@ namespace ChanSort.Loader.Panasonic
       this.CreateDummySatellites();
 
       string channelConnString = "Data Source=" + this.workFile;
-      using (var conn = new SQLiteConnection(channelConnString))
+      using (var conn = new SqliteConnection(channelConnString))
       {
         conn.Open();
         using (var cmd = conn.CreateCommand())
@@ -219,7 +219,7 @@ namespace ChanSort.Loader.Panasonic
     #endregion
 
     #region InitCharacterEncoding()
-    private void InitCharacterEncoding(SQLiteCommand cmd)
+    private void InitCharacterEncoding(SqliteCommand cmd)
     {
       cmd.CommandText = "PRAGMA encoding";
       this.charEncoding = cmd.ExecuteScalar() as string;
@@ -227,7 +227,7 @@ namespace ChanSort.Loader.Panasonic
     #endregion
 
     #region RepairCorruptedDatabaseImage()
-    private void RepairCorruptedDatabaseImage(SQLiteCommand cmd)
+    private void RepairCorruptedDatabaseImage(SqliteCommand cmd)
     {
       cmd.CommandText = "REINDEX";
       cmd.ExecuteNonQuery();
@@ -235,7 +235,7 @@ namespace ChanSort.Loader.Panasonic
     #endregion
 
     #region ReadChannels()
-    private void ReadChannels(SQLiteCommand cmd)
+    private void ReadChannels(SqliteCommand cmd)
     {
       string[] fieldNames = { "rowid", "major_channel", "physical_ch","sname", "freq", "skip", "running_status","free_CA_mode","child_lock",
                             "profile1index","profile2index","profile3index","profile4index","stype", "onid", "tsid", "sid", "ntype", "ya_svcid", "delivery" };
@@ -307,13 +307,14 @@ order by s.ntype,major_channel
       this.FileName = tvOutputFile;
 
       string channelConnString = "Data Source=" + this.workFile;
-      using (var conn = new SQLiteConnection(channelConnString))
+      using (var conn = new SqliteConnection(channelConnString))
       {
         conn.Open();
         using (var cmd = conn.CreateCommand())
         {
           using (var trans = conn.BeginTransaction())
           {
+            cmd.Transaction = trans;
             this.WriteChannels(cmd, this.avbtChannels);
             this.WriteChannels(cmd, this.avbcChannels);
             this.WriteChannels(cmd, this.dvbtChannels);
@@ -323,6 +324,8 @@ order by s.ntype,major_channel
             this.WriteChannels(cmd, this.freesatChannels);
             trans.Commit();
           }
+
+          cmd.Transaction = null;
           this.RepairCorruptedDatabaseImage(cmd);
         }
       }
@@ -332,19 +335,19 @@ order by s.ntype,major_channel
     #endregion
 
     #region WriteChannels()
-    private void WriteChannels(SQLiteCommand cmd, ChannelList channelList)
+    private void WriteChannels(SqliteCommand cmd, ChannelList channelList)
     {
       cmd.CommandText = "update SVL set major_channel=@progNr, sname=@sname, profile1index=@fav1, profile2index=@fav2, profile3index=@fav3, profile4index=@fav4, child_lock=@lock, skip=@skip where rowid=@rowid";
       cmd.Parameters.Clear();
-      cmd.Parameters.Add(new SQLiteParameter("@rowid", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@progNr", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@sname", DbType.Binary));
-      cmd.Parameters.Add(new SQLiteParameter("@fav1", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@fav2", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@fav3", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@fav4", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@lock", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@skip", DbType.Int32));
+      cmd.Parameters.Add("@rowid", SqliteType.Integer);
+      cmd.Parameters.Add("@progNr", SqliteType.Integer);
+      cmd.Parameters.Add("@sname", SqliteType.Blob);
+      cmd.Parameters.Add("@fav1", SqliteType.Integer);
+      cmd.Parameters.Add("@fav2", SqliteType.Integer);
+      cmd.Parameters.Add("@fav3", SqliteType.Integer);
+      cmd.Parameters.Add("@fav4", SqliteType.Integer);
+      cmd.Parameters.Add("@lock", SqliteType.Integer);
+      cmd.Parameters.Add("@skip", SqliteType.Integer);
       cmd.Prepare();
       foreach (ChannelInfo channelInfo in channelList.Channels)
       {
@@ -367,7 +370,7 @@ order by s.ntype,major_channel
       // delete unassigned channels
       cmd.CommandText = "delete from SVL where rowid=@rowid";
       cmd.Parameters.Clear();
-      cmd.Parameters.Add(new SQLiteParameter("@rowid", DbType.Int32));
+      cmd.Parameters.Add(new SqliteParameter("@rowid", DbType.Int32));
       foreach (ChannelInfo channel in channelList.Channels)
       {
         if (channel.IsDeleted && channel.OldProgramNr >= 0)
diff --git a/source/ChanSort.Loader.Panasonic/app.config b/source/ChanSort.Loader.Panasonic/app.config
new file mode 100644
index 0000000..f10b4ac
--- /dev/null
+++ b/source/ChanSort.Loader.Panasonic/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Panasonic/packages.config b/source/ChanSort.Loader.Panasonic/packages.config
new file mode 100644
index 0000000..2c03806
--- /dev/null
+++ b/source/ChanSort.Loader.Panasonic/packages.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Data.Sqlite" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="5.0.5" targetFramework="net48" />
+  <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.4" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Philips/BinarySerializer.cs b/source/ChanSort.Loader.Philips/BinarySerializer.cs
index f08a7a6..040d4f3 100644
--- a/source/ChanSort.Loader.Philips/BinarySerializer.cs
+++ b/source/ChanSort.Loader.Philips/BinarySerializer.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Data.SQLite;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using Microsoft.Data.Sqlite;
 using ChanSort.Api;
 
 namespace ChanSort.Loader.Philips
@@ -600,7 +599,7 @@ namespace ChanSort.Loader.Philips
         return;
       this.dataFilePaths.Add(dbPath);
       
-      using var conn = new SQLiteConnection($"Data Source={dbPath}");
+      using var conn = new SqliteConnection($"Data Source={dbPath}");
       conn.Open();
       using var cmd = conn.CreateCommand();
 
@@ -672,7 +671,7 @@ namespace ChanSort.Loader.Philips
         }
       }
 
-      using var conn = new SQLiteConnection($"Data Source={tvDb}");
+      using var conn = new SqliteConnection($"Data Source={tvDb}");
       conn.Open();
       using var cmd = conn.CreateCommand();
       cmd.CommandText = "select _id, display_number, display_name, original_network_id, transport_stream_id, service_id, service_type from channels";
@@ -693,7 +692,7 @@ namespace ChanSort.Loader.Philips
         }
 
         if (ch.OldProgramNr != nr)
-          this.logMessages.AppendLine($"channel with id {id}: prNum {ch.OldProgramNr} in bin file and {r.GetInt32(1)} in tv.db");
+          this.logMessages.AppendLine($"channel with id {id}: prNum {ch.OldProgramNr} in bin file and {r.GetString(1)} in tv.db");
         if (ch.Name != r.GetString(2))
           this.logMessages.AppendLine($"channel with id {id}: Name {ch.Name} in bin file and {r.GetString(2)} in tv.db");
         if (ch.OriginalNetworkId != r.GetInt32(3))
@@ -732,7 +731,7 @@ namespace ChanSort.Loader.Philips
       this.Features.FavoritesMode = FavoritesMode.OrderedPerSource;
       this.Features.MaxFavoriteLists = 4;
 
-      using var conn = new SQLiteConnection($"Data Source={listDb}");
+      using var conn = new SqliteConnection($"Data Source={listDb}");
       conn.Open();
       using var cmd = conn.CreateCommand();
 
@@ -790,7 +789,7 @@ namespace ChanSort.Loader.Philips
       this.Features.MaxFavoriteLists = 8;
       this.Features.AllowGapsInFavNumbers = false;
 
-      using var conn = new SQLiteConnection($"Data Source={listDb}");
+      using var conn = new SqliteConnection($"Data Source={listDb}");
       conn.Open();
 
       // older versions of ChanSort wrote invalid "list_id" values starting at 0 instead of 1 and going past 8.
@@ -1098,7 +1097,7 @@ namespace ChanSort.Loader.Philips
       if (!File.Exists(dbPath))
         return;
 
-      using var conn = new SQLiteConnection($"Data Source={dbPath}");
+      using var conn = new SqliteConnection($"Data Source={dbPath}");
       conn.Open();
       using var trans = conn.BeginTransaction();
       using var cmd = conn.CreateCommand();
@@ -1112,8 +1111,8 @@ namespace ChanSort.Loader.Philips
           continue;
 
         cmd.CommandText = $"update {table} set PresetNumber = @prNum where Dbindex = @dbindex";
-        cmd.Parameters.Add("@prNum", DbType.String);
-        cmd.Parameters.Add("@dbindex", DbType.Int32);
+        cmd.Parameters.Add("@prNum", SqliteType.Text);
+        cmd.Parameters.Add("@dbindex", SqliteType.Integer);
         foreach(var channel in list.Channels)
         {
           if (!(channel is Channel ch) || ch.Map30ChannelMapsDbindex < 0)
@@ -1137,17 +1136,17 @@ namespace ChanSort.Loader.Philips
       if (!File.Exists(tvDb))
         return;
 
-      using var conn = new SQLiteConnection($"Data Source={tvDb}");
+      using var conn = new SqliteConnection($"Data Source={tvDb}");
       conn.Open();
       using var trans = conn.BeginTransaction();
       using var cmd = conn.CreateCommand();
       cmd.CommandText = "update channels set display_number=@prNum, display_name=@name, browsable=@browsable, locked=@locked where _id=@id";
       cmd.Parameters.Clear();
-      cmd.Parameters.Add(new SQLiteParameter("@id", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@prNum", DbType.String));
-      cmd.Parameters.Add(new SQLiteParameter("@name", DbType.String));
-      cmd.Parameters.Add(new SQLiteParameter("@browsable", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@locked", DbType.Int32));
+      cmd.Parameters.Add("@id", SqliteType.Integer);
+      cmd.Parameters.Add("@prNum", SqliteType.Text);
+      cmd.Parameters.Add("@name", SqliteType.Text);
+      cmd.Parameters.Add("@browsable", SqliteType.Integer);
+      cmd.Parameters.Add("@locked", SqliteType.Integer);
       cmd.Prepare();
       foreach (var list in this.DataRoot.ChannelLists)
       {
@@ -1178,7 +1177,7 @@ namespace ChanSort.Loader.Philips
       if (!File.Exists(listDb) || this.channelsById.Count == 0)
         return;
 
-      using var conn = new SQLiteConnection($"Data Source={listDb}");
+      using var conn = new SqliteConnection($"Data Source={listDb}");
       conn.Open();
       using var cmd = conn.CreateCommand();
       using var trans = conn.BeginTransaction();
@@ -1198,8 +1197,8 @@ namespace ChanSort.Loader.Philips
 
         var list = listIdx < 4 ? this.antChannels : listIdx < 8 ? this.cabChannels : this.satChannels;
         cmd.CommandText = "update List set list_name=@name" + incFavList + " where list_id=@listId";
-        cmd.Parameters.Add("@listId", DbType.Int32);
-        cmd.Parameters.Add("@name", DbType.String);
+        cmd.Parameters.Add("@listId", SqliteType.Integer);
+        cmd.Parameters.Add("@name", SqliteType.Text);
         cmd.Parameters["@listId"].Value = listIdx + 1;
         cmd.Parameters["@name"].Value = list.GetFavListCaption(listIdx % 4, false);
         cmd.ExecuteNonQuery();
@@ -1210,9 +1209,9 @@ namespace ChanSort.Loader.Philips
         cmd.ExecuteNonQuery();
 
         cmd.CommandText = $"insert into {table} (_id, channel_id, rank) values (@id, @channelId, @rank)";
-        cmd.Parameters.Add("@id", DbType.Int32);
-        cmd.Parameters.Add("@channelId", DbType.Int32);
-        cmd.Parameters.Add("@rank", DbType.Int32);
+        cmd.Parameters.Add("@id", SqliteType.Integer);
+        cmd.Parameters.Add("@channelId", SqliteType.Integer);
+        cmd.Parameters.Add("@rank", SqliteType.Integer);
 
         int order = 0;
         foreach (var channel in list.Channels)
@@ -1242,7 +1241,7 @@ namespace ChanSort.Loader.Philips
       if (!File.Exists(listDb))
         return;
 
-      using var conn = new SQLiteConnection($"Data Source={listDb}");
+      using var conn = new SqliteConnection($"Data Source={listDb}");
       conn.Open();
       using var trans = conn.BeginTransaction();
       using var cmd = conn.CreateCommand();
@@ -1266,17 +1265,17 @@ namespace ChanSort.Loader.Philips
           "insert into List (list_id, list_name, list_version) values (@id,@name,1)" : 
           "update List set list_name=@name" + incFavList + " where list_id=@id";
 
-        cmd.Parameters.Add(new SQLiteParameter("@id", DbType.Int16));
-        cmd.Parameters.Add(new SQLiteParameter("@name", DbType.String));
+        cmd.Parameters.Add("@id", SqliteType.Integer);
+        cmd.Parameters.Add("@name", SqliteType.Text);
         cmd.Parameters["@id"].Value = favListId;
         cmd.Parameters["@name"].Value = this.favChannels.GetFavListCaption(favListIndex) ?? "Fav " + (favListIndex + 1);
         cmd.ExecuteNonQuery();
 
         cmd.CommandText = "insert into FavoriteChannels(fav_list_id, channel_id, rank) values (@listId,@channelId,@rank)";
         cmd.Parameters.Clear();
-        cmd.Parameters.Add(new SQLiteParameter("@listId", DbType.Int32));
-        cmd.Parameters.Add(new SQLiteParameter("@channelId", DbType.Int32));
-        cmd.Parameters.Add(new SQLiteParameter("@rank", DbType.Double));
+        cmd.Parameters.Add("@listId", SqliteType.Integer);
+        cmd.Parameters.Add("@channelId", SqliteType.Integer);
+        cmd.Parameters.Add("@rank", SqliteType.Real);
         cmd.Prepare();
         foreach (var chan in favChannels.Channels)
         {
diff --git a/source/ChanSort.Loader.Philips/ChanLstBin.cs b/source/ChanSort.Loader.Philips/ChanLstBin.cs
index 2c2b988..927f48f 100644
--- a/source/ChanSort.Loader.Philips/ChanLstBin.cs
+++ b/source/ChanSort.Loader.Philips/ChanLstBin.cs
@@ -103,7 +103,7 @@ namespace ChanSort.Loader.Philips
         var filePath = baseDir + entry.Key;
         if (!File.Exists(filePath))
         {
-          errors += $"\nchanLst.bin: file not found in directory structure: {entry.Key}";
+          this.log?.Invoke($"\nchanLst.bin: file not found in directory structure: {entry.Key}");
           continue;
         }
 
diff --git a/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.csproj b/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.csproj
index d7c7333..289256e 100644
--- a/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.csproj
+++ b/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.csproj
@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,10 +56,35 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite">
-      <HintPath>..\DLL\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -86,9 +113,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="ChanSort.Loader.Philips.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.cs.resx" />
@@ -104,4 +133,11 @@
     <EmbeddedResource Include="Resources.tr.resx" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Philips/XmlSerializer.cs b/source/ChanSort.Loader.Philips/XmlSerializer.cs
index 357e42c..a413109 100644
--- a/source/ChanSort.Loader.Philips/XmlSerializer.cs
+++ b/source/ChanSort.Loader.Philips/XmlSerializer.cs
@@ -201,7 +201,14 @@ namespace ChanSort.Loader.Philips
         fileData.content = File.ReadAllBytes(fileName);
         fileData.textContent = Encoding.UTF8.GetString(fileData.content);
         fileData.newline = fileData.textContent.Contains("\r\n") ? "\r\n" : "\n";
-        fileData.indent = fileData.textContent.Contains("  <") ? "  " : "";
+
+        // indentation can be 0, 2 or 4 spaces
+        var idx1 = fileData.textContent.IndexOf("<Channel>");
+        var idx0 = fileData.textContent.LastIndexOf("\n", idx1+1);
+        if (idx0 >= 0 && idx1 >= 0)
+          fileData.indent = fileData.textContent.Substring(idx0 + 1, idx1 - idx0 - 1);
+        else
+          fileData.indent = fileData.textContent.Contains("  <") ? "  " : "";
 
         var settings = new XmlReaderSettings
         {
diff --git a/source/ChanSort.Loader.Philips/app.config b/source/ChanSort.Loader.Philips/app.config
new file mode 100644
index 0000000..f10b4ac
--- /dev/null
+++ b/source/ChanSort.Loader.Philips/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Philips/packages.config b/source/ChanSort.Loader.Philips/packages.config
new file mode 100644
index 0000000..2c03806
--- /dev/null
+++ b/source/ChanSort.Loader.Philips/packages.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Data.Sqlite" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="5.0.5" targetFramework="net48" />
+  <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.4" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj b/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj
index 828677b..1b94d08 100644
--- a/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj
+++ b/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj
@@ -14,6 +14,8 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,12 +68,37 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite">
-      <HintPath>..\DLL\System.Data.SQLite.dll</HintPath>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
     </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -95,12 +122,21 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="ChanSort.Loader.Samsung.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/ChanSort.Loader.Samsung/Zip/DbChannel.cs b/source/ChanSort.Loader.Samsung/Zip/DbChannel.cs
index 97bf4c3..5bfc70f 100644
--- a/source/ChanSort.Loader.Samsung/Zip/DbChannel.cs
+++ b/source/ChanSort.Loader.Samsung/Zip/DbChannel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.SQLite;
+using System.Data;
 using ChanSort.Api;
 
 namespace ChanSort.Loader.Samsung.Zip
@@ -7,7 +7,7 @@ namespace ChanSort.Loader.Samsung.Zip
   internal class DbChannel : ChannelInfo
   {
     #region ctor()
-    internal DbChannel(SQLiteDataReader r, IDictionary<string, int> field, DbSerializer loader, Dictionary<long, string> providers, Satellite sat, Transponder tp)
+    internal DbChannel(IDataReader r, IDictionary<string, int> field, DbSerializer loader, Dictionary<long, string> providers, Satellite sat, Transponder tp)
     {
       var chType = r.GetInt32(field["chType"]);
       this.SignalSource = DbSerializer.ChTypeToSignalSource(chType);
@@ -49,14 +49,14 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region ReadAnalogData()
-    private void ReadAnalogData(SQLiteDataReader r, IDictionary<string, int> field)
+    private void ReadAnalogData(IDataReader r, IDictionary<string, int> field)
     {
       
     }
     #endregion
 
     #region ReadDvbData()
-    protected void ReadDvbData(SQLiteDataReader r, IDictionary<string, int> field, DbSerializer loader, Dictionary<long, string> providers)
+    protected void ReadDvbData(IDataReader r, IDictionary<string, int> field, DbSerializer loader, Dictionary<long, string> providers)
     {
       this.ShortName = loader.ReadUtf16(r, field["srvName"]);
       this.RecordOrder = r.GetInt32(field["major"]);
diff --git a/source/ChanSort.Loader.Samsung/Zip/DbSerializer.cs b/source/ChanSort.Loader.Samsung/Zip/DbSerializer.cs
index f5f61d5..27c2de6 100644
--- a/source/ChanSort.Loader.Samsung/Zip/DbSerializer.cs
+++ b/source/ChanSort.Loader.Samsung/Zip/DbSerializer.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SQLite;
 using System.IO;
 using System.Linq;
 using System.Text;
+using Microsoft.Data.Sqlite;
 using ChanSort.Api;
 
 namespace ChanSort.Loader.Samsung.Zip
@@ -48,7 +48,7 @@ namespace ChanSort.Loader.Samsung.Zip
         {
           try
           {
-            using (var conn = new SQLiteConnection("Data Source=" + this.TempPath + "\\sat"))
+            using (var conn = new SqliteConnection("Data Source=" + this.TempPath + "\\sat"))
             {
               conn.Open();
               this.ReadSatDatabase(conn);
@@ -70,7 +70,7 @@ namespace ChanSort.Loader.Samsung.Zip
             continue;
           try
           {
-            using (var conn = new SQLiteConnection("Data Source=" + filePath))
+            using (var conn = new SqliteConnection("Data Source=" + filePath))
             {
               FileType type;
               conn.Open();
@@ -100,7 +100,7 @@ namespace ChanSort.Loader.Samsung.Zip
       finally
       {
         // force closing the file and releasing the locks
-        SQLiteConnection.ClearAllPools(); 
+        //SqliteConnection.ClearAllPools(); 
         GC.Collect();
         GC.WaitForPendingFinalizers();
       }
@@ -108,7 +108,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region RepairCorruptedDatabaseImage()
-    private void RepairCorruptedDatabaseImage(SQLiteCommand cmd)
+    private void RepairCorruptedDatabaseImage(IDbCommand cmd)
     {
       cmd.CommandText = "REINDEX";
       cmd.ExecuteNonQuery();
@@ -116,7 +116,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region DetectFileType()
-    private FileType DetectFileType(SQLiteCommand cmd)
+    private FileType DetectFileType(IDbCommand cmd)
     {
       this.tableNames.Clear();
       cmd.CommandText = "select name from sqlite_master where type='table'";
@@ -141,7 +141,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region ReadSatDatabase()
-    private void ReadSatDatabase(SQLiteConnection conn)
+    private void ReadSatDatabase(SqliteConnection conn)
     {
       using (var cmd = conn.CreateCommand())
       {
@@ -153,7 +153,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region ReadSatellites()
-    private void ReadSatellites(SQLiteCommand cmd)
+    private void ReadSatellites(IDbCommand cmd)
     {
       cmd.CommandText = "select distinct satId, cast(satName as blob), satPos, satDir from SAT";
       using (var r = cmd.ExecuteReader())
@@ -174,7 +174,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region ReadTransponders()
-    private void ReadTransponders(SQLiteCommand cmd)
+    private void ReadTransponders(IDbCommand cmd)
     {
       cmd.CommandText = "select satId, tpFreq, tpPol, tpSr, tpId from SAT_TP";
       using (var r = cmd.ExecuteReader())
@@ -198,7 +198,7 @@ namespace ChanSort.Loader.Samsung.Zip
 
 
     #region ReadChannelDatabase()
-    private void ReadChannelDatabase(SQLiteConnection conn, string dbPath, FileType fileType)
+    private void ReadChannelDatabase(SqliteConnection conn, string dbPath, FileType fileType)
     {
       this.channelById.Clear();
       using (var cmd = conn.CreateCommand())
@@ -212,7 +212,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region ReadProviders()
-    private Dictionary<long, string> ReadProviders(SQLiteCommand cmd)
+    private Dictionary<long, string> ReadProviders(IDbCommand cmd)
     {
       var dict = new Dictionary<long, string>();
       try
@@ -236,7 +236,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region ReadChannels()
-    private ChannelList ReadChannels(SQLiteCommand cmd, string dbPath, Dictionary<long, string> providers, FileType fileType)
+    private ChannelList ReadChannels(IDbCommand cmd, string dbPath, Dictionary<long, string> providers, FileType fileType)
     {
       var signalSource = DetectSignalSource(cmd, fileType);
 
@@ -299,7 +299,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region DetectSignalSource()
-    private static SignalSource DetectSignalSource(SQLiteCommand cmd, FileType fileType)
+    private static SignalSource DetectSignalSource(IDbCommand cmd, FileType fileType)
     {
       if (fileType == FileType.ChannelDbIp)
         return SignalSource.IP|SignalSource.Digital;
@@ -368,7 +368,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region ReadFavorites()
-    private void ReadFavorites(SQLiteCommand cmd)
+    private void ReadFavorites(IDbCommand cmd)
     {
       cmd.CommandText = "select srvId, fav, pos from SRV_FAV";
       var r = cmd.ExecuteReader();
@@ -390,12 +390,23 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region ReadUtf16()
-    internal string ReadUtf16(SQLiteDataReader r, int fieldIndex)
+    internal string ReadUtf16(IDataReader r, int fieldIndex)
     {
       if (r.IsDBNull(fieldIndex))
         return null;
       byte[] nameBytes = new byte[200];
-      int nameLen = (int)r.GetBytes(fieldIndex, 0, nameBytes, 0, nameBytes.Length);
+      
+      // Microsoft.Data.SqlDataReader (and the underlying native DLLs) are bugged and throw a memory access violation when using r.GetBytes(...)
+      // nameLen = (int)r.GetBytes(fieldIndex, 0, nameBytes, 0, nameBytes.Length);
+      
+      int nameLen = 0; 
+      var obj = r.GetValue(fieldIndex);
+      if (obj is byte[] buffer)
+      {
+        nameBytes = buffer;
+        nameLen = buffer.Length;
+      }
+
       this.encoding ??= AutoDetectUtf16Encoding(nameBytes, nameLen);
       if (this.encoding == null)
         return string.Empty;
@@ -486,7 +497,7 @@ namespace ChanSort.Loader.Samsung.Zip
       }
 
       // force closing the file and releasing the locks
-      SQLiteConnection.ClearAllPools();
+      //SqliteConnection.ClearAllPools();
       GC.Collect();
       GC.WaitForPendingFinalizers();
 
@@ -497,44 +508,46 @@ namespace ChanSort.Loader.Samsung.Zip
     #region SaveChannelList()
     private void SaveChannelList(ChannelList channelList, string dbPath)
     {
-      using var conn = new SQLiteConnection("Data Source=" + dbPath);
+      using var conn = new SqliteConnection("Data Source=" + dbPath);
       conn.Open();
-      using var cmdUpdateSrv = PrepareUpdateCommand(conn);
-      using var cmdDeleteSrv = PrepareDeleteCommand(conn, (channelList.SignalSource & SignalSource.Digital) != 0);
-      using var cmdInsertFav = PrepareInsertFavCommand(conn);
-      using var cmdUpdateFav = PrepareUpdateFavCommand(conn);
-      using var cmdDeleteFav = PrepareDeleteFavCommand(conn);
       using (var trans = conn.BeginTransaction())
       {
+        using var cmdUpdateSrv = PrepareUpdateCommand(conn);
+        using var cmdDeleteSrv = PrepareDeleteCommand(conn, (channelList.SignalSource & SignalSource.Digital) != 0);
+        using var cmdInsertFav = PrepareInsertFavCommand(conn);
+        using var cmdUpdateFav = PrepareUpdateFavCommand(conn);
+        using var cmdDeleteFav = PrepareDeleteFavCommand(conn);
         Editor.SequentializeFavPos(channelList, 5);
         this.WriteChannels(cmdUpdateSrv, cmdDeleteSrv, cmdInsertFav, cmdUpdateFav, cmdDeleteFav, channelList);
         trans.Commit();
       }
-      this.RepairCorruptedDatabaseImage(cmdUpdateSrv);
+
+      using var cmd = conn.CreateCommand();
+      this.RepairCorruptedDatabaseImage(cmd);
     }
 
     #endregion
 
     #region Prepare*Command()
 
-    private SQLiteCommand PrepareUpdateCommand(SQLiteConnection conn)
+    private SqliteCommand PrepareUpdateCommand(SqliteConnection conn)
     {
       var canUpdateNames = this.Features.ChannelNameEdit != ChannelNameEditMode.None;
       var cmd = conn.CreateCommand();
       var updateSrvName = canUpdateNames ? ", srvName=cast(@srvname as varchar)" : "";
       cmd.CommandText = "update SRV set major=@nr, lockMode=@lock, hideGuide=@hidden, hidden=@hidden, numSel=@numsel" + updateSrvName + "  where srvId=@id";
-      cmd.Parameters.Add(new SQLiteParameter("@id", DbType.Int64));
-      cmd.Parameters.Add(new SQLiteParameter("@nr", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@lock", DbType.Boolean));
-      cmd.Parameters.Add(new SQLiteParameter("@hidden", DbType.Boolean));
-      cmd.Parameters.Add(new SQLiteParameter("@numsel", DbType.Boolean));
+      cmd.Parameters.Add("@id", SqliteType.Integer);
+      cmd.Parameters.Add("@nr", SqliteType.Integer);
+      cmd.Parameters.Add("@lock", SqliteType.Integer);
+      cmd.Parameters.Add("@hidden", SqliteType.Integer);
+      cmd.Parameters.Add("@numsel", SqliteType.Integer);
       if (canUpdateNames)
-        cmd.Parameters.Add(new SQLiteParameter("@srvname", DbType.Binary));
+        cmd.Parameters.Add("@srvname", SqliteType.Blob);
       cmd.Prepare();
       return cmd;
     }
 
-    private SQLiteCommand PrepareDeleteCommand(SQLiteConnection conn, bool digital)
+    private SqliteCommand PrepareDeleteCommand(SqliteConnection conn, bool digital)
     {
       var cmd = conn.CreateCommand();
       var sql = new StringBuilder();
@@ -545,38 +558,38 @@ namespace ChanSort.Loader.Samsung.Zip
           sql.AppendLine($"; delete from {r.GetString(0)} where srvId=@id");
       }
       cmd.CommandText = sql.ToString();
-      cmd.Parameters.Add(new SQLiteParameter("@id", DbType.Int64));
+      cmd.Parameters.Add("@id", SqliteType.Integer);
       cmd.Prepare();
       return cmd;
     }
 
-    private SQLiteCommand PrepareInsertFavCommand(SQLiteConnection conn)
+    private SqliteCommand PrepareInsertFavCommand(SqliteConnection conn)
     {
       var cmd = conn.CreateCommand();
       cmd.CommandText = "insert into SRV_FAV (srvId, fav, pos) values (@id, @fav, @pos)";
-      cmd.Parameters.Add(new SQLiteParameter("@id", DbType.Int64));
-      cmd.Parameters.Add(new SQLiteParameter("@fav", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@pos", DbType.Int32));
+      cmd.Parameters.Add("@id", SqliteType.Integer);
+      cmd.Parameters.Add("@fav", SqliteType.Integer);
+      cmd.Parameters.Add("@pos", SqliteType.Integer);
       cmd.Prepare();
       return cmd;
     }
 
-    private SQLiteCommand PrepareUpdateFavCommand(SQLiteConnection conn)
+    private SqliteCommand PrepareUpdateFavCommand(SqliteConnection conn)
     {
       var cmd = conn.CreateCommand();
       cmd.CommandText = "update SRV_FAV set pos=@pos where srvId=@id and fav=@fav";
-      cmd.Parameters.Add(new SQLiteParameter("@id", DbType.Int64));
-      cmd.Parameters.Add(new SQLiteParameter("@fav", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@pos", DbType.Int32));
+      cmd.Parameters.Add("@id", SqliteType.Integer);
+      cmd.Parameters.Add("@fav", SqliteType.Integer);
+      cmd.Parameters.Add("@pos", SqliteType.Integer);
       cmd.Prepare();
       return cmd;
     }
-    private SQLiteCommand PrepareDeleteFavCommand(SQLiteConnection conn)
+    private SqliteCommand PrepareDeleteFavCommand(SqliteConnection conn)
     {
       var cmd = conn.CreateCommand();
       cmd.CommandText = "delete from SRV_FAV where srvId=@id and fav=@fav";
-      cmd.Parameters.Add(new SQLiteParameter("@id", DbType.Int64));
-      cmd.Parameters.Add(new SQLiteParameter("@fav", DbType.Int32));
+      cmd.Parameters.Add("@id", SqliteType.Integer);
+      cmd.Parameters.Add("@fav", SqliteType.Integer);
       cmd.Prepare();
       return cmd;
     }
@@ -584,7 +597,7 @@ namespace ChanSort.Loader.Samsung.Zip
     #endregion
 
     #region WriteChannels()
-    private void WriteChannels(SQLiteCommand cmdUpdateSrv, SQLiteCommand cmdDeleteSrv, SQLiteCommand cmdInsertFav, SQLiteCommand cmdUpdateFav, SQLiteCommand cmdDeleteFav, 
+    private void WriteChannels(SqliteCommand cmdUpdateSrv, SqliteCommand cmdDeleteSrv, SqliteCommand cmdInsertFav, SqliteCommand cmdUpdateFav, SqliteCommand cmdDeleteFav, 
       ChannelList channelList, bool analog = false)
     {
       bool canUpdateNames = this.Features.ChannelNameEdit != ChannelNameEditMode.None;
diff --git a/source/ChanSort.Loader.Samsung/app.config b/source/ChanSort.Loader.Samsung/app.config
new file mode 100644
index 0000000..f10b4ac
--- /dev/null
+++ b/source/ChanSort.Loader.Samsung/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Samsung/packages.config b/source/ChanSort.Loader.Samsung/packages.config
new file mode 100644
index 0000000..2c03806
--- /dev/null
+++ b/source/ChanSort.Loader.Samsung/packages.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Data.Sqlite" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="5.0.5" targetFramework="net48" />
+  <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.4" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Toshiba/ChanSort.Loader.Toshiba.csproj b/source/ChanSort.Loader.Toshiba/ChanSort.Loader.Toshiba.csproj
index 4c337bc..31d4816 100644
--- a/source/ChanSort.Loader.Toshiba/ChanSort.Loader.Toshiba.csproj
+++ b/source/ChanSort.Loader.Toshiba/ChanSort.Loader.Toshiba.csproj
@@ -14,6 +14,8 @@
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,12 +64,37 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite">
-      <HintPath>..\DLL\System.Data.SQLite.dll</HintPath>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
     </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
@@ -88,7 +115,18 @@
       <Name>ChanSort.Api</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/ChanSort.Loader.Toshiba/ChmgtDbSerializer.cs b/source/ChanSort.Loader.Toshiba/ChmgtDbSerializer.cs
index ee9120a..7521857 100644
--- a/source/ChanSort.Loader.Toshiba/ChmgtDbSerializer.cs
+++ b/source/ChanSort.Loader.Toshiba/ChmgtDbSerializer.cs
@@ -1,287 +1,303 @@
 using System.Collections.Generic;
-using System.Data;
-using System.Data.SQLite;
 using ChanSort.Api;
+using Microsoft.Data.Sqlite;
 
 namespace ChanSort.Loader.Toshiba
 {
-  class ChmgtDbSerializer : SerializerBase
+  internal class ChmgtDbSerializer : SerializerBase
   {
     private const string FILE_chmgt_db = "\\chmgt_type001\\chmgt.db";
     private const string FILE_dvbSysData_db = "\\dvb_type001\\dvbSysData.db";
     private const string FILE_dvbMainData_db = "\\dvb_type001\\dvbMainData.db";
 
-    private readonly ChannelList atvChannels = new ChannelList(SignalSource.AnalogCT, "Analog");
-    private readonly ChannelList dtvTvChannels = new ChannelList(SignalSource.DvbCT | SignalSource.Tv, "DTV");
-    private readonly ChannelList dtvRadioChannels = new ChannelList(SignalSource.DvbCT | SignalSource.Radio, "Radio");
-    private readonly ChannelList satTvChannels = new ChannelList(SignalSource.DvbS | SignalSource.Tv, "Sat-TV");
-    private readonly ChannelList satRadioChannels = new ChannelList(SignalSource.DvbS | SignalSource.Radio, "Sat-Radio");
-    private readonly Dictionary<string, bool> channelInfoByUid = new Dictionary<string, bool>();
+    private readonly ChannelList atvChannels = new(SignalSource.AnalogCT, "Analog");
+    private readonly Dictionary<string, bool> channelInfoByUid = new();
+    private readonly ChannelList dtvRadioChannels = new(SignalSource.DvbCT | SignalSource.Radio, "Radio");
+    private readonly ChannelList dtvTvChannels = new(SignalSource.DvbCT | SignalSource.Tv, "DTV");
+    private readonly ChannelList satRadioChannels = new(SignalSource.DvbS | SignalSource.Radio, "Sat-Radio");
+    private readonly ChannelList satTvChannels = new(SignalSource.DvbS | SignalSource.Tv, "Sat-TV");
 
     #region ctor()
+
     public ChmgtDbSerializer(string inputFile) : base(inputFile)
     {
-      DepencencyChecker.AssertVc2010RedistPackageX86Installed();      
+      DepencencyChecker.AssertVc2010RedistPackageX86Installed();
 
-      this.Features.ChannelNameEdit = ChannelNameEditMode.All;
-      this.Features.DeleteMode = DeleteMode.Physically;
-      this.Features.CanSkipChannels = false;
-      this.Features.CanLockChannels = true;
-      this.Features.CanHideChannels = false;
-      this.Features.FavoritesMode = FavoritesMode.None;
+      Features.ChannelNameEdit = ChannelNameEditMode.All;
+      Features.DeleteMode = DeleteMode.Physically;
+      Features.CanSkipChannels = false;
+      Features.CanLockChannels = true;
+      Features.CanHideChannels = false;
+      Features.FavoritesMode = FavoritesMode.None;
 
-      this.DataRoot.AddChannelList(this.atvChannels);
-      this.DataRoot.AddChannelList(this.dtvTvChannels);
-      this.DataRoot.AddChannelList(this.dtvRadioChannels);
-      this.DataRoot.AddChannelList(this.satTvChannels);
-      this.DataRoot.AddChannelList(this.satRadioChannels);
+      DataRoot.AddChannelList(atvChannels);
+      DataRoot.AddChannelList(dtvTvChannels);
+      DataRoot.AddChannelList(dtvRadioChannels);
+      DataRoot.AddChannelList(satTvChannels);
+      DataRoot.AddChannelList(satRadioChannels);
     }
+
     #endregion
 
     #region Load()
+
     public override void Load()
     {
-      this.UnzipFileToTempFolder(); 
+      UnzipFileToTempFolder();
 
-      string sysDataConnString = "Data Source=" + this.TempPath + FILE_dvbSysData_db;
-      using (var conn = new SQLiteConnection(sysDataConnString))
+      var sysDataConnString = "Data Source=" + TempPath + FILE_dvbSysData_db;
+      using (var conn = new SqliteConnection(sysDataConnString))
       {
         conn.Open();
-        using (var cmd = conn.CreateCommand())
-        {
-          this.RepairCorruptedDatabaseImage(cmd);
-          this.ReadSatellites(cmd);
-          this.ReadTransponders(cmd);
-        }
+        using var cmd = conn.CreateCommand();
+        RepairCorruptedDatabaseImage(cmd);
+        ReadSatellites(cmd);
+        ReadTransponders(cmd);
       }
 
-      string mainDataConnString = "Data Source=" + this.TempPath + FILE_dvbMainData_db;
-      using (var conn = new SQLiteConnection(mainDataConnString))
+      var mainDataConnString = "Data Source=" + TempPath + FILE_dvbMainData_db;
+      using (var conn = new SqliteConnection(mainDataConnString))
       {
         conn.Open();
-        using (var cmd = conn.CreateCommand())
-        {
-          this.ReadCryptInfo(cmd);
-        }
+        using var cmd = conn.CreateCommand();
+        ReadCryptInfo(cmd);
       }
 
-      string channelConnString = "Data Source=" + this.TempPath + FILE_chmgt_db;
-      using (var conn = new SQLiteConnection(channelConnString))
+      var channelConnString = "Data Source=" + TempPath + FILE_chmgt_db;
+      using (var conn = new SqliteConnection(channelConnString))
       {
         conn.Open();
-        using (var cmd = conn.CreateCommand())
-        {
-          this.ReadAnalogChannels(cmd);
-          this.ReadDtvChannels(cmd);
-          this.ReadSatChannels(cmd);
-        }
+        using var cmd = conn.CreateCommand();
+        ReadAnalogChannels(cmd);
+        ReadDtvChannels(cmd);
+        ReadSatChannels(cmd);
       }
     }
+
     #endregion
-    
+
     #region RepairCorruptedDatabaseImage()
-    private void RepairCorruptedDatabaseImage(SQLiteCommand cmd)
+
+    private void RepairCorruptedDatabaseImage(SqliteCommand cmd)
     {
       cmd.CommandText = "REINDEX";
       cmd.ExecuteNonQuery();
     }
+
     #endregion
 
     #region ReadSatellites()
-    private void ReadSatellites(SQLiteCommand cmd)
+
+    private void ReadSatellites(SqliteCommand cmd)
     {
       cmd.CommandText = "select distinct satellite_id, satellite_name, orbital_position, west_east_flag from satellite";
-      using (var r = cmd.ExecuteReader())
+      using var r = cmd.ExecuteReader();
+      while (r.Read())
       {
-        while (r.Read())
-        {
-          Satellite sat = new Satellite(r.GetInt32(0));
-          int pos = r.GetInt32(2);
-          sat.OrbitalPosition = string.Format("{0}.{1}{2}", pos / 10, pos % 10, r.GetInt32(3) == 1 ? "E" : "W");
-          sat.Name = r.GetString(1) + " " + sat.OrbitalPosition;
-          this.DataRoot.AddSatellite(sat);
-        }
+        var sat = new Satellite(r.GetInt32(0));
+        var pos = r.GetInt32(2);
+        sat.OrbitalPosition = $"{pos / 10}.{pos % 10}{(r.GetInt32(3) == 1 ? "E" : "W")}";
+        sat.Name = r.GetString(1) + " " + sat.OrbitalPosition;
+        DataRoot.AddSatellite(sat);
       }
     }
+
     #endregion
 
     #region ReadTransponders()
-    private void ReadTransponders(SQLiteCommand cmd)
+
+    private void ReadTransponders(SqliteCommand cmd)
     {
       cmd.CommandText = "select satellite_id, frequency, polarization, symbol_rate, transponder_number from satellite";
-      using (var r = cmd.ExecuteReader())
+      using var r = cmd.ExecuteReader();
+      while (r.Read())
       {
-        while (r.Read())
+        var satId = r.GetInt32(0);
+        var freq = r.GetInt32(1);
+        var id = satId * 1000000 + freq / 1000;
+        if (DataRoot.Transponder.TryGet(id) != null)
+          continue;
+        var tp = new Transponder(id)
         {
-          int satId = r.GetInt32(0);
-          int freq = r.GetInt32(1);
-          int id = satId * 1000000 + freq / 1000;
-          if (this.DataRoot.Transponder.TryGet(id) != null)
-            continue;
-          Transponder tp = new Transponder(id);
-          tp.FrequencyInMhz = (decimal)freq / 1000;
-          tp.Number = r.GetInt32(4);
-          tp.Polarity = r.GetInt32(2) == 0 ? 'H' : 'V';
-          tp.Satellite = this.DataRoot.Satellites.TryGet(satId);
-          tp.SymbolRate = r.GetInt32(3) / 1000;
-          this.DataRoot.AddTransponder(tp.Satellite, tp);
-        }
+          FrequencyInMhz = (decimal) freq / 1000,
+          Number = r.GetInt32(4),
+          Polarity = r.GetInt32(2) == 0 ? 'H' : 'V',
+          Satellite = DataRoot.Satellites.TryGet(satId),
+          SymbolRate = r.GetInt32(3) / 1000
+        };
+        DataRoot.AddTransponder(tp.Satellite, tp);
       }
     }
+
     #endregion
 
     #region ReadCryptInfo()
-    private void ReadCryptInfo(SQLiteCommand cmd)
+
+    private void ReadCryptInfo(SqliteCommand cmd)
     {
       cmd.CommandText =
         "select satellite_id, original_network_id, transport_stream_id, service_id, free_CA_mode from services";
-      using (var r = cmd.ExecuteReader())
+      using var r = cmd.ExecuteReader();
+      while (r.Read())
       {
-        while (r.Read())
-        {
-          int satId = r.IsDBNull(0) ? 0 : r.GetInt32(0);
-          var sat = this.DataRoot.Satellites.TryGet(satId);
-          var satPos = sat != null ? sat.OrbitalPosition : "0.0";
-          string format = sat != null ? "S{0}-{1}-{2}-{3}" : "C-{1}-{2}-{3}";
-          string uid = string.Format(format, satPos, r.GetInt32(1), r.GetInt32(2), r.GetInt32(3));
-          this.channelInfoByUid[uid] = r.GetInt32(4) != 0;
-        }
+        var satId = r.IsDBNull(0) ? 0 : r.GetInt32(0);
+        var sat = DataRoot.Satellites.TryGet(satId);
+        var satPos = sat != null ? sat.OrbitalPosition : "0.0";
+        var format = sat != null ? "S{0}-{1}-{2}-{3}" : "C-{1}-{2}-{3}";
+        var uid = string.Format(format, satPos, r.GetInt32(1), r.GetInt32(2), r.GetInt32(3));
+        channelInfoByUid[uid] = r.GetInt32(4) != 0;
       }
     }
+
     #endregion
 
 
     #region ReadAnalogChannels()
-    private void ReadAnalogChannels(SQLiteCommand cmd)
+
+    private void ReadAnalogChannels(SqliteCommand cmd)
     {
       string[] fieldNames = {"channel_handle", "channel_number", "list_bits", "channel_label", "frequency"};
-      var sql = this.GetQuery("EuroATVChanList", fieldNames);
-      var fields = this.GetFieldMap(fieldNames);
-      
+      var sql = GetQuery("EuroATVChanList", fieldNames);
+      var fields = GetFieldMap(fieldNames);
+
       cmd.CommandText = sql;
-      using (var r = cmd.ExecuteReader())
+      using var r = cmd.ExecuteReader();
+      while (r.Read())
       {
-        while (r.Read())
-        {
-          ChannelInfo channel = new DbChannel(SignalSource.Analog, r, fields, this.DataRoot, this.channelInfoByUid);
-          if (!channel.IsDeleted)
-            this.DataRoot.AddChannel(this.atvChannels, channel);
-        }
+        ChannelInfo channel = new DbChannel(SignalSource.Analog, r, fields, DataRoot, channelInfoByUid);
+        if (!channel.IsDeleted)
+          DataRoot.AddChannel(atvChannels, channel);
       }
     }
+
     #endregion
 
     #region ReadDtvChannels()
-    private void ReadDtvChannels(SQLiteCommand cmd)
+
+    private void ReadDtvChannels(SqliteCommand cmd)
     {
-      this.ReadDigitalChannels(cmd, "EuroDTVChanList", SignalSource.DvbCT, this.dtvTvChannels, this.dtvRadioChannels);
+      ReadDigitalChannels(cmd, "EuroDTVChanList", SignalSource.DvbCT, dtvTvChannels, dtvRadioChannels);
     }
+
     #endregion
 
     #region ReadSatChannels()
-    private void ReadSatChannels(SQLiteCommand cmd)
+
+    private void ReadSatChannels(SqliteCommand cmd)
     {
-      this.ReadDigitalChannels(cmd, "EuroSATChanList", SignalSource.DvbS, this.satTvChannels, this.satRadioChannels);
+      ReadDigitalChannels(cmd, "EuroSATChanList", SignalSource.DvbS, satTvChannels, satRadioChannels);
     }
+
     #endregion
 
     #region ReadDigitalChannels()
-    private void ReadDigitalChannels(SQLiteCommand cmd, string table, SignalSource signalSource, ChannelList tvChannels, ChannelList radioChannels)
+
+    private void ReadDigitalChannels(SqliteCommand cmd, string table, SignalSource signalSource, ChannelList tvChannels, ChannelList radioChannels)
     {
-      string[] fieldNames = { "channel_handle", "channel_number", "channel_label", "frequency", "list_bits",
-                            "dvb_service_type", "onid", "tsid", "sid", "sat_id", "channel_order" };
-      var sql = this.GetQuery(table, fieldNames);
-      var fields = this.GetFieldMap(fieldNames);
+      string[] fieldNames =
+      {
+        "channel_handle", "channel_number", "channel_label", "frequency", "list_bits",
+        "dvb_service_type", "onid", "tsid", "sid", "sat_id", "channel_order"
+      };
+      var sql = GetQuery(table, fieldNames);
+      var fields = GetFieldMap(fieldNames);
 
       cmd.CommandText = sql;
-      using (var r = cmd.ExecuteReader())
+      using var r = cmd.ExecuteReader();
+      while (r.Read())
       {
-        while (r.Read())
+        ChannelInfo channel = new DbChannel(signalSource, r, fields, DataRoot, channelInfoByUid);
+        if (!channel.IsDeleted)
         {
-          ChannelInfo channel = new DbChannel(signalSource, r, fields, this.DataRoot, this.channelInfoByUid);
-          if (!channel.IsDeleted)
-          {
-            var channelList = (channel.SignalSource & SignalSource.Radio) != 0 ? radioChannels : tvChannels;
-            this.DataRoot.AddChannel(channelList, channel);
-          }
+          var channelList = (channel.SignalSource & SignalSource.Radio) != 0 ? radioChannels : tvChannels;
+          DataRoot.AddChannel(channelList, channel);
         }
       }
     }
+
     #endregion
 
     #region GetQuery()
+
     private string GetQuery(string table, string[] fieldNames)
     {
-      string sql = "select ";
-      for (int i = 0; i < fieldNames.Length; i++)
+      var sql = "select ";
+      for (var i = 0; i < fieldNames.Length; i++)
       {
         if (i > 0)
           sql += ",";
         sql += fieldNames[i];
       }
+
       sql += " from " + table;
       return sql;
     }
+
     #endregion
 
     #region GetFieldMap()
+
     private IDictionary<string, int> GetFieldMap(string[] fieldNames)
     {
-      Dictionary<string, int> field = new Dictionary<string, int>();
-      for (int i = 0; i < fieldNames.Length; i++)
+      var field = new Dictionary<string, int>();
+      for (var i = 0; i < fieldNames.Length; i++)
         field[fieldNames[i]] = i;
       return field;
     }
+
     #endregion
 
 
     #region Save()
+
     public override void Save(string tvOutputFile)
     {
-      string channelConnString = "Data Source=" + this.TempPath + FILE_chmgt_db;
-      using (var conn = new SQLiteConnection(channelConnString))
+      var channelConnString = "Data Source=" + TempPath + FILE_chmgt_db;
+      using (var conn = new SqliteConnection(channelConnString))
       {
         conn.Open();
-        using (var cmd = conn.CreateCommand())
-        using (var cmd2 = conn.CreateCommand())
-        {
-          using (var trans = conn.BeginTransaction())
-          {
-            this.WriteChannels(cmd, cmd2, "EuroATVChanList", this.atvChannels, true);
-            this.WriteChannels(cmd, cmd2, "EuroDTVChanList", this.dtvTvChannels);
-            this.WriteChannels(cmd, cmd2, "EuroDTVChanList", this.dtvRadioChannels);
-            this.WriteChannels(cmd, cmd2, "EuroSATChanList", this.satTvChannels);
-            this.WriteChannels(cmd, cmd2, "EuroSATChanList", this.satRadioChannels);
-            trans.Commit();
-          }
-          this.RepairCorruptedDatabaseImage(cmd);
-        }        
+        using var trans = conn.BeginTransaction();
+        using var cmd = conn.CreateCommand();
+        using var cmd2 = conn.CreateCommand();
+        WriteChannels(cmd, cmd2, "EuroATVChanList", atvChannels, true);
+        WriteChannels(cmd, cmd2, "EuroDTVChanList", dtvTvChannels);
+        WriteChannels(cmd, cmd2, "EuroDTVChanList", dtvRadioChannels);
+        WriteChannels(cmd, cmd2, "EuroSATChanList", satTvChannels);
+        WriteChannels(cmd, cmd2, "EuroSATChanList", satRadioChannels);
+        trans.Commit();
+
+        cmd.Transaction = null;
+        RepairCorruptedDatabaseImage(cmd);
       }
 
-      this.ZipToOutputFile(tvOutputFile);
+      ZipToOutputFile(tvOutputFile);
     }
+
     #endregion
 
     #region WriteChannels()
-    private void WriteChannels(SQLiteCommand cmd, SQLiteCommand cmdDelete, string table, ChannelList channelList, bool analog=false)
+
+    private void WriteChannels(SqliteCommand cmd, SqliteCommand cmdDelete, string table, ChannelList channelList, bool analog = false)
     {
-      string sql = "update " + table + " set channel_number=@nr ";
+      var sql = "update " + table + " set channel_number=@nr ";
       if (!analog)
         sql += ", channel_order=@nr";
       sql += ", list_bits=@Bits where channel_handle=@id";
       cmd.CommandText = sql;
-      cmd.Parameters.Add(new SQLiteParameter("@id", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@nr", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@Bits", DbType.Int32));
+      cmd.Parameters.Clear();
+      cmd.Parameters.Add("@id", SqliteType.Integer);
+      cmd.Parameters.Add("@nr", SqliteType.Integer);
+      cmd.Parameters.Add("@Bits", SqliteType.Integer);
       cmd.Prepare();
 
       cmdDelete.CommandText = "delete from " + table + " where channel_handle=@id";
-      cmdDelete.Parameters.Add(new SQLiteParameter("@id", DbType.Int32));
+      cmdDelete.Parameters.Clear();
+      cmdDelete.Parameters.Add("@id", SqliteType.Integer);
+      cmdDelete.Prepare();
 
-      foreach (ChannelInfo channelInfo in channelList.Channels)
+      foreach (var channelInfo in channelList.Channels)
       {
-        var channel = channelInfo as DbChannel;
-        if (channel == null) // ignore reference list proxy channels
+        if (channelInfo is not DbChannel channel) // ignore reference list proxy channels
           continue;
 
         if (channel.IsDeleted)
@@ -299,6 +315,7 @@ namespace ChanSort.Loader.Toshiba
         }
       }
     }
+
     #endregion
   }
-}
+}
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Toshiba/DbChannel.cs b/source/ChanSort.Loader.Toshiba/DbChannel.cs
index aa66e7d..4a7dfdd 100644
--- a/source/ChanSort.Loader.Toshiba/DbChannel.cs
+++ b/source/ChanSort.Loader.Toshiba/DbChannel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.SQLite;
+using System.Data;
 using System.Text;
 using ChanSort.Api;
 
@@ -18,7 +18,7 @@ namespace ChanSort.Loader.Toshiba
     internal int Bits;
 
     #region ctor()
-    internal DbChannel(SignalSource source, SQLiteDataReader r, IDictionary<string, int> field, 
+    internal DbChannel(SignalSource source, IDataReader r, IDictionary<string, int> field, 
       DataRoot dataRoot, IDictionary<string,bool> encryptionInfo)
     {
       this.SignalSource = source;
@@ -48,7 +48,7 @@ namespace ChanSort.Loader.Toshiba
     #endregion
 
     #region ReadAnalogData()
-    private void ReadAnalogData(SQLiteDataReader r, IDictionary<string, int> field)
+    private void ReadAnalogData(IDataReader r, IDictionary<string, int> field)
     {
       this.Name = r.GetString(field["channel_label"]);
       this.FreqInMhz = (decimal)r.GetInt32(field["frequency"]) / 1000000;
@@ -56,7 +56,7 @@ namespace ChanSort.Loader.Toshiba
     #endregion
 
     #region ReadDvbData()
-    protected void ReadDvbData(SQLiteDataReader r, IDictionary<string, int> field, DataRoot dataRoot, 
+    protected void ReadDvbData(IDataReader r, IDictionary<string, int> field, DataRoot dataRoot, 
       IDictionary<string, bool> encryptionInfo)
     {
       string longName, shortName;
diff --git a/source/ChanSort.Loader.Toshiba/SettingsDbSerializer.cs b/source/ChanSort.Loader.Toshiba/SettingsDbSerializer.cs
index ad8492b..d6ecdf0 100644
--- a/source/ChanSort.Loader.Toshiba/SettingsDbSerializer.cs
+++ b/source/ChanSort.Loader.Toshiba/SettingsDbSerializer.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SQLite;
+using System.Collections.Generic;
 using System.IO;
+using Microsoft.Data.Sqlite;
 using ChanSort.Api;
 
 namespace ChanSort.Loader.Toshiba
@@ -59,7 +57,7 @@ namespace ChanSort.Loader.Toshiba
 
     private string GetBackupFilePath()
     {
-      var dir = Path.GetDirectoryName(this.FileName);
+      var dir = Path.GetDirectoryName(this.FileName) ?? ".";
       var name = Path.GetFileNameWithoutExtension(this.FileName);
       var ext = Path.GetExtension(this.FileName);
       var backupFile = Path.Combine(dir, name + "Backup" + ext);
@@ -72,7 +70,7 @@ namespace ChanSort.Loader.Toshiba
     public override void Load()
     {
       string sysDataConnString = "Data Source=" + this.FileName;
-      using var conn = new SQLiteConnection(sysDataConnString);
+      using var conn = new SqliteConnection(sysDataConnString);
       conn.Open();
       
       using var cmd = conn.CreateCommand();
@@ -96,7 +94,7 @@ namespace ChanSort.Loader.Toshiba
     #endregion
     
     #region RepairCorruptedDatabaseImage()
-    private void RepairCorruptedDatabaseImage(SQLiteCommand cmd)
+    private void RepairCorruptedDatabaseImage(SqliteCommand cmd)
     {
       cmd.CommandText = "REINDEX";
       cmd.ExecuteNonQuery();
@@ -104,7 +102,7 @@ namespace ChanSort.Loader.Toshiba
     #endregion
 
     #region ReadSatellites()
-    private void ReadSatellites(SQLiteCommand cmd)
+    private void ReadSatellites(SqliteCommand cmd)
     {
       cmd.CommandText = "select m_id, m_name_serialized, m_orbital_position from SatTable";
       using var r = cmd.ExecuteReader();
@@ -126,7 +124,7 @@ namespace ChanSort.Loader.Toshiba
     #endregion
 
     #region ReadTransponders()
-    private void ReadTransponders(SQLiteCommand cmd)
+    private void ReadTransponders(SqliteCommand cmd)
     {
       cmd.CommandText = "select m_id, m_satellite_id, m_frequency, m_polarisation, m_symbol_rate from SatTxTable";
       using var r = cmd.ExecuteReader();
@@ -139,7 +137,7 @@ namespace ChanSort.Loader.Toshiba
         if (this.DataRoot.Transponder.TryGet(id) != null)
           continue;
         Transponder tp = new Transponder(id);
-        tp.FrequencyInMhz = (decimal)freq;
+        tp.FrequencyInMhz = freq;
         tp.Polarity = r.GetInt32(3) == 0 ? 'H' : 'V';
         tp.Satellite = this.DataRoot.Satellites.TryGet(satId);
         tp.SymbolRate = r.GetInt32(4);
@@ -149,7 +147,7 @@ namespace ChanSort.Loader.Toshiba
     #endregion
 
     #region ReadChannels()
-    private void ReadChannels(SQLiteCommand cmd)
+    private void ReadChannels(SqliteCommand cmd)
     {
       int ixE = 0;
       int ixD = 3;
@@ -219,15 +217,16 @@ left outer join ChanDataTable ac on ac.handle=a.m_channel_no
       }
 
       string channelConnString = "Data Source=" + this.FileName;
-      using var conn = new SQLiteConnection(channelConnString);
+      using var conn = new SqliteConnection(channelConnString);
       conn.Open();
+      using var trans = conn.BeginTransaction();
       using var cmd = conn.CreateCommand();
       using var cmd2 = conn.CreateCommand();
-      using var trans = conn.BeginTransaction();
 
       this.WriteChannels(cmd, cmd2, this.channels);
       trans.Commit();
 
+      cmd.Transaction = null;
       this.RepairCorruptedDatabaseImage(cmd);
       conn.Close();
 
@@ -238,12 +237,12 @@ left outer join ChanDataTable ac on ac.handle=a.m_channel_no
     #endregion
 
     #region WriteChannels()
-    private void WriteChannels(SQLiteCommand cmd, SQLiteCommand cmdDelete, ChannelList channelList)
+    private void WriteChannels(SqliteCommand cmd, SqliteCommand cmdDelete, ChannelList channelList)
     {
       cmd.CommandText = "update EASISerTable set m_rsn=@nr, m_name_serialized=@name where m_handle=@handle";
-      cmd.Parameters.Add(new SQLiteParameter("@handle", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@nr", DbType.Int32));
-      cmd.Parameters.Add(new SQLiteParameter("@name", DbType.String));
+      cmd.Parameters.Add("@handle", SqliteType.Integer);
+      cmd.Parameters.Add("@nr", SqliteType.Integer);
+      cmd.Parameters.Add("@name", SqliteType.Text);
       cmd.Prepare();
 
       cmdDelete.CommandText = @"
@@ -251,7 +250,8 @@ delete from EASISerTable where m_handle=@handle;
 delete from DVBSerTable where m_handle=@handle; 
 delete from AnalogSerTable where m_handle=@handle;
 ";
-      cmdDelete.Parameters.Add(new SQLiteParameter("@handle", DbType.Int32));
+      cmdDelete.Parameters.Add("@handle", SqliteType.Integer);
+      cmdDelete.Prepare();
 
       foreach (ChannelInfo channel in channelList.Channels)
       {
diff --git a/source/ChanSort.Loader.Toshiba/app.config b/source/ChanSort.Loader.Toshiba/app.config
new file mode 100644
index 0000000..f10b4ac
--- /dev/null
+++ b/source/ChanSort.Loader.Toshiba/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/ChanSort.Loader.Toshiba/packages.config b/source/ChanSort.Loader.Toshiba/packages.config
new file mode 100644
index 0000000..2c03806
--- /dev/null
+++ b/source/ChanSort.Loader.Toshiba/packages.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Data.Sqlite" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="5.0.5" targetFramework="net48" />
+  <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.4" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/source/ChanSort/app.config b/source/ChanSort/app.config
index 604d615..06993f5 100644
--- a/source/ChanSort/app.config
+++ b/source/ChanSort/app.config
@@ -1,10 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
 
   <System.Windows.Forms.ApplicationConfigurationSection>
     <add key="DpiAwareness" value="PerMonitorV2" />
   </System.Windows.Forms.ApplicationConfigurationSection>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/source/DLL/System.Data.SQLite.dll b/source/DLL/System.Data.SQLite.dll
deleted file mode 100644
index 2652b9b..0000000
Binary files a/source/DLL/System.Data.SQLite.dll and /dev/null differ
diff --git a/source/Spike.LgWebOs5/Spike.LgWebOs5.csproj b/source/Spike.LgWebOs5/Spike.LgWebOs5.csproj
index ddade59..7ea8310 100644
--- a/source/Spike.LgWebOs5/Spike.LgWebOs5.csproj
+++ b/source/Spike.LgWebOs5/Spike.LgWebOs5.csproj
@@ -55,8 +55,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/source/Spike.LgWebOs5/packages.config b/source/Spike.LgWebOs5/packages.config
index ef95abe..0ee6c52 100644
--- a/source/Spike.LgWebOs5/packages.config
+++ b/source/Spike.LgWebOs5/packages.config
@@ -6,5 +6,5 @@
   <package id="Microsoft.AspNet.WebPages.Data" version="3.2.7" targetFramework="net48" />
   <package id="Microsoft.AspNet.WebPages.WebData" version="3.2.7" targetFramework="net48" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/source/Test.Api/Test.Api.csproj b/source/Test.Api/Test.Api.csproj
index 85eb0a4..ac0dfc5 100644
--- a/source/Test.Api/Test.Api.csproj
+++ b/source/Test.Api/Test.Api.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -58,13 +58,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
@@ -237,10 +238,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Api/packages.config b/source/Test.Api/packages.config
index 5d9ccf6..6bf2847 100644
--- a/source/Test.Api/packages.config
+++ b/source/Test.Api/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
diff --git a/source/Test.Loader.Enigma2/Test.Loader.Enigma2.csproj b/source/Test.Loader.Enigma2/Test.Loader.Enigma2.csproj
index 0ecf785..6791eb8 100644
--- a/source/Test.Loader.Enigma2/Test.Loader.Enigma2.csproj
+++ b/source/Test.Loader.Enigma2/Test.Loader.Enigma2.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -58,13 +58,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
@@ -245,10 +246,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.Enigma2/app.config b/source/Test.Loader.Enigma2/app.config
index f10b4ac..4100fcd 100644
--- a/source/Test.Loader.Enigma2/app.config
+++ b/source/Test.Loader.Enigma2/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.Enigma2/packages.config b/source/Test.Loader.Enigma2/packages.config
index 5d9ccf6..6bf2847 100644
--- a/source/Test.Loader.Enigma2/packages.config
+++ b/source/Test.Loader.Enigma2/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
diff --git a/source/Test.Loader.Grundig/Test.Loader.Grundig.csproj b/source/Test.Loader.Grundig/Test.Loader.Grundig.csproj
index 0d6665a..83a932c 100644
--- a/source/Test.Loader.Grundig/Test.Loader.Grundig.csproj
+++ b/source/Test.Loader.Grundig/Test.Loader.Grundig.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -58,13 +58,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
@@ -245,10 +246,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.Grundig/app.config b/source/Test.Loader.Grundig/app.config
index f10b4ac..4100fcd 100644
--- a/source/Test.Loader.Grundig/app.config
+++ b/source/Test.Loader.Grundig/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.Grundig/packages.config b/source/Test.Loader.Grundig/packages.config
index 5d9ccf6..6bf2847 100644
--- a/source/Test.Loader.Grundig/packages.config
+++ b/source/Test.Loader.Grundig/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
diff --git a/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj b/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj
index f406210..cfea8d1 100644
--- a/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj
+++ b/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -58,20 +58,41 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
@@ -247,10 +268,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.Hisense/app.config b/source/Test.Loader.Hisense/app.config
index f10b4ac..4100fcd 100644
--- a/source/Test.Loader.Hisense/app.config
+++ b/source/Test.Loader.Hisense/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.Hisense/packages.config b/source/Test.Loader.Hisense/packages.config
index 5d9ccf6..9b3dc4f 100644
--- a/source/Test.Loader.Hisense/packages.config
+++ b/source/Test.Loader.Hisense/packages.config
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
+  <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.4" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Collections" version="4.3.0" targetFramework="net48" />
diff --git a/source/Test.Loader.LG/app.config b/source/Test.Loader.LG/app.config
index 786a845..913ec52 100644
--- a/source/Test.Loader.LG/app.config
+++ b/source/Test.Loader.LG/app.config
@@ -1,3 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/source/Test.Loader.M3u/Test.Loader.M3u.csproj b/source/Test.Loader.M3u/Test.Loader.M3u.csproj
index aeceb82..0fc9af4 100644
--- a/source/Test.Loader.M3u/Test.Loader.M3u.csproj
+++ b/source/Test.Loader.M3u/Test.Loader.M3u.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -58,13 +58,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
@@ -249,10 +250,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.M3u/app.config b/source/Test.Loader.M3u/app.config
index f10b4ac..4100fcd 100644
--- a/source/Test.Loader.M3u/app.config
+++ b/source/Test.Loader.M3u/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.M3u/packages.config b/source/Test.Loader.M3u/packages.config
index 5d9ccf6..6bf2847 100644
--- a/source/Test.Loader.M3u/packages.config
+++ b/source/Test.Loader.M3u/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
diff --git a/source/Test.Loader.Panasonic/Test.Loader.Panasonic.csproj b/source/Test.Loader.Panasonic/Test.Loader.Panasonic.csproj
index 3105fff..dc8cb10 100644
--- a/source/Test.Loader.Panasonic/Test.Loader.Panasonic.csproj
+++ b/source/Test.Loader.Panasonic/Test.Loader.Panasonic.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -58,20 +58,41 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
@@ -246,10 +267,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.Panasonic/app.config b/source/Test.Loader.Panasonic/app.config
index f10b4ac..4100fcd 100644
--- a/source/Test.Loader.Panasonic/app.config
+++ b/source/Test.Loader.Panasonic/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.Panasonic/packages.config b/source/Test.Loader.Panasonic/packages.config
index 5d9ccf6..9b3dc4f 100644
--- a/source/Test.Loader.Panasonic/packages.config
+++ b/source/Test.Loader.Panasonic/packages.config
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
+  <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.4" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Collections" version="4.3.0" targetFramework="net48" />
diff --git a/source/Test.Loader.Philips/Test.Loader.Philips.csproj b/source/Test.Loader.Philips/Test.Loader.Philips.csproj
index 68ca36e..1c183ec 100644
--- a/source/Test.Loader.Philips/Test.Loader.Philips.csproj
+++ b/source/Test.Loader.Philips/Test.Loader.Philips.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -63,7 +63,6 @@
     <Compile Include="PhilipsXmlTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ChanSort.Api\ChanSort.Api.csproj">
       <Project>{dccffa08-472b-4d17-bb90-8f513fc01392}</Project>
@@ -79,20 +78,41 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
@@ -248,6 +268,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="TestFiles1\Repair\ChannelList\chanLst.bin">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -430,10 +451,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.Philips/app.config b/source/Test.Loader.Philips/app.config
new file mode 100644
index 0000000..4100fcd
--- /dev/null
+++ b/source/Test.Loader.Philips/app.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.Philips/packages.config b/source/Test.Loader.Philips/packages.config
index 5d9ccf6..9b3dc4f 100644
--- a/source/Test.Loader.Philips/packages.config
+++ b/source/Test.Loader.Philips/packages.config
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
+  <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.4" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Collections" version="4.3.0" targetFramework="net48" />
diff --git a/source/Test.Loader.Samsung/Test.Loader.Samsung.csproj b/source/Test.Loader.Samsung/Test.Loader.Samsung.csproj
index 5791a68..1fa21db 100644
--- a/source/Test.Loader.Samsung/Test.Loader.Samsung.csproj
+++ b/source/Test.Loader.Samsung/Test.Loader.Samsung.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,7 +57,183 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -62,11 +241,7 @@
         <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
       </ItemGroup>
     </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-      </ItemGroup>
-    </Otherwise>
+    <Otherwise />
   </Choose>
   <ItemGroup>
     <Compile Include="Scm\FileFormatDetectionTest.cs" />
@@ -89,6 +264,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="Scm\TestFiles\Channel_list_T_J_ohne_smart_12.scm" />
     <None Include="Scm\TestFiles\channel_list_UE32J5170_1201_orig.scm" />
     <None Include="Scm\TestFiles\channel_list_UE55H6470_1201-Suchlauf-2015-04-26.scm" />
@@ -122,6 +299,16 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Test.Loader.Samsung/app.config b/source/Test.Loader.Samsung/app.config
new file mode 100644
index 0000000..2b1b1dd
--- /dev/null
+++ b/source/Test.Loader.Samsung/app.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.Samsung/packages.config b/source/Test.Loader.Samsung/packages.config
new file mode 100644
index 0000000..9284d0b
--- /dev/null
+++ b/source/Test.Loader.Samsung/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.UnitTestFramework.Extensions" version="2.0.0" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
+  <package id="System.Diagnostics.Contracts" version="4.0.1" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/source/Test.Loader.SatcoDX/Test.Loader.SatcoDX.csproj b/source/Test.Loader.SatcoDX/Test.Loader.SatcoDX.csproj
index 42d83a4..94b4f9b 100644
--- a/source/Test.Loader.SatcoDX/Test.Loader.SatcoDX.csproj
+++ b/source/Test.Loader.SatcoDX/Test.Loader.SatcoDX.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -59,13 +59,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
@@ -245,10 +246,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.SatcoDX/app.config b/source/Test.Loader.SatcoDX/app.config
index f10b4ac..4100fcd 100644
--- a/source/Test.Loader.SatcoDX/app.config
+++ b/source/Test.Loader.SatcoDX/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.SatcoDX/packages.config b/source/Test.Loader.SatcoDX/packages.config
index 5d9ccf6..6bf2847 100644
--- a/source/Test.Loader.SatcoDX/packages.config
+++ b/source/Test.Loader.SatcoDX/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
diff --git a/source/Test.Loader.Sharp/Test.Loader.Sharp.csproj b/source/Test.Loader.Sharp/Test.Loader.Sharp.csproj
index 89e05f3..bb127e8 100644
--- a/source/Test.Loader.Sharp/Test.Loader.Sharp.csproj
+++ b/source/Test.Loader.Sharp/Test.Loader.Sharp.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -59,10 +59,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -71,9 +71,6 @@
     <Compile Include="SharpTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ChanSort.Api\ChanSort.Api.csproj">
       <Project>{dccffa08-472b-4d17-bb90-8f513fc01392}</Project>
@@ -91,14 +88,18 @@
   <ItemGroup>
     <Folder Include="TestFiles\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.Sharp/app.config b/source/Test.Loader.Sharp/app.config
new file mode 100644
index 0000000..2b1b1dd
--- /dev/null
+++ b/source/Test.Loader.Sharp/app.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.Sharp/packages.config b/source/Test.Loader.Sharp/packages.config
index e3b8948..2bcdb40 100644
--- a/source/Test.Loader.Sharp/packages.config
+++ b/source/Test.Loader.Sharp/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MSTest.TestAdapter" version="2.1.2" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.1.2" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/source/Test.Loader.Sony/Test.Loader.Sony.csproj b/source/Test.Loader.Sony/Test.Loader.Sony.csproj
index e863630..e3a3130 100644
--- a/source/Test.Loader.Sony/Test.Loader.Sony.csproj
+++ b/source/Test.Loader.Sony/Test.Loader.Sony.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -59,13 +59,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
@@ -248,10 +249,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.Sony/app.config b/source/Test.Loader.Sony/app.config
index f10b4ac..4100fcd 100644
--- a/source/Test.Loader.Sony/app.config
+++ b/source/Test.Loader.Sony/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.Sony/packages.config b/source/Test.Loader.Sony/packages.config
index 5d9ccf6..6bf2847 100644
--- a/source/Test.Loader.Sony/packages.config
+++ b/source/Test.Loader.Sony/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
diff --git a/source/Test.Loader.Toshiba/Test.Loader.Toshiba.csproj b/source/Test.Loader.Toshiba/Test.Loader.Toshiba.csproj
index 980a8fb..cb7597a 100644
--- a/source/Test.Loader.Toshiba/Test.Loader.Toshiba.csproj
+++ b/source/Test.Loader.Toshiba/Test.Loader.Toshiba.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -58,20 +58,41 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.Sqlite, Version=5.0.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
@@ -251,10 +272,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.Toshiba/app.config b/source/Test.Loader.Toshiba/app.config
index f10b4ac..4100fcd 100644
--- a/source/Test.Loader.Toshiba/app.config
+++ b/source/Test.Loader.Toshiba/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.Toshiba/packages.config b/source/Test.Loader.Toshiba/packages.config
index 5d9ccf6..9b3dc4f 100644
--- a/source/Test.Loader.Toshiba/packages.config
+++ b/source/Test.Loader.Toshiba/packages.config
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="5.0.5" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
+  <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.4" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Collections" version="4.3.0" targetFramework="net48" />
diff --git a/source/Test.Loader.VDR/Test.Loader.VDR.csproj b/source/Test.Loader.VDR/Test.Loader.VDR.csproj
index 71c0426..7c6793e 100644
--- a/source/Test.Loader.VDR/Test.Loader.VDR.csproj
+++ b/source/Test.Loader.VDR/Test.Loader.VDR.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -59,13 +59,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.TestPlatform.AdapterUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.1\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
@@ -246,10 +247,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.1\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Test.Loader.VDR/app.config b/source/Test.Loader.VDR/app.config
index f10b4ac..4100fcd 100644
--- a/source/Test.Loader.VDR/app.config
+++ b/source/Test.Loader.VDR/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/Test.Loader.VDR/packages.config b/source/Test.Loader.VDR/packages.config
index 5d9ccf6..6bf2847 100644
--- a/source/Test.Loader.VDR/packages.config
+++ b/source/Test.Loader.VDR/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.4" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="MSTest.TestAdapter" version="2.2.1" targetFramework="net48" />
-  <package id="MSTest.TestFramework" version="2.2.1" targetFramework="net48" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
diff --git a/source/Test.Loader/Test.Loader.csproj b/source/Test.Loader/Test.Loader.csproj
index f5046da..46c498d 100644
--- a/source/Test.Loader/Test.Loader.csproj
+++ b/source/Test.Loader/Test.Loader.csproj
@@ -96,6 +96,9 @@
       <Name>ChanSort.Loader.LG</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/source/Test.Loader/app.config b/source/Test.Loader/app.config
new file mode 100644
index 0000000..2b1b1dd
--- /dev/null
+++ b/source/Test.Loader/app.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/changelog.md b/source/changelog.md
index d799c9a..a97af56 100644
--- a/source/changelog.md
+++ b/source/changelog.md
@@ -1,6 +1,13 @@
 ChanSort Change Log 
 ===================
 
+2021-04-25
+- removed dependency on Visual C++ 2010 Redistributable Package (x86):
+  Hisense, Panasonic, Philips, Samsung and Toshiba channel list use SQLite database files, which ChanSort accessed
+  through a 3rd party ADO.NET data provider, which depended on this package. Now a different ADO.NET provider is used.
+- Philips DVB\*.xml: maintain same indentation as original file (can be 0, 2 or 4 spaces) for easier before/after diff
+- Philips ChannelMap\_30-45: fixed a bug that caused the list not to load when certain error messages were logged
+
 2021-04-11_1900
 - Philips ChannelMap\_30: fixed bug that caused favorite lists to be in wrong order
 
diff --git a/source/makeDistribZip.cmd b/source/makeDistribZip.cmd
index f574744..345b077 100644
--- a/source/makeDistribZip.cmd
+++ b/source/makeDistribZip.cmd
@@ -13,6 +13,16 @@ xcopy /idy debug\ChanSort.exe* "%target%"
 xcopy /idy debug\ChanSort.*.dll "%target%"
 xcopy /idy debug\ChanSort.ico "%target%"
 xcopy /idy debug\ChanSort.*.ini "%target%"
+
+xcopy /idy debug\Microsoft.Data.Sqlite.dll "%target%"
+xcopy /idy debug\SQLitePCLRaw.*.dll "%target%"
+xcopy /idy debug\System.Memory.dll "%target%"
+xcopy /idy debug\System.Runtime.CompilerServices.Unsafe.dll "%target%"
+mkdir "%target%\runtimes" 2>nul
+xcopy /sidy debug\runtimes\* "%target%\runtimes"
+
+
+xcopy /idy debug\Newtonsoft.Json.dll "%target%"
 xcopy /idy debug\Lookup.csv "%target%"
 xcopy /idy DLL\* "%target%"
 del "%target%\*nunit*.dll"
@@ -42,12 +52,18 @@ rem -----------------------------
 rem If you want to digitally sign the generated .exe and .dll files, 
 rem you need to have your code signing certificate installed in the Windows certificate storage
 rem -----------------------------
-set signtool="C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\signtool.exe"
-if not exist %signtool% (
-  echo can't find signtool: %signtool%
-  pause
-  goto:eof
+for /d %%f in ("C:\Program Files (x86)\Windows Kits\10\bin\10.*") do (
+  set nq=%%f
+  set nq=!nq:"=!
+  set signtool="!nq!\x86\signtool.exe"
+  if exist !signtool! goto foundSigntool
 )
+
+echo "can't find signtool.exe"
+pause
+goto:eof
+:foundSigntool
+
 set oldcd=%cd%
 cd %target%
 call :signBatch ChanSort.exe ChanSort*.dll