Improved ToolSet class