Refactor, using the new download manager wrapper.