Add more detail to the driver functions