Add selective image fetching