Better gdrive support