Added support for tooltip