Updated Driver class