Added hover support