Added more tooltips