Image: perfs improvement