Updated Driver structure