Added Support for tool tips