Improved ToolVersion creation