ToolItem refactoring