Reworked image fetching