Added more to tooltips