Uploader and downloader optimizations