Changed ToolHandler