diff --git a/DiscImageChef.Core/Devices/Info/DeviceInfo.cs b/DiscImageChef.Core/Devices/Info/DeviceInfo.cs
index 0dc294772..77c67dc4d 100644
--- a/DiscImageChef.Core/Devices/Info/DeviceInfo.cs
+++ b/DiscImageChef.Core/Devices/Info/DeviceInfo.cs
@@ -43,6 +43,30 @@ namespace DiscImageChef.Core.Devices.Info
     {
         public DeviceInfo(Device dev)
         {
+            Type                  = dev.Type;
+            Manufacturer          = dev.Manufacturer;
+            Model                 = dev.Model;
+            Revision              = dev.Revision;
+            Serial                = dev.Serial;
+            ScsiType              = dev.ScsiType;
+            IsRemovable           = dev.IsRemovable;
+            IsUsb                 = dev.IsUsb;
+            UsbVendorId           = dev.UsbVendorId;
+            UsbProductId          = dev.UsbProductId;
+            UsbDescriptors        = dev.UsbDescriptors;
+            UsbManufacturerString = dev.UsbManufacturerString;
+            UsbProductString      = dev.UsbProductString;
+            UsbSerialString       = dev.UsbSerialString;
+            IsFireWire            = dev.IsFireWire;
+            FireWireGuid          = dev.FireWireGuid;
+            FireWireModel         = dev.FireWireModel;
+            FireWireModelName     = dev.FireWireModelName;
+            FireWireVendor        = dev.FireWireVendor;
+            FireWireVendorName    = dev.FireWireVendorName;
+            IsCompactFlash        = dev.IsCompactFlash;
+            IsPcmcia              = dev.IsPcmcia;
+            Cis                   = dev.Cis;
+
             switch(dev.Type)
             {
                 case DeviceType.ATA:
diff --git a/DiscImageChef.Core/Devices/Info/Properties.cs b/DiscImageChef.Core/Devices/Info/Properties.cs
index 1c9728783..c87016bd1 100644
--- a/DiscImageChef.Core/Devices/Info/Properties.cs
+++ b/DiscImageChef.Core/Devices/Info/Properties.cs
@@ -62,5 +62,28 @@ namespace DiscImageChef.Core.Devices.Info
         public byte[]                                 ExtendedCSD            { get; }
         public byte[]                                 SCR                    { get; }
         public byte[]                                 OCR                    { get; }
+        public DeviceType                             Type                   { get; }
+        public string                                 Manufacturer           { get; }
+        public string                                 Model                  { get; }
+        public string                                 Revision               { get; }
+        public string                                 Serial                 { get; }
+        public PeripheralDeviceTypes                  ScsiType               { get; }
+        public bool                                   IsRemovable            { get; }
+        public bool                                   IsUsb                  { get; }
+        public ushort                                 UsbVendorId            { get; }
+        public ushort                                 UsbProductId           { get; }
+        public byte[]                                 UsbDescriptors         { get; }
+        public string                                 UsbManufacturerString  { get; }
+        public string                                 UsbProductString       { get; }
+        public string                                 UsbSerialString        { get; }
+        public bool                                   IsFireWire             { get; }
+        public ulong                                  FireWireGuid           { get; }
+        public uint                                   FireWireModel          { get; }
+        public string                                 FireWireModelName      { get; }
+        public uint                                   FireWireVendor         { get; }
+        public string                                 FireWireVendorName     { get; }
+        public bool                                   IsCompactFlash         { get; }
+        public bool                                   IsPcmcia               { get; }
+        public byte[]                                 Cis                    { get; }
     }
 }
\ No newline at end of file