diff --git a/DiscImageChef.Database/Models/UsbProduct.cs b/DiscImageChef.Database/Models/UsbProduct.cs
index 6d337773d..62aa98139 100644
--- a/DiscImageChef.Database/Models/UsbProduct.cs
+++ b/DiscImageChef.Database/Models/UsbProduct.cs
@@ -31,11 +31,12 @@
 // ****************************************************************************/
 
 using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DiscImageChef.Database.Models
 {
-    public class UsbProduct : BaseModel<int>
+    public class UsbProduct
     {
         public UsbProduct() { }
 
@@ -47,6 +48,8 @@ namespace DiscImageChef.Database.Models
             AddedWhen = ModifiedWhen = DateTime.UtcNow;
         }
 
+        [Key]
+        public int Id { get; set; }
         [Index]
         public ushort ProductId { get;   set; }
         public string   Product   { get; set; }
diff --git a/DiscImageChef.Database/Models/UsbVendor.cs b/DiscImageChef.Database/Models/UsbVendor.cs
index adced354e..33c8f0b58 100644
--- a/DiscImageChef.Database/Models/UsbVendor.cs
+++ b/DiscImageChef.Database/Models/UsbVendor.cs
@@ -32,11 +32,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DiscImageChef.Database.Models
 {
-    public class UsbVendor : BaseModel<ushort>
+    public class UsbVendor
     {
         public UsbVendor() { }
 
@@ -47,6 +48,8 @@ namespace DiscImageChef.Database.Models
             AddedWhen = ModifiedWhen = DateTime.UtcNow;
         }
 
+        [Key]
+        public ushort Id { get;          set; }
         public string   Vendor    { get; set; }
         public DateTime AddedWhen { get; set; }
         [Index]