Use ToolHandler 2.5