Updated download impl