Update and test to support image downloading.