Added to the Driver and Parse classes