Added ToolTips and additional group support.