diff --git a/NTwain/DataSource.Caps.cs b/NTwain/DataSource.Caps.cs
index c942d8c..9572145 100644
--- a/NTwain/DataSource.Caps.cs
+++ b/NTwain/DataSource.Caps.cs
@@ -1964,59 +1964,7 @@ namespace NTwain
 
         #endregion
 
-
-        private CapWrapper<Duplex> _duplex;
-
-        /// <summary>
-        /// Gets the property to see what's the duplex mode for the current source.
-        /// </summary>
-        /// <value>
-        /// The duplex mode.
-        /// </value>
-        public IReadOnlyCapWrapper<Duplex> CapDuplex
-        {
-            get
-            {
-                return _duplex ?? (_duplex = new CapWrapper<Duplex>(this, CapabilityId.CapDuplex, ValueExtensions.ConvertToEnum<Duplex>));
-            }
-        }
-
-        private CapWrapper<BoolType> _duplexEnabled;
-
-        /// <summary>
-        /// Gets the property to work with duplex enabled flag for the current source.
-        /// </summary>
-        /// <value>
-        /// The duplex enabled flag.
-        /// </value>
-        public ICapWrapper<BoolType> CapDuplexEnabled
-        {
-            get
-            {
-                return _duplexEnabled ?? (_duplexEnabled = new CapWrapper<BoolType>(this, CapabilityId.CapDuplexEnabled, ValueExtensions.ConvertToEnum<BoolType>,
-                        value => new TWOneValue
-                        {
-                            Item = (uint)value,
-                            ItemType = ItemType.Bool
-                        }));
-            }
-        }
-
-        private CapWrapper<BoolType> _feederLoaded;
-
-        /// <summary>
-        /// Gets the property to work with feeder loaded flag for the current source.
-        /// </summary>
-        /// <value>
-        /// The feeder loaded flag.
-        /// </value>
-        public IReadOnlyCapWrapper<BoolType> CapFeederLoaded
-        {
-            get
-            {
-                return _feederLoaded ?? (_feederLoaded = new CapWrapper<BoolType>(this, CapabilityId.CapFeederLoaded, ValueExtensions.ConvertToEnum<BoolType>));
-            }
-        }
+        // TODO: add CAP_AUTHOR,CAP_CAPTION
 
         private CapWrapper<BoolType> _feederEnabled;
 
@@ -2052,19 +2000,13 @@ namespace NTwain
                         }
                         // to really use feeder we must also set autofeed or autoscan, but only
                         // for one of them since setting autoscan also sets autofeed
-                        if (SupportedCaps.Contains(CapabilityId.CapAutoScan))
+                        if (CapAutoScan.CanSet)
                         {
-                            using (TWCapability autoScan = new TWCapability(CapabilityId.CapAutoScan, one))
-                            {
-                                rc = _session.DGControl.Capability.Set(autoScan);
-                            }
+                            rc = CapAutoScan.Set(value);
                         }
-                        else if (SupportedCaps.Contains(CapabilityId.CapAutoFeed))
+                        else if (CapAutoFeed.CanSet)
                         {
-                            using (TWCapability autoScan = new TWCapability(CapabilityId.CapAutoFeed, one))
-                            {
-                                rc = _session.DGControl.Capability.Set(autoScan);
-                            }
+                            rc = CapAutoFeed.Set(value);
                         }
 
                         return rc;
@@ -2072,6 +2014,82 @@ namespace NTwain
             }
         }
 
+        private CapWrapper<BoolType> _feederLoaded;
+
+        /// <summary>
+        /// Gets the property to work with feeder loaded flag for the current source.
+        /// </summary>
+        /// <value>
+        /// The feeder loaded flag.
+        /// </value>
+        public IReadOnlyCapWrapper<BoolType> CapFeederLoaded
+        {
+            get
+            {
+                return _feederLoaded ?? (_feederLoaded = new CapWrapper<BoolType>(this, CapabilityId.CapFeederLoaded, ValueExtensions.ConvertToEnum<BoolType>));
+            }
+        }
+
+        // TODO: add CAP_TIMEDATE
+
+        private CapWrapper<CapabilityId> _supportedCaps;
+
+        /// <summary>
+        /// Gets the supported caps for the current source.
+        /// </summary>
+        /// <value>
+        /// The supported caps.
+        /// </value>
+        public IReadOnlyCapWrapper<CapabilityId> CapSupportedCaps
+        {
+            get
+            {
+                return _supportedCaps ?? (_supportedCaps = new CapWrapper<CapabilityId>(this, CapabilityId.CapSupportedCaps, ValueExtensions.ConvertToEnum<CapabilityId>));
+            }
+        }
+
+        private CapWrapper<CapabilityId> _extendedCaps;
+
+        /// <summary>
+        /// Gets the extended caps for the current source.
+        /// </summary>
+        /// <value>
+        /// The extended caps.
+        /// </value>
+        public ICapWrapper<CapabilityId> CapExtendedCaps
+        {
+            get
+            {
+                return _extendedCaps ?? (_extendedCaps = new CapWrapper<CapabilityId>(this, CapabilityId.CapExtendedCaps, ValueExtensions.ConvertToEnum<CapabilityId>,
+                    value => new TWOneValue
+                    {
+                        Item = (uint)value,
+                        ItemType = ItemType.UInt16
+                    }));
+            }
+        }
+
+        private CapWrapper<BoolType> _autoFeed;
+
+        /// <summary>
+        /// Gets the property to work with auto feed page flag for the current source.
+        /// </summary>
+        /// <value>
+        /// The auto feed flag.
+        /// </value>
+        public ICapWrapper<BoolType> CapAutoFeed
+        {
+            get
+            {
+                return _autoFeed ?? (_autoFeed = new CapWrapper<BoolType>(this, CapabilityId.CapAutoFeed, ValueExtensions.ConvertToEnum<BoolType>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.Bool
+                        }));
+            }
+        }
+
         private CapWrapper<BoolType> _clearPage;
 
         /// <summary>
@@ -2204,6 +2222,27 @@ namespace NTwain
             }
         }
 
+        private CapWrapper<BoolType> _autoScan;
+
+        /// <summary>
+        /// Gets the property to work with auto scan page flag for the current source.
+        /// </summary>
+        /// <value>
+        /// The auto scan flag.
+        /// </value>
+        public ICapWrapper<BoolType> CapAutoScan
+        {
+            get
+            {
+                return _autoScan ?? (_autoScan = new CapWrapper<BoolType>(this, CapabilityId.CapAutoScan, ValueExtensions.ConvertToEnum<BoolType>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.Bool
+                        }));
+            }
+        }
+
         private CapWrapper<BoolType> _thumbsEnabled;
 
         /// <summary>
@@ -2225,6 +2264,43 @@ namespace NTwain
             }
         }
 
+        private CapWrapper<Duplex> _duplex;
+
+        /// <summary>
+        /// Gets the property to see what's the duplex mode for the current source.
+        /// </summary>
+        /// <value>
+        /// The duplex mode.
+        /// </value>
+        public IReadOnlyCapWrapper<Duplex> CapDuplex
+        {
+            get
+            {
+                return _duplex ?? (_duplex = new CapWrapper<Duplex>(this, CapabilityId.CapDuplex, ValueExtensions.ConvertToEnum<Duplex>));
+            }
+        }
+
+        private CapWrapper<BoolType> _duplexEnabled;
+
+        /// <summary>
+        /// Gets the property to work with duplex enabled flag for the current source.
+        /// </summary>
+        /// <value>
+        /// The duplex enabled flag.
+        /// </value>
+        public ICapWrapper<BoolType> CapDuplexEnabled
+        {
+            get
+            {
+                return _duplexEnabled ?? (_duplexEnabled = new CapWrapper<BoolType>(this, CapabilityId.CapDuplexEnabled, ValueExtensions.ConvertToEnum<BoolType>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.Bool
+                        }));
+            }
+        }
+
         private CapWrapper<BoolType> _dsUIonly;
 
         /// <summary>
@@ -2257,6 +2333,27 @@ namespace NTwain
             }
         }
 
+        private CapWrapper<uint> _endorser;
+
+        /// <summary>
+        /// Gets the property to work with endorser for the current source.
+        /// </summary>
+        /// <value>
+        /// The endorser option.
+        /// </value>
+        public ICapWrapper<uint> CapEndorser
+        {
+            get
+            {
+                return _endorser ?? (_endorser = new CapWrapper<uint>(this, CapabilityId.CapEndorser, ValueExtensions.ConvertToEnum<uint>,
+                        value => new TWOneValue
+                        {
+                            Item = value,
+                            ItemType = ItemType.UInt32
+                        }));
+            }
+        }
+
         private CapWrapper<JobControl> _jobControl;
 
         /// <summary>
@@ -2278,6 +2375,27 @@ namespace NTwain
             }
         }
 
+        private CapWrapper<AlarmType> _alarms;
+
+        /// <summary>
+        /// Gets the property to work with alarms for the current source.
+        /// </summary>
+        /// <value>
+        /// The alarms.
+        /// </value>
+        public ICapWrapper<AlarmType> CapAlarms
+        {
+            get
+            {
+                return _alarms ?? (_alarms = new CapWrapper<AlarmType>(this, CapabilityId.CapAlarms, ValueExtensions.ConvertToEnum<AlarmType>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.UInt16
+                        }));
+            }
+        }
+
         private CapWrapper<int> _alarmVolume;
 
         /// <summary>
@@ -2299,27 +2417,202 @@ namespace NTwain
             }
         }
 
-        //private CapWrapper<int> _autoCapture;
+        private CapWrapper<int> _autoCapture;
 
-        ///// <summary>
-        ///// Gets the property to work with auto capture count for the current source.
-        ///// </summary>
-        ///// <value>
-        ///// The auto capture count.
-        ///// </value>
-        //public ICapWrapper<int> CapAutomaticCapture
-        //{
-        //    get
-        //    {
-        //        return _autoCapture ?? (_autoCapture = new CapWrapper<int>(this, CapabilityId.CapAutomaticCapture, ValueExtensions.ConvertToEnum<int>,
-        //                new TWCapability(CapabilityId.CapAutomaticCapture, new TWOneValue
-        //                {
-        //                    Item = (uint)value,
-        //                    ItemType = ItemType.Int32
-        //                }));
-        //    }
-        //}
+        /// <summary>
+        /// Gets the property to work with auto capture count for the current source.
+        /// </summary>
+        /// <value>
+        /// The auto capture count.
+        /// </value>
+        public ICapWrapper<int> CapAutomaticCapture
+        {
+            get
+            {
+                return _autoCapture ?? (_autoCapture = new CapWrapper<int>(this, CapabilityId.CapAutomaticCapture, ValueExtensions.ConvertToEnum<int>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.Int32
+                        }));
+            }
+        }
 
+        private CapWrapper<int> _timeBeforeCap;
+
+        /// <summary>
+        /// Gets the property to work with the time before first capture (milliseconds) for the current source.
+        /// </summary>
+        /// <value>
+        /// The time before first capture.
+        /// </value>
+        public ICapWrapper<int> CapTimeBeforeFirstCapture
+        {
+            get
+            {
+                return _timeBeforeCap ?? (_timeBeforeCap = new CapWrapper<int>(this, CapabilityId.CapTimeBeforeFirstCapture, ValueExtensions.ConvertToEnum<int>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.Int32
+                        }));
+            }
+        }
+
+        private CapWrapper<int> _timeBetweenCap;
+
+        /// <summary>
+        /// Gets the property to work with the time between captures (milliseconds) for the current source.
+        /// </summary>
+        /// <value>
+        /// The time between captures.
+        /// </value>
+        public ICapWrapper<int> CapTimeBetweenCaptures
+        {
+            get
+            {
+                return _timeBetweenCap ?? (_timeBetweenCap = new CapWrapper<int>(this, CapabilityId.CapTimeBetweenCaptures, ValueExtensions.ConvertToEnum<int>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.Int32
+                        }));
+            }
+        }
+
+        private CapWrapper<ClearBuffer> _clearBuff;
+
+        /// <summary>
+        /// Gets the property to work with the clear buffers option for the current source.
+        /// </summary>
+        /// <value>
+        /// The clear buffers option.
+        /// </value>
+        public ICapWrapper<ClearBuffer> CapClearBuffers
+        {
+            get
+            {
+                return _clearBuff ?? (_clearBuff = new CapWrapper<ClearBuffer>(this, CapabilityId.CapClearBuffers, ValueExtensions.ConvertToEnum<ClearBuffer>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.UInt16
+                        }));
+            }
+        }
+
+        private CapWrapper<uint> _maxBatchBuff;
+
+        /// <summary>
+        /// Gets the property to work with the max buffered pages for the current source.
+        /// </summary>
+        /// <value>
+        /// The max batch buffered pages.
+        /// </value>
+        public ICapWrapper<uint> CapMaxBatchBuffers
+        {
+            get
+            {
+                return _maxBatchBuff ?? (_maxBatchBuff = new CapWrapper<uint>(this, CapabilityId.CapMaxBatchBuffers, ValueExtensions.ConvertToEnum<uint>,
+                        value => new TWOneValue
+                        {
+                            Item = value,
+                            ItemType = ItemType.UInt32
+                        }));
+            }
+        }
+
+        // TODO: add CAP_DEVICETIMEDATE
+
+        private CapWrapper<PowerSupply> _powerSup;
+
+        /// <summary>
+        /// Gets the property to see current device's power supply.
+        /// </summary>
+        /// <value>
+        /// The power supply indicator.
+        /// </value>
+        public IReadOnlyCapWrapper<PowerSupply> CapPowerSupply
+        {
+            get
+            {
+                return _powerSup ?? (_powerSup = new CapWrapper<PowerSupply>(this, CapabilityId.CapPowerSupply, ValueExtensions.ConvertToEnum<PowerSupply>));
+            }
+        }
+
+        private CapWrapper<BoolType> _camPreviewUI;
+
+        /// <summary>
+        /// Gets the property to see whether device supports camera preview UI flag.
+        /// </summary>
+        /// <value>
+        /// The camera preview UI flag.
+        /// </value>
+        public IReadOnlyCapWrapper<BoolType> CapCameraPreviewUI
+        {
+            get
+            {
+                return _camPreviewUI ?? (_camPreviewUI = new CapWrapper<BoolType>(this, CapabilityId.CapCameraPreviewUI, ValueExtensions.ConvertToEnum<BoolType>));
+            }
+        }
+
+        private CapWrapper<DeviceEvent> _devEvent;
+
+        /// <summary>
+        /// Gets the property to work with the reported device events for the current source.
+        /// </summary>
+        /// <value>
+        /// The reported device events.
+        /// </value>
+        public ICapWrapper<DeviceEvent> CapDeviceEvent
+        {
+            get
+            {
+                return _devEvent ?? (_devEvent = new CapWrapper<DeviceEvent>(this, CapabilityId.CapDeviceEvent, ValueExtensions.ConvertToEnum<DeviceEvent>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.UInt16
+                        }));
+            }
+        }
+
+        private CapWrapper<string> _serialNo;
+
+        /// <summary>
+        /// Gets the property for device serial number.
+        /// </summary>
+        /// <value>
+        /// The device serial number.
+        /// </value>
+        public IReadOnlyCapWrapper<string> CapSerialNumber
+        {
+            get
+            {
+                return _serialNo ?? (_serialNo = new CapWrapper<string>(this, CapabilityId.CapSerialNumber, value => { return value.ToString(); }));
+            }
+        }
+
+        private CapWrapper<Printer> _printer;
+
+        /// <summary>
+        /// Gets the property to work printer list for the current source.
+        /// </summary>
+        /// <value>
+        /// The printer list.
+        /// </value>
+        public ICapWrapper<Printer> CapPrinter
+        {
+            get
+            {
+                return _printer ?? (_printer = new CapWrapper<Printer>(this, CapabilityId.CapPrinter, ValueExtensions.ConvertToEnum<Printer>,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,
+                            ItemType = ItemType.UInt16
+                        }));
+            }
+        }
 
         #endregion
 
diff --git a/NTwain/DataSource.cs b/NTwain/DataSource.cs
index 2267d21..7309a20 100644
--- a/NTwain/DataSource.cs
+++ b/NTwain/DataSource.cs
@@ -150,9 +150,9 @@ namespace NTwain
 
         static readonly CapabilityId[] _emptyCapList = new CapabilityId[0];
 
-        private IList<CapabilityId> _supportedCaps;
+        private IList<CapabilityId> _supportedCapsList;
         /// <summary>
-        /// Gets the supported caps for this source.
+        /// Gets the list of supported caps for this source.
         /// </summary>
         /// <value>
         /// The supported caps.
@@ -161,15 +161,15 @@ namespace NTwain
         {
             get
             {
-                if (_supportedCaps == null && _session.State > 3)
+                if (_supportedCapsList == null && _session.State > 3)
                 {
-                    _supportedCaps = CapGet(CapabilityId.CapSupportedCaps).CastToEnum<CapabilityId>(false);
+                    _supportedCapsList = CapSupportedCaps.Get();// CapGet(CapabilityId.CapSupportedCaps).CastToEnum<CapabilityId>(false);
                 }
-                return _supportedCaps ?? _emptyCapList;
+                return _supportedCapsList ?? _emptyCapList;
             }
             private set
             {
-                _supportedCaps = value;
+                _supportedCapsList = value;
                 //OnPropertyChanged("SupportedCaps");
             }
         }
diff --git a/Tests/Tester.WPF/MainWindow.xaml.cs b/Tests/Tester.WPF/MainWindow.xaml.cs
index 3db6fc6..cfb3db0 100644
--- a/Tests/Tester.WPF/MainWindow.xaml.cs
+++ b/Tests/Tester.WPF/MainWindow.xaml.cs
@@ -138,16 +138,16 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
                         break;
                     case CapabilityId.CapAutoFeed:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapAutoFeed.Get();
                         break;
                     case CapabilityId.CapAutomaticCapture:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapAutomaticCapture.Get();
                         break;
                     case CapabilityId.CapAutomaticSenseMedium:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
                         break;
                     case CapabilityId.CapAutoScan:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapAutoScan.Get();
                         break;
                     case CapabilityId.CapBatteryMinutes:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
@@ -162,7 +162,7 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
                         break;
                     case CapabilityId.CapCameraPreviewUI:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapCameraPreviewUI.Get();
                         break;
                     case CapabilityId.CapCameraSide:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<CameraSide>();
@@ -171,7 +171,7 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
                         break;
                     case CapabilityId.CapClearBuffers:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<ClearBuffer>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapClearBuffers.Get();
                         break;
                     case CapabilityId.CapClearPage:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapClearPage.Get();
@@ -183,7 +183,7 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
                         break;
                     case CapabilityId.CapDeviceEvent:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<DeviceEvent>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapDeviceEvent.Get();
                         break;
                     case CapabilityId.CapDeviceOnline:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapDeviceOnline.Get();
@@ -213,10 +213,10 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapEnableDSUIOnly.Get();
                         break;
                     case CapabilityId.CapEndorser:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapEndorser.Get();
                         break;
                     case CapabilityId.CapExtendedCaps:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapExtendedCaps.Get();
                         break;
                     case CapabilityId.CapFeederAlignment:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<FeederAlignment>();
@@ -252,7 +252,7 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<Language>();
                         break;
                     case CapabilityId.CapMaxBatchBuffers:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapMaxBatchBuffers.Get();
                         break;
                     case CapabilityId.CapMicrEnabled:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
@@ -267,10 +267,10 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
                         break;
                     case CapabilityId.CapPowerSupply:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<PowerSupply>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapPowerSupply.Get();
                         break;
                     case CapabilityId.CapPrinter:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<Printer>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapPrinter.Get();
                         break;
                     case CapabilityId.CapPrinterCharRotation:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
@@ -324,10 +324,10 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<Segmented>();
                         break;
                     case CapabilityId.CapSerialNumber:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapSerialNumber.Get();
                         break;
                     case CapabilityId.CapSupportedCaps:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<CapabilityId>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapSupportedCaps.Get();
                         break;
                     case CapabilityId.CapSupportedCapsSegmentUnique:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
@@ -339,10 +339,10 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapThumbnailsEnabled.Get();
                         break;
                     case CapabilityId.CapTimeBeforeFirstCapture:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapTimeBeforeFirstCapture.Get();
                         break;
                     case CapabilityId.CapTimeBetweenCaptures:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapTimeBetweenCaptures.Get();
                         break;
                     case CapabilityId.CapTimeDate:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
diff --git a/Tests/Tester.WPF/Tester.WPF.csproj b/Tests/Tester.WPF/Tester.WPF.csproj
index eadff1d..874ee2f 100644
--- a/Tests/Tester.WPF/Tester.WPF.csproj
+++ b/Tests/Tester.WPF/Tester.WPF.csproj
@@ -45,7 +45,7 @@
   <ItemGroup>
     <Reference Include="CommonWin32, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a0a4edcfe233918d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\CommonWin32.2.0.5.4\lib\net35-Client\CommonWin32.dll</HintPath>
+      <HintPath>..\..\packages\CommonWin32.2.0.5.5\lib\net35-Client\CommonWin32.dll</HintPath>
     </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.0.2.32240, Culture=neutral, PublicKeyToken=0e453835af4ee6ce, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/Tests/Tester.WPF/packages.config b/Tests/Tester.WPF/packages.config
index 38c632e..76a130e 100644
--- a/Tests/Tester.WPF/packages.config
+++ b/Tests/Tester.WPF/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.3" targetFramework="net40-Client" />
-  <package id="CommonWin32" version="2.0.5.4" targetFramework="net40-Client" />
+  <package id="CommonWin32" version="2.0.5.5" targetFramework="net40-Client" />
   <package id="ModernWPF" version="1.2.8" targetFramework="net40-Client" />
   <package id="MvvmLightLibs" version="5.0.2.0" targetFramework="net40-Client" />
 </packages>
\ No newline at end of file
diff --git a/Tests/Tester.Winform/Tester.Winform.csproj b/Tests/Tester.Winform/Tester.Winform.csproj
index e81a038..125cb95 100644
--- a/Tests/Tester.Winform/Tester.Winform.csproj
+++ b/Tests/Tester.Winform/Tester.Winform.csproj
@@ -40,7 +40,7 @@
   <ItemGroup>
     <Reference Include="CommonWin32, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a0a4edcfe233918d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\CommonWin32.2.0.5.4\lib\net35-Client\CommonWin32.dll</HintPath>
+      <HintPath>..\..\packages\CommonWin32.2.0.5.5\lib\net35-Client\CommonWin32.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
diff --git a/Tests/Tester.Winform/packages.config b/Tests/Tester.Winform/packages.config
index e978129..23005ef 100644
--- a/Tests/Tester.Winform/packages.config
+++ b/Tests/Tester.Winform/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonWin32" version="2.0.5.4" targetFramework="net35-Client" />
+  <package id="CommonWin32" version="2.0.5.5" targetFramework="net35-Client" />
 </packages>
\ No newline at end of file