Improve ESR downloads