Added more to ToolConfig