diff --git a/tools.json b/tools.json
index 1d47dd0..e22ec19 100644
--- a/tools.json
+++ b/tools.json
@@ -7770,7 +7770,7 @@
     {
       "name": "SBOMDiff",
       "publisher": "Anthony Harrison",
-      "description": "SBOMDiff is an Apache-2.0 CLI that compares two SBOM files (CycloneDX 1.4 or SPDX 2.3), highlighting package additions, removals, version or license changes, and outputs text, JSON or YAML reports.",
+      "description": "SBOMDiff is an Apache-2.0 CLI that compares two SBOM files (CycloneDX or SPDX), highlighting package additions, removals, version or license changes, and outputs text, JSON or YAML reports.",
       "repository_url": "https://github.com/anthonyharrison/sbomdiff",
       "website_url": "https://pypi.org/project/sbomdiff/",
       "capabilities": [
@@ -7799,6 +7799,7 @@
         "WINDOWS"
       ],
       "lifecycle": [
+        "BUILD",
         "POST-BUILD"
       ],
       "supportedStandards": [
@@ -7806,6 +7807,8 @@
         "SPDX"
       ],
       "cycloneDxVersion": [
+        "CYCLONEDX_V1.6",
+        "CYCLONEDX_V1.5",
         "CYCLONEDX_V1.4"
       ]
     },
@@ -7845,6 +7848,7 @@
       ],
       "lifecycle": [
         "PRE-BUILD",
+        "BUILD",
         "POST-BUILD"
       ],
       "supportedStandards": [
@@ -7852,7 +7856,9 @@
         "SPDX"
       ],
       "cycloneDxVersion": [
-        "CYCLONEDX_V1.5"
+        "CYCLONEDX_V1.6",
+        "CYCLONEDX_V1.5",
+        "CYCLONEDX_V1.4"
       ],
       "supportedLanguages": [
         "PYTHON"
@@ -7887,18 +7893,22 @@
         "WINDOWS"
       ],
       "lifecycle": [
-        "BUILD",
-        "POST-BUILD"
+        "PRE-BUILD"
       ],
       "supportedStandards": [
         "CYCLONEDX",
         "SPDX"
-      ]
+      ],
+      "cycloneDxVersion": [
+        "CYCLONEDX_V1.6",
+        "CYCLONEDX_V1.5",
+        "CYCLONEDX_V1.4"
+      ],
     },
     {
       "name": "SBOM4Rust",
       "publisher": "Anthony Harrison",
-      "description": "CLI that reads Cargo.lock and authors CycloneDX v1.6 or SPDX SBOMs for Rust projects.",
+      "description": "CLI that reads Cargo.lock and authors CycloneDX or SPDX SBOMs for Rust projects.",
       "repository_url": "https://github.com/anthonyharrison/sbom4rust",
       "website_url": "https://github.com/anthonyharrison/sbom4rust",
       "capabilities": [
@@ -7924,14 +7934,17 @@
         "WINDOWS"
       ],
       "lifecycle": [
-        "PRE-BUILD"
+        "BUILD",
+        "POST-BUILD"
       ],
       "supportedStandards": [
         "CYCLONEDX",
         "SPDX"
       ],
       "cycloneDxVersion": [
-        "CYCLONEDX_V1.6"
+        "CYCLONEDX_V1.6",
+        "CYCLONEDX_V1.5",
+        "CYCLONEDX_V1.4"
       ],
       "supportedLanguages": [
         "RUST"
@@ -7977,13 +7990,15 @@
         "SPDX"
       ],
       "cycloneDxVersion": [
-        "CYCLONEDX_V1.5"
+        "CYCLONEDX_V1.6",
+        "CYCLONEDX_V1.5",
+        "CYCLONEDX_V1.4"
       ]
     },
     {
       "name": "SBOM-Manager",
       "publisher": "Anthony Harrison",
-      "description": "SBOM-Manager is an open-source Python CLI that stores, queries, and scans CycloneDX 1.4/1.5 and SPDX 2.3 SBOMs via a local repository to support audit and vulnerability investigations.",
+      "description": "SBOM-Manager is an open-source Python CLI that stores, queries, and scans CycloneDX and SPDX SBOMs via a local repository to support audit and vulnerability investigations.",
       "repository_url": "https://github.com/anthonyharrison/sbom-manager",
       "website_url": "https://pypi.org/project/sbom-manager/",
       "capabilities": [
@@ -8020,6 +8035,7 @@
         "SPDX"
       ],
       "cycloneDxVersion": [
+        "CYCLONEDX_V1.6",
         "CYCLONEDX_V1.5",
         "CYCLONEDX_V1.4"
       ]
@@ -8069,15 +8085,16 @@
       "cycloneDxVersion": [
         "CYCLONEDX_V1.6",
         "CYCLONEDX_V1.5",
-        "CYCLONEDX_V1.4",
-        "CYCLONEDX_V1.3"
+        "CYCLONEDX_V1.4"
       ],
       "supportedLanguages": [
         "GO",
         "JAVA",
         "JAVASCRIPT/TYPESCRIPT",
         ".NET",
+        "NODE.JS",
         "PERL",
+        "PHP",
         "PYTHON",
         "RUBY",
         "RUST",
@@ -8121,10 +8138,15 @@
       ],
       "supportedStandards": [
         "CYCLONEDX",
-        "SPDX"
+        "SPDX",
+        "CPE",
+        "PACKAGE_URL"
       ],
-      "cycloneDxVersion": [],
-      "supportedLanguages": []
+      "cycloneDxVersion": [
+        "CYCLONEDX_V1.6",
+        "CYCLONEDX_V1.5",
+        "CYCLONEDX_V1.4"
+      ]
     },
     {
       "name": "SBOM2dot",
@@ -8166,26 +8188,15 @@
         "SPDX"
       ],
       "cycloneDxVersion": [
+        "CYCLONEDX_V1.6",
         "CYCLONEDX_V1.5",
         "CYCLONEDX_V1.4"
-      ],
-      "supportedLanguages": [
-        "C/C++",
-        "GO",
-        "JAVA",
-        "JAVASCRIPT/TYPESCRIPT",
-        ".NET",
-        "NODE.JS",
-        "PHP",
-        "PYTHON",
-        "RUBY",
-        "RUST"
       ]
     },
     {
       "name": "SBOMMerge",
       "publisher": "Anthony Harrison",
-      "description": "Command-line utility that merges two SBOM files, supporting CycloneDX and SPDX inputs and outputs in tag, JSON or YAML formats.",
+      "description": "Command-line utility that merges two SBOM files, supporting CycloneDX and SPDX SBOMs and outputs in tag, JSON or YAML formats.",
       "repository_url": "https://github.com/anthonyharrison/sbommerge",
       "website_url": "https://pypi.org/project/sbommerge/",
       "capabilities": [
@@ -8221,6 +8232,7 @@
         "SPDX"
       ],
       "cycloneDxVersion": [
+        "CYCLONEDX_V1.6",
         "CYCLONEDX_V1.5",
         "CYCLONEDX_V1.4"
       ]
@@ -8228,11 +8240,14 @@
     {
       "name": "Lib4sbom",
       "publisher": "Anthony Harrison",
-      "description": "Python library that parses, converts and generates SBOMs in CycloneDX and SPDX formats, allowing JSON, Tag, YAML and XML serialization and programmatic manipulation of packages, files and dependencies.",
+      "description": "Python library that parses, validates, converts and generates xBOMs in CycloneDX and SPDX formats, allowing JSON, Tag, YAML and XML serialization and programmatic manipulation of packages, files and dependencies.",
       "repository_url": "https://github.com/anthonyharrison/lib4sbom",
       "website_url": "https://pypi.org/project/lib4sbom/",
       "capabilities": [
-        "SBOM"
+        "AI/ML-BOM",
+        "OBOM",
+        "SBOM",
+        "VDR/VEX"
       ],
       "availability": [
         "OPEN_SOURCE",
@@ -8264,6 +8279,11 @@
       "supportedStandards": [
         "CYCLONEDX",
         "SPDX"
+      ],
+      "cycloneDxVersion": [
+        "CYCLONEDX_V1.6",
+        "CYCLONEDX_V1.5",
+        "CYCLONEDX_V1.4"
       ]
     },
     {
@@ -10971,6 +10991,7 @@
         "WINDOWS"
       ],
       "lifecycle": [
+        "BUILD",
         "POST-BUILD"
       ],
       "supportedStandards": [
@@ -10978,7 +10999,9 @@
         "SPDX"
       ],
       "cycloneDxVersion": [
-        "CYCLONEDX_V1.5"
+        "CYCLONEDX_V1.4",
+        "CYCLONEDX_V1.5",
+        "CYCLONEDX_V1.6"
       ],
       "supportedLanguages": [
         "PYTHON"