CON-420: Changed way to fetch images