Added hovered item support, need to put it in the master branch