Added support for tooltips