API simplified
driver() removed
updates