Applied new download API more globally
Added new download API more globally again