Adding remote image support