Improvement to Generic driver.