Add changes to Driver class