Adapted to changed constructor of Drive.