Refactored GoogleDriveClient