Add seletedImage property + highlight management