Improved HWDBClient