Updates to the driver model