Further improving drive API