diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 3e77817f6..bbb8326c5 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -5,7 +5,33 @@
     <e p="$USER_HOME$/.Rider2019.3/system/extResources" t="IncludeRecursive" />
     <e p="$USER_HOME$/.Rider2019.3/system/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" />
     <e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
-    <e p="$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3.linux/1.1.12/runtimes/linux-x64/native/libe_sqlite3.so" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3/2.0.2/runtimes" t="Include">
+      <e p="linux-arm" t="Include">
+        <e p="native" t="Include">
+          <e p="libe_sqlite3.so" t="Include" />
+        </e>
+      </e>
+      <e p="linux-arm64" t="Include">
+        <e p="native" t="Include">
+          <e p="libe_sqlite3.so" t="Include" />
+        </e>
+      </e>
+      <e p="linux-armel" t="Include">
+        <e p="native" t="Include">
+          <e p="libe_sqlite3.so" t="Include" />
+        </e>
+      </e>
+      <e p="linux-x64" t="Include">
+        <e p="native" t="Include">
+          <e p="libe_sqlite3.so" t="Include" />
+        </e>
+      </e>
+      <e p="linux-x86" t="Include">
+        <e p="native" t="Include">
+          <e p="libe_sqlite3.so" t="Include" />
+        </e>
+      </e>
+    </e>
     <e p="$PROJECT_DIR$" t="IncludeFlat">
       <e p=".git/info/exclude" t="IncludeRecursive" />
       <e p=".git/modules/Aaru.Checksums/info/exclude" t="IncludeRecursive" />
diff --git a/.idea/.idea.Aaru/riderModule.iml b/.idea/.idea.Aaru/riderModule.iml
index d9bc89780..ea83ce851 100644
--- a/.idea/.idea.Aaru/riderModule.iml
+++ b/.idea/.idea.Aaru/riderModule.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RIDER_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3.linux/1.1.12/runtimes/linux-x64/native/libe_sqlite3.so" />
+    <content url="file://$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3/2.0.2/runtimes" />
     <content url="file://$MODULE_DIR$/../.." />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="R User Library" level="project" />
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index 90ffe6950..2572a9bab 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit 90ffe6950eea3a0f3d88b2fab644b07485e44b67
+Subproject commit 2572a9bab3308d99db0b02cf31b99753f680065b
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index b6ca46b3f..a1a32cc3f 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -50,10 +50,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
+    <PackageReference Include="EntityFramework" Version="6.4.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
   </ItemGroup>
diff --git a/Aaru.Database/Context.cs b/Aaru.Database/Context.cs
index 48388eb68..ea012d5db 100644
--- a/Aaru.Database/Context.cs
+++ b/Aaru.Database/Context.cs
@@ -66,5 +66,162 @@ namespace Aaru.Database
 
             return new AaruContext(optionsBuilder.Options);
         }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.Ata", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.TestedMedia", "ReadCapabilities").WithMany().
+                  HasForeignKey("ReadCapabilitiesId").OnDelete(DeleteBehavior.SetNull);
+            });
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.BlockDescriptor", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", null).WithMany("BlockDescriptors").
+                  HasForeignKey("ScsiModeId").OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.DensityCode", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.SscSupportedMedia", null).WithMany("DensityCodes").
+                  HasForeignKey("SscSupportedMediaId").OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.Mmc", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.MmcFeatures", "Features").WithMany().HasForeignKey("FeaturesId").
+                  OnDelete(DeleteBehavior.SetNull);
+            });
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.Scsi", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", "ModeSense").WithMany().HasForeignKey("ModeSenseId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Mmc", "MultiMediaDevice").WithMany().
+                  HasForeignKey("MultiMediaDeviceId").OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.TestedMedia", "ReadCapabilities").WithMany().
+                  HasForeignKey("ReadCapabilitiesId").OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Ssc", "SequentialDevice").WithMany().
+                  HasForeignKey("SequentialDeviceId").OnDelete(DeleteBehavior.SetNull);
+            });
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.ScsiPage", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.Scsi", null).WithMany("EVPDPages").HasForeignKey("ScsiId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", null).WithMany("ModePages").HasForeignKey("ScsiModeId").
+                  OnDelete(DeleteBehavior.SetNull);
+            });
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.SscSupportedMedia", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedMediaTypes").HasForeignKey("SscId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null).WithMany("SupportedMediaTypes").
+                  HasForeignKey("TestedSequentialMediaId").OnDelete(DeleteBehavior.SetNull);
+            });
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.SupportedDensity", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("SupportedDensities").HasForeignKey("SscId").
+                  OnDelete(DeleteBehavior.Cascade);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia", null).WithMany("SupportedDensities").
+                  HasForeignKey("TestedSequentialMediaId").OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.TestedMedia", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.Ata", null).WithMany("RemovableMedias").HasForeignKey("AtaId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CHS").WithMany().HasForeignKey("CHSId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CurrentCHS").WithMany().HasForeignKey("CurrentCHSId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Mmc", null).WithMany("TestedMedia").HasForeignKey("MmcId").
+                  OnDelete(DeleteBehavior.Cascade);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Scsi", null).WithMany("RemovableMedias").HasForeignKey("ScsiId").
+                  OnDelete(DeleteBehavior.SetNull);
+            });
+
+            modelBuilder.Entity("Aaru.CommonTypes.Metadata.TestedSequentialMedia", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.Ssc", null).WithMany("TestedMedia").HasForeignKey("SscId").
+                  OnDelete(DeleteBehavior.SetNull);
+            });
+
+            modelBuilder.Entity("Aaru.Database.Models.Device", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA").WithMany().HasForeignKey("ATAId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATAPI").WithMany().HasForeignKey("ATAPIId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().HasForeignKey("FireWireId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "MultiMediaCard").WithMany().
+                  HasForeignKey("MultiMediaCardId").OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Pcmcia", "PCMCIA").WithMany().HasForeignKey("PCMCIAId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Scsi", "SCSI").WithMany().HasForeignKey("SCSIId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "SecureDigital").WithMany().
+                  HasForeignKey("SecureDigitalId").OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Usb", "USB").WithMany().HasForeignKey("USBId").
+                  OnDelete(DeleteBehavior.SetNull);
+            });
+
+            modelBuilder.Entity("Aaru.Database.Models.Report", b =>
+            {
+                b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATA").WithMany().HasForeignKey("ATAId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATAPI").WithMany().HasForeignKey("ATAPIId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().HasForeignKey("FireWireId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "MultiMediaCard").WithMany().
+                  HasForeignKey("MultiMediaCardId").OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Pcmcia", "PCMCIA").WithMany().HasForeignKey("PCMCIAId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Scsi", "SCSI").WithMany().HasForeignKey("SCSIId").
+                  OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "SecureDigital").WithMany().
+                  HasForeignKey("SecureDigitalId").OnDelete(DeleteBehavior.SetNull);
+
+                b.HasOne("Aaru.CommonTypes.Metadata.Usb", "USB").WithMany().HasForeignKey("USBId").
+                  OnDelete(DeleteBehavior.SetNull);
+            });
+
+            modelBuilder.Entity<CdOffset>().HasIndex(b => b.ModifiedWhen);
+
+            modelBuilder.Entity<UsbProduct>().HasIndex(b => b.ModifiedWhen);
+            modelBuilder.Entity<UsbProduct>().HasIndex(b => b.ProductId);
+            modelBuilder.Entity<UsbProduct>().HasIndex(b => b.VendorId);
+
+            modelBuilder.Entity<UsbVendor>().HasIndex(b => b.ModifiedWhen);
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/CdOffset.cs b/Aaru.Database/Models/CdOffset.cs
index a6973ab7b..aea0ea550 100644
--- a/Aaru.Database/Models/CdOffset.cs
+++ b/Aaru.Database/Models/CdOffset.cs
@@ -31,7 +31,6 @@
 // ****************************************************************************/
 
 using System;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Aaru.Database.Models
 {
@@ -59,9 +58,8 @@ namespace Aaru.Database.Models
             AddedWhen    = ModifiedWhen = DateTime.UtcNow;
         }
 
-        public int      Id        { get; set; }
-        public DateTime AddedWhen { get; set; }
-        [Index]
+        public int      Id           { get; set; }
+        public DateTime AddedWhen    { get; set; }
         public DateTime ModifiedWhen { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/UsbProduct.cs b/Aaru.Database/Models/UsbProduct.cs
index 5d5a181e7..6ce272bdb 100644
--- a/Aaru.Database/Models/UsbProduct.cs
+++ b/Aaru.Database/Models/UsbProduct.cs
@@ -32,7 +32,6 @@
 
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Aaru.Database.Models
 {
@@ -49,15 +48,12 @@ namespace Aaru.Database.Models
         }
 
         [Key]
-        public int Id { get; set; }
-        [Index]
-        public ushort ProductId { get;   set; }
-        public string   Product   { get; set; }
-        public DateTime AddedWhen { get; set; }
-        [Index]
-        public DateTime ModifiedWhen { get; set; }
-        [Index]
-        public ushort VendorId { get;          set; }
-        public virtual UsbVendor Vendor { get; set; }
+        public int Id { get;                         set; }
+        public         ushort    ProductId    { get; set; }
+        public         string    Product      { get; set; }
+        public         DateTime  AddedWhen    { get; set; }
+        public         DateTime  ModifiedWhen { get; set; }
+        public         ushort    VendorId     { get; set; }
+        public virtual UsbVendor Vendor       { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/UsbVendor.cs b/Aaru.Database/Models/UsbVendor.cs
index 65f5c32fe..4eac2d947 100644
--- a/Aaru.Database/Models/UsbVendor.cs
+++ b/Aaru.Database/Models/UsbVendor.cs
@@ -33,7 +33,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Aaru.Database.Models
 {
@@ -49,10 +48,9 @@ namespace Aaru.Database.Models
         }
 
         [Key]
-        public ushort Id { get;          set; }
-        public string   Vendor    { get; set; }
-        public DateTime AddedWhen { get; set; }
-        [Index]
+        public ushort Id { get;             set; }
+        public string   Vendor       { get; set; }
+        public DateTime AddedWhen    { get; set; }
         public DateTime ModifiedWhen { get; set; }
 
         public virtual ICollection<UsbProduct> Products { get; set; }
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 0bfead47a..0ed0988a8 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 0bfead47a413871a4188919da8db4412317f120c
+Subproject commit 0ed0988a873ecbb8e3cbd48575a748e2a01a84af
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
index 1c1140bba..9eb7e4d61 100644
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -105,7 +105,7 @@
     <Compile Include="Windows\UsbFunctions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Management" Version="4.5.0" />
+    <PackageReference Include="System.Management" Version="4.7.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
   </ItemGroup>
   <ProjectExtensions>
diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index b4b39c061..000a23bd2 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -20,8 +20,8 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Claunia.Encoding" Version="1.7.0" />
-        <PackageReference Include="Eto.Forms" Version="2.5.0-rc.4" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.5.0-rc.4" />
+        <PackageReference Include="Eto.Forms" Version="2.5.0" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.5.0" />
         <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
     </ItemGroup>
     <ItemGroup>
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index eb320f3c1..3cc3648a0 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -51,8 +51,8 @@
   <ItemGroup>
     <PackageReference Include="Claunia.Encoding" Version="1.7.0" />
     <PackageReference Include="Claunia.RsrcFork" Version="1.1.0" />
-    <PackageReference Include="DotNetZip" Version="1.13.4" />
-    <PackageReference Include="plist-cil" Version="1.60.0" />
+    <PackageReference Include="DotNetZip" Version="1.13.6" />
+    <PackageReference Include="plist-cil" Version="2.0.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
index 390c0a819..64d877124 100644
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -59,11 +59,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
   </ItemGroup>
-    <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp')) == true">
-        <PackageReference Include="Microsoft.Win32.Registry" Version="4.6.0" />
-    </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="plist-cil" Version="1.60.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+    <PackageReference Include="plist-cil" Version="2.0.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
   </ItemGroup>
   <ProjectExtensions>
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index e0bd11463..ad1f52aa8 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -266,10 +266,10 @@
     <Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="System.CommandLine.Experimental" Version="0.3.0-alpha.19577.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20158.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
     <PackageReference Include="System.Collections" Version="4.3.0" />