Updated to follow the new driver interface.