Improve download & extract tasks