Fix the download and add to UseCaseUtils