Updated to use common download infrastructure