framework-mcp 2.4.2 → 2.4.4

package/dist/core/safeguard-manager.js

@@ -1016,7 +1016,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain a Data Management Process",
                 description: "Establish and maintain a documented data management process. In the process, address data sensitivity, data owner, handling of data, data retention limits, and disposal requirements, based on sensitivity and retention standards for the enterprise. Review and update documentation annually, or when significant enterprise changes occur that could impact this Safeguard.",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "Establish",
@@ -1024,20 +1024,15 @@ export class SafeguardManager {
                     "Review and update documentation annually, or when significant enterprise changes occur that could impact this Safeguard"
                 ],
                 coreRequirements: [
-                    "documented data management process",
-                    "address data sensitivity, data owner, handling of data, data retention limits, and disposal requirements, based on sensitivity and retention standards for the enterprise"
+                    "documented data management process"
                 ],
                 subTaxonomicalElements: [
-                    "Documented Data management process",
                     "Data Sensitivity",
                     "Data Owner",
                     "Data Handling",
                     "Data Retention Limits",
                     "Disposal Requirements",
-                    "Retention Standards",
-                    "Review and update documentation",
-                    "Annually",
-                    "When significant enterprise changes occur that could impact this Safeguard"
+                    "Retention Standards"
                 ],
                 implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
@@ -1093,7 +1088,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain a Data Inventory",
                 description: "Establish and maintain a data inventory based on the enterprise's data management process. Inventory sensitive data, at a minimum. Review and update inventory annually, at a minimum, with a priority on sensitive data.",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Identify"],
                 governanceElements: [
                     "Establish",
@@ -1101,16 +1096,11 @@ export class SafeguardManager {
                     "Review and update inventory annually, at a minimum, with a priority on sensitive data"
                 ],
                 coreRequirements: [
-                    "data inventory based on the enterprise's data management process",
-                    "inventory sensitive data, at a minimum"
+                    "data inventory"
                 ],
                 subTaxonomicalElements: [
-                    "Data Inventory",
                     "Based on Data Management process",
-                    "Sensitive Data at a Minimum",
-                    "Review and update inventory",
-                    "Annually, at a minimum",
-                    "Priority on sensitive data"
+                    "Sensitive Data at a Minimum"
                 ],
                 implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
@@ -1166,14 +1156,13 @@ export class SafeguardManager {
                 title: "Configure Data Access Control Lists",
                 description: "Configure data access control lists based on a user's need to know. Apply data access control lists, also known as access permissions, to local and remote file systems, databases, and applications.",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
-                    "Configure",
-                    "Apply data access control lists, also known as access permissions, to local and remote file systems, databases, and applications"
+                    "Configure"
                 ],
                 coreRequirements: [
-                    "data access control lists based on a user's need to know"
+                    "data access control lists"
                 ],
                 subTaxonomicalElements: [
                     "Data Access control lists",
@@ -1238,7 +1227,7 @@ export class SafeguardManager {
                 title: "Enforce Data Retention",
                 description: "Retain data according to the enterprise's documented data management process. Data retention must include both minimum and maximum timelines.",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Retain",
@@ -1251,7 +1240,6 @@ export class SafeguardManager {
                 ],
                 subTaxonomicalElements: [
                     "Data Retention",
-                    "Must Include",
                     "Minimum Timelines",
                     "Maximum timelines"
                 ],
@@ -1309,19 +1297,17 @@ export class SafeguardManager {
                 title: "Securely Dispose of Data",
                 description: "Securely dispose of data as outlined in the enterprise's data management process. Ensure the disposal process and method are commensurate with the data sensitivity.",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
-                    "Securely dispose of data",
+                    "Disposal process and method are commensurate with the data sensitivity",
                     "Ensure"
                 ],
                 coreRequirements: [
-                    "as outlined in the enterprise's data management process",
-                    "the disposal process and method are commensurate with the data sensitivity"
+                    "Securely Dispose of Data"
                 ],
                 subTaxonomicalElements: [
-                    "Securely dispose of data",
-                    "Disposal process and method are commensurate with the data sensitivity"
+                    "Securely dispose of Data"
                 ],
                 implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
@@ -1377,17 +1363,17 @@ export class SafeguardManager {
                 title: "Encrypt Data on End-User Devices",
                 description: "Encrypt data on end-user devices containing sensitive data. Example implementations can include: Windows BitLocker®, Apple FileVault®, Linux® dm-crypt.",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Encrypt"
                 ],
                 coreRequirements: [
-                    "data on end-user devices containing sensitive data"
+                    "data on end-user devices"
                 ],
                 subTaxonomicalElements: [
                     "Data on end-user devices",
-                    "Sensitive data"
+                    "that contain Sensitive data"
                 ],
                 implementationSuggestions: [
                     "Windows Bitlocker",
@@ -1446,7 +1432,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain a Data Classification Scheme",
                 description: "Establish and maintain an overall data classification scheme for the enterprise. Enterprises may use labels, such as \"Sensitive,\" \"Confidential,\" and \"Public,\" and classify their data according to those labels. Review and update the classification scheme annually, or when significant enterprise changes occur that could impact this Safeguard.",
                 implementationGroup: "IG2",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Identify"],
                 governanceElements: [
                     "Establish",
@@ -1454,15 +1440,10 @@ export class SafeguardManager {
                     "Review and update the classification scheme annually, or when significant enterprise changes occur that could impact this Safeguard"
                 ],
                 coreRequirements: [
-                    "overall data classification scheme for the enterprise",
-                    "classify their data according to those labels"
+                    "data classification scheme"
                 ],
                 subTaxonomicalElements: [
-                    "Data classification scheme",
-                    "Classify their data according to labels",
-                    "Review and update classification scheme",
-                    "Annually",
-                    "When significant enterprise changes occur that could impact this Safeguard"
+                    "Classify their data according to labels"
                 ],
                 implementationSuggestions: [
                     "Sensitive",
@@ -1521,27 +1502,19 @@ export class SafeguardManager {
                 title: "Document Data Flows",
                 description: "Document data flows. Data flow documentation includes service provider data flows and should be based on the enterprise's data management process. Review and update documentation annually, or when significant enterprise changes occur that could impact this Safeguard.",
                 implementationGroup: "IG2",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Identify"],
                 governanceElements: [
-                    "Document data flows",
-                    "Review and update documentation annually, or when significant enterprise changes occur that could impact this Safeguard"
+                    "Document data flows"
                 ],
                 coreRequirements: [
-                    "Data flow documentation includes service provider data flows and should be based on the enterprise's data management process"
+                    "Document Data Flows"
                 ],
                 subTaxonomicalElements: [
-                    "Document data flows",
                     "Enterprise Data Flows",
-                    "Service Provider Data Flows",
-                    "Review and update documentation",
-                    "Annually",
-                    "When significant enterprise changes occur that could impact this Safeguard"
+                    "Service Provider Data Flows"
                 ],
-                implementationSuggestions: [
-                    "Data management systems",
-                    "Data flow mapping tools",
-                    "Service provider documentation"
+                implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
                 relatedSafeguards: ["3.1", "3.2", "3.7", "3.9", "3.10", "3.11"],
                 systemPromptFull: {
@@ -1595,16 +1568,16 @@ export class SafeguardManager {
                 title: "Encrypt Data on Removable Media",
                 description: "Encrypt Data on Removable Media",
                 implementationGroup: "IG2",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
-                    "Encrypt Data on Removable Media"
+                    "Encrypt"
                 ],
-                coreRequirements: [ // Green - The "what"
+                coreRequirements: [
+                    "Encrypt Data on Removable Media"
                 ],
                 subTaxonomicalElements: [
                     "Data on Removable Media",
-                    "Maintain"
                 ],
                 implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
@@ -1660,13 +1633,13 @@ export class SafeguardManager {
                 title: "Encrypt Sensitive Data in Transit",
                 description: "Encrypt sensitive data in transit. Example implementations can include: Transport Layer Security (TLS) and Open Secure Shell (OpenSSH).",
                 implementationGroup: "IG2",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Encrypt"
                 ],
                 coreRequirements: [
-                    "sensitive data in transit"
+                    "Encrypt sensitive data in transit"
                 ],
                 subTaxonomicalElements: [
                     "Sensitive data in transit"
@@ -1727,23 +1700,21 @@ export class SafeguardManager {
                 title: "Encrypt Sensitive Data at Rest",
                 description: "Encrypt sensitive data at rest on servers, applications, and databases. Storage-layer encryption, also known as server-side encryption, meets the minimum requirement of this Safeguard. Additional encryption methods may include application-layer encryption, also known as client-side encryption, where access to the data storage device(s) does not permit access to the plain-text data.",
                 implementationGroup: "IG2",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Encrypt",
-                    "meets the minimum requirement of this Safeguard"
+                    "Minimum Requirement"
                 ],
                 coreRequirements: [
-                    "sensitive data at rest on servers, applications, and databases",
-                    "Storage-layer encryption, also known as server-side encryption"
+                    "Encrypt sensitive data at rest"
                 ],
                 subTaxonomicalElements: [
-                    "Encrypt Sensitive Data At Rest",
+                    "Sensitive Data At Rest",
                     "Servers",
-                    "Software",
+                    "Applications",
                     "Databases",
-                    "Storage Layer (server side) encryption",
-                    "Minimum Requirement"
+                    "Storage Layer (server side) encryption"
                 ],
                 implementationSuggestions: [
                     "Application layer (client-side) encryption",
@@ -1801,19 +1772,17 @@ export class SafeguardManager {
                 title: "Segment Data Processing and Storage Based on Sensitivity",
                 description: "Segment data processing and storage based on the sensitivity of the data. Do not process sensitive data on enterprise assets intended for lower sensitivity data.",
                 implementationGroup: "IG2",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
-                    "Segment data processing and storage based on the sensitivity of the data",
                     "Do not process sensitive data on enterprise assets intended for lower sensitivity data"
                 ],
-                coreRequirements: [ // Green - The "what"
+                coreRequirements: [
+                    "Segment Data Processing",
+                    "Segment Data Storage",
+                    "Based on Sensitivity"
                 ],
-                subTaxonomicalElements: [
-                    "Based on the sensitivity of data",
-                    "Segment data processing (compute)",
-                    "Segment Storage",
-                    "Do not process sensitive data on enterprise assets intended for lower sensitivity data"
+                subTaxonomicalElements: [ // Yellow - Sub-taxonomical elements
                 ],
                 implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
@@ -1869,17 +1838,15 @@ export class SafeguardManager {
                 title: "Deploy a Data Loss Prevention Solution",
                 description: "Implement an automated tool, such as a host-based Data Loss Prevention (DLP) tool to identify all sensitive data stored, processed, or transmitted through enterprise assets, including those located onsite or at a remote service provider, and update the enterprise's data inventory.",
                 implementationGroup: "IG3",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
-                    "Implement",
-                    "Update Data Inventory"
+                    "Implement"
                 ],
                 coreRequirements: [
-                    "automated tool to identify all sensitive data stored, processed, or transmitted through enterprise assets, including those located onsite or at a remote service provider"
+                    "automated tool to identify all sensitive data"
                 ],
                 subTaxonomicalElements: [
-                    "Automated DLP Tool",
                     "Identify all sensitive Data",
                     "Stored",
                     "Processed",
@@ -1943,19 +1910,15 @@ export class SafeguardManager {
                 title: "Log Sensitive Data Access",
                 description: "Log sensitive data access, including modification and disposal.",
                 implementationGroup: "IG3",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "Log"
                 ],
                 coreRequirements: [
-                    "sensitive data access, including modification and disposal"
+                    "Log sensitive data access, including modification and disposal"
                 ],
-                subTaxonomicalElements: [
-                    "Sensitive Data access",
-                    "Access",
-                    "Modification",
-                    "Disposal"
+                subTaxonomicalElements: [ // Yellow - Sub-taxonomical elements
                 ],
                 implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
@@ -2011,19 +1974,17 @@ export class SafeguardManager {
                 title: "Establish and Maintain a Secure Configuration Process",
                 description: "Establish and maintain a documented secure configuration process for enterprise assets (end-user devices, including portable and mobile; non-computing/IoT devices; and servers) and software (operating systems and applications). Review and update documentation annually, or when significant enterprise changes occur that could impact this Safeguard.",
                 implementationGroup: "IG1",
-                assetType: ["end-user devices", "network devices", "IoT devices", "servers", "Software"],
+                assetType: ["Docuemntation"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "Establish",
                     "Maintain",
-                    "Documented Secure Configuration Process",
                     "Review and update documentation",
                     "Annually",
                     "When significant enterprise changes occur that could impact this Safeguard"
                 ],
                 coreRequirements: [
-                    "documented secure configuration process for enterprise assets",
-                    "documented secure configuration process for software"
+                    "documented secure configuration process"
                 ],
                 subTaxonomicalElements: [
                     "Enterprise assets",
@@ -2033,12 +1994,9 @@ export class SafeguardManager {
                     "Portable",
                     "Non-computing/IoT devices",
                     "Servers",
-                    "OS",
-                    "Software"
+                    "OS"
                 ],
-                implementationSuggestions: [
-                    "Secure Configuration Policy / Process",
-                    "Configuration Management Tool"
+                implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
                 relatedSafeguards: ["1.1", "2.1", "4.2", "4.3", "4.4", "4.5", "4.6", "4.7", "4.8", "4.9", "4.10", "4.11", "4.12"],
                 systemPromptFull: {
@@ -2092,25 +2050,22 @@ export class SafeguardManager {
                 title: "Establish and Maintain a Secure Configuration Process for Network Infrastructure",
                 description: "Establish and maintain a documented secure configuration process for network devices. Review and update documentation annually, or when significant enterprise changes occur that could impact this Safeguard.",
                 implementationGroup: "IG1",
-                assetType: ["network devices"],
+                assetType: ["Documentation"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "Establish",
                     "Maintain",
-                    "Documented Secure Network Configuration Process",
                     "Review and update documentation",
                     "Annually",
                     "When significant enterprise changes occur that could impact this Safeguard"
                 ],
                 coreRequirements: [
-                    "documented secure configuration process for network devices"
+                    "documented secure configuration process"
                 ],
                 subTaxonomicalElements: [
                     "Network devices"
                 ],
-                implementationSuggestions: [
-                    "Secure Configuration Policy / Process",
-                    "Configuration Management Tool"
+                implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
                 relatedSafeguards: ["1.1", "2.1", "3.10", "4.1", "6.4", "8.1", "12.1", "12.2", "12.3", "12.4", "12.5", "13.3", "13.4", "13.6", "13.8", "13.9", "13.10"],
                 systemPromptFull: {
@@ -2164,7 +2119,7 @@ export class SafeguardManager {
                 title: "Configure Automatic Session Locking on Enterprise Assets",
                 description: "Configure automatic session locking on enterprise assets after a defined period of inactivity. For general purpose operating systems, the period Must Not Exceed 15 minutes. For mobile end-user devices, the period must not exceed 2 minutes.",
                 implementationGroup: "IG1",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Configure",
@@ -2172,18 +2127,14 @@ export class SafeguardManager {
                     "Period must not exceed for 2 Minutes"
                 ],
                 coreRequirements: [
-                    "automatic session locking on enterprise assets after a defined period of inactivity",
-                    "general purpose operating systems",
-                    "mobile end-user devices"
+                    "automatic session locking on enterprise assets"
                 ],
                 subTaxonomicalElements: [
-                    "Automatic Session Locking",
                     "Period of inactivity",
                     "General Purpose OSs",
                     "Mobile end-user devices"
                 ],
-                implementationSuggestions: [
-                    "Configuration Management Tool"
+                implementationSuggestions: [ // Gray - Implementation suggestions
                 ],
                 relatedSafeguards: ["4.1"],
                 systemPromptFull: {
@@ -2237,7 +2188,7 @@ export class SafeguardManager {
                 title: "Implement and Manage a Firewall on Servers",
                 description: "Implement and manage a firewall on servers, where supported. Example implementations include a virtual firewall, operating system firewall, or a third-party firewall agent.",
                 implementationGroup: "IG1",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Implement",
@@ -2254,8 +2205,6 @@ export class SafeguardManager {
                     "Virtual Firewall",
                     "OS Firewall",
                     "Third Party Firewall",
-                    "Firewall",
-                    "Configuration Management Tool"
                 ],
                 relatedSafeguards: ["4.1"],
                 systemPromptFull: {
@@ -2309,21 +2258,18 @@ export class SafeguardManager {
                 title: "Implement and Manage a Firewall on End-User Devices",
                 description: "Implement and manage a host-based firewall or port-filtering tool on end-user devices, with a default-deny rule that drops all traffic except those services and ports that are explicitly allowed.",
                 implementationGroup: "IG1",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Implement",
-                    "Manage",
-                    "Default deny rule that drops all traffic",
-                    "Except Explicitly Allowed"
+                    "Manage"
                 ],
                 coreRequirements: [
                     "host-based firewall or port-filtering tool on end-user devices"
                 ],
                 subTaxonomicalElements: [
-                    "Host-based Firewall",
-                    "Port Filtering Tool",
-                    "End User Devices",
+                    "Default Deny Rule that drops all traffic",
+                    "Except Explicitly Allowed",
                     "Services",
                     "Ports"
                 ],
@@ -2383,7 +2329,7 @@ export class SafeguardManager {
                 title: "Securely Manage Enterprise Assets and Software",
                 description: "Securely manage enterprise assets and software. Example implementations include managing configuration through version-controlled- Infrastructure-as-Code (IaC) and accessing administrative interfaces over secure network protocols, such as Secure Shell (SSH) and Hypertext Transfer Protocol Secure (HTTPS). Do not use insecure management protocols, such as Telnet (Teletype Network) and HTTP, unless operationally essential.",
                 implementationGroup: "IG1",
-                assetType: ["devices", "Software"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Do not use insecure management protocols",
@@ -2393,16 +2339,14 @@ export class SafeguardManager {
                     "Securely manage enterprise assets and software"
                 ],
                 subTaxonomicalElements: [
-                    "Securely manage enterprise assets and software"
+                    "Securely manage enterprise assets and software",
+                    "Do not use insecure management protocols unless operationally essential"
                 ],
                 implementationSuggestions: [
                     "Manage configuration through version-controlled Infrastructure-as-Code (IaC)",
                     "Accessing administrative interfaces over secure network protocols",
-                    "SSH",
-                    "HTTPS",
-                    "Telnet (Teletype Network)",
-                    "HTTP",
-                    "Configuration Management Tool"
+                    "SSH instead of TELNET",
+                    "HTTPS instead of HTTP",
                 ],
                 relatedSafeguards: ["4.1", "12.3"],
                 systemPromptFull: {
@@ -2456,26 +2400,22 @@ export class SafeguardManager {
                 title: "Manage Default Accounts on Enterprise Assets and Software",
                 description: "Manage default accounts on enterprise assets and software, such as root, administrator, and other pre-configured vendor accounts. Example implementations can include: disabling default accounts or making them unusable.",
                 implementationGroup: "IG1",
-                assetType: ["devices", "Software", "users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Manage"
                 ],
                 coreRequirements: [
-                    "default accounts on enterprise assets and software"
+                    "default accounts"
                 ],
                 subTaxonomicalElements: [
-                    "Default accounts",
                     "Enterprise assets",
-                    "Software",
-                    "Root",
-                    "Administrator",
-                    "Other pre-configured vendor accounts"
+                    "Software"
                 ],
                 implementationSuggestions: [
-                    "Disabling",
-                    "Unusable",
-                    "Configuration Management Tool"
+                    "Disabling them",
+                    "making them Unusable",
+                    "Root, Administrator, or other pre-configured vendor accounts"
                 ],
                 relatedSafeguards: ["4.1"],
                 systemPromptFull: {
@@ -2529,25 +2469,23 @@ export class SafeguardManager {
                 title: "Uninstall or Disable Unnecessary Services on Enterprise Assets and Software",
                 description: "Uninstall or disable unnecessary services on enterprise assets and software, such as an unused file sharing service, web application module, or service function.",
                 implementationGroup: "IG2",
-                assetType: ["devices", "Software"],
+                assetType: ["Devices", "Software"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Uninstall",
                     "Disable"
                 ],
                 coreRequirements: [
-                    "unnecessary services on enterprise assets and software"
+                    "unnecessary services"
                 ],
                 subTaxonomicalElements: [
-                    "Unnecessary Services",
                     "Enterprise assets",
-                    "Software",
-                    "Unused file sharing service",
-                    "Web application module",
-                    "Service function"
+                    "Software"
                 ],
                 implementationSuggestions: [
-                    "Configuration Management Tool"
+                    "Unused File Sharing Services",
+                    "Web Application Module",
+                    "Service Function"
                 ],
                 relatedSafeguards: ["4.1"],
                 systemPromptFull: {
@@ -2601,22 +2539,20 @@ export class SafeguardManager {
                 title: "Configure Trusted DNS Servers on Enterprise Assets",
                 description: "Configure trusted DNS servers on enterprise assets. Example implementations include: configuring assets to use enterprise-controlled DNS servers and/or reputable externally accessible DNS servers.",
                 implementationGroup: "IG2",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Configure"
                 ],
                 coreRequirements: [
-                    "trusted DNS servers on enterprise assets"
+                    "trusted DNS servers"
                 ],
                 subTaxonomicalElements: [
-                    "Trusted DNS Servers",
                     "Enterprise assets"
                 ],
                 implementationSuggestions: [
                     "Configuring assets to use enterprise-controlled DNS servers",
-                    "Reputable externally accessible DNS servers",
-                    "Configuration Management Tool"
+                    "Reputable externally accessible DNS servers"
                 ],
                 relatedSafeguards: ["4.1", "8.6", "9.2"],
                 systemPromptFull: {
@@ -2670,7 +2606,7 @@ export class SafeguardManager {
                 title: "Enforce Automatic Device Lockout on Portable End-User Devices",
                 description: "Enforce automatic device lockout following a predetermined threshold of local failed authentication attempts on portable end-user devices, where supported. For laptops, do not allow more than 20 failed authentication attempts; for tablets and smartphones, no more than 10 failed authentication attempts. Example implementations include Microsoft® InTune Device Lock and Apple® Configuration Profile maxFailedAttempts.",
                 implementationGroup: "IG2",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Enforce",
@@ -2679,14 +2615,13 @@ export class SafeguardManager {
                     "No more than 10 Failed Authentication Attempts"
                 ],
                 coreRequirements: [
-                    "automatic device lockout following a predetermined threshold of local failed authentication attempts on portable end-user devices"
+                    "automatic device lockout"
                 ],
                 subTaxonomicalElements: [
-                    "Automatic Device Lockout",
-                    "Predetermined threshold of local failed authentication attempts",
-                    "Portable end-user devices",
-                    "Laptops",
-                    "Tablets and smartphones"
+                    "After a Predetermined threshold of local failed authentication attempts",
+                    "On Portable end-user devices",
+                    "Such as Laptops",
+                    "Such as Tablets and smartphones"
                 ],
                 implementationSuggestions: [
                     "Microsoft® InTune Device Lock",
@@ -2745,24 +2680,22 @@ export class SafeguardManager {
                 title: "Enforce Remote Wipe Capability on Portable End-User Devices",
                 description: "Remotely wipe enterprise data from enterprise-owned portable end-user devices when deemed appropriate such as lost or stolen devices, or when an individual no longer supports the enterprise.",
                 implementationGroup: "IG2",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "When deemed appropriate"
                 ],
                 coreRequirements: [
-                    "Remotely wipe enterprise data from enterprise-owned portable end-user devices"
+                    "Remotely wipe enterprise data"
                 ],
                 subTaxonomicalElements: [
-                    "Remotely Wipe enterprise data",
-                    "Portable end-user devices",
+                    "Portable end-user devices"
+                ],
+                implementationSuggestions: [
                     "Lost devices",
                     "Stolen devices",
                     "When an individual no longer supports the enterprise"
                 ],
-                implementationSuggestions: [
-                    "Configuration Management Tool"
-                ],
                 relatedSafeguards: ["4.1"],
                 systemPromptFull: {
                     role: "Vendor Description Assistant and expert on CIS Controls",
@@ -2815,7 +2748,7 @@ export class SafeguardManager {
                 title: "Separate Enterprise Workspaces on Mobile End-User Devices",
                 description: "Ensure separate enterprise workspaces are used on mobile end-user devices, where supported. Example implementations include using an Apple® Configuration Profile or AndroidTM Work Profile to separate enterprise applications and data from personal applications and data.",
                 implementationGroup: "IG3",
-                assetType: ["devices", "data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Ensure",
@@ -2825,17 +2758,12 @@ export class SafeguardManager {
                     "separate enterprise workspaces are used on mobile end-user devices"
                 ],
                 subTaxonomicalElements: [
-                    "Separate enterprise workspaces",
-                    "On Mobile Devices",
-                    "Enterprise Applications",
-                    "Enterprise Data",
-                    "Personal Applications",
-                    "Personal Data"
+                    "Enterprise Applications and Enterprise Data",
+                    "Seperate from Personal Applications and Personal Data"
                 ],
                 implementationSuggestions: [
                     "Apple® Configuration Profile",
-                    "AndroidTM Work Profile",
-                    "Configuration Management Tool"
+                    "AndroidTM Work Profile"
                 ],
                 relatedSafeguards: ["4.1"],
                 systemPromptFull: {
@@ -2889,7 +2817,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain an Inventory of Accounts",
                 description: "Establish and maintain an inventory of all accounts managed in the enterprise. The inventory must include both user and administrator accounts. The inventory, at a minimum, should contain the person's name, username, start/stop dates, and department. Validate that all active accounts are authorized, on a recurring schedule at a minimum quarterly, or more frequently.",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Identify"],
                 governanceElements: [
                     "Establish and maintain an inventory of all accounts managed in the enterprise",
@@ -2972,7 +2900,7 @@ export class SafeguardManager {
                 title: "Use Unique Passwords",
                 description: "Use unique passwords for all enterprise assets. Best practice implementation includes, at a minimum, an 8-character password for accounts using Multi-Factor Authentication (MFA) and a 14-character password for accounts not using MFA.",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Use unique passwords for all enterprise assets",
@@ -3044,7 +2972,7 @@ export class SafeguardManager {
                 title: "Disable Dormant Accounts",
                 description: "Delete or disable any dormant accounts after a period of 45 days of inactivity, where supported.",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Delete or disable any dormant accounts after a period of 45 days of inactivity, where supported"
@@ -3114,7 +3042,7 @@ export class SafeguardManager {
                 title: "Restrict Administrator Privileges to Dedicated Administrator Accounts",
                 description: "Restrict administrator privileges to dedicated administrator accounts on enterprise assets. Conduct general computing activities, such as internet browsing, email, and productivity suite use, from the user's primary, non-privileged account.",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Restrict administrator privileges to dedicated administrator accounts on enterprise assets",
@@ -3190,7 +3118,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain an Inventory of Service Accounts",
                 description: "Establish and maintain an inventory of service accounts. The inventory, at a minimum, must contain department owner, review date, and purpose. Perform service account reviews to validate that all active accounts are authorized, on a recurring schedule at a minimum quarterly, or more frequently.",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Identify"],
                 governanceElements: [
                     "Establish and maintain an inventory of service accounts",
@@ -3269,7 +3197,7 @@ export class SafeguardManager {
                 title: "Centralize Account Management",
                 description: "Centralize account management through a directory or identity service.",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "Centralize account management through a directory or identity service"
@@ -3339,7 +3267,7 @@ export class SafeguardManager {
                 title: "Establish an Access Granting Process",
                 description: "Establish and follow a documented process, preferably automated, for granting access to enterprise assets upon new hire or role change of a user.",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "Establish",
@@ -3416,7 +3344,7 @@ export class SafeguardManager {
                 title: "Establish an Access Revoking Process",
                 description: "Establish and follow a process, preferably automated, for revoking access to enterprise assets, through disabling accounts immediately upon termination, rights revocation, or role change of a user. Disabling accounts, instead of deleting accounts, may be necessary to preserve audit trails.",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "Establish",
@@ -3498,7 +3426,7 @@ export class SafeguardManager {
                 title: "Require MFA for Externally-Exposed Applications",
                 description: "Require all externally-exposed enterprise or third-party applications to enforce MFA, where supported. Enforcing MFA through a directory service or SSO provider is a satisfactory implementation of this Safeguard.",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Require",
@@ -3573,7 +3501,7 @@ export class SafeguardManager {
                 title: "Require MFA for Remote Network Access",
                 description: "Require MFA for remote network access.",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Require",
@@ -3643,7 +3571,7 @@ export class SafeguardManager {
                 title: "Require MFA for Administrative Access",
                 description: "Require MFA for all administrative access accounts, where supported, on all enterprise assets, whether managed on-site or through a service provider.",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Require",
@@ -3796,7 +3724,7 @@ export class SafeguardManager {
                 title: "Centralize Access Control",
                 description: "Centralize access control for all enterprise assets through a directory service or SSO provider, where supported.",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "Centralize",
@@ -3874,7 +3802,7 @@ export class SafeguardManager {
                 title: "Define and Maintain Role-Based Access Control",
                 description: "Define and maintain role-based access control, through determining and documenting the access rights necessary for each role within the enterprise to successfully carry out its assigned duties. Perform access control reviews of enterprise assets to validate that all privileges are authorized, on a recurring schedule at a minimum annually, or more frequently.",
                 implementationGroup: "IG3",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "Define",
@@ -4124,7 +4052,7 @@ export class SafeguardManager {
                 title: "Perform Automated Operating System Patch Management",
                 description: "Perform automated operating system patch management on enterprise assets",
                 implementationGroup: "IG1",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "perform automated OS patch management",
@@ -4288,7 +4216,7 @@ export class SafeguardManager {
                 title: "Perform Automated Vulnerability Scans of Internal Enterprise Assets",
                 description: "Perform automated vulnerability scans of internal enterprise assets on a quarterly or more frequent basis",
                 implementationGroup: "IG2",
-                assetType: ["devices", "Software"],
+                assetType: ["Devices", "Software"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "perform automated vulnerability scans",
@@ -4370,7 +4298,7 @@ export class SafeguardManager {
                 title: "Perform Automated Vulnerability Scans of Externally-Exposed Enterprise Assets",
                 description: "Perform automated vulnerability scans of externally-exposed enterprise assets using either an internal or external vulnerability scanning service",
                 implementationGroup: "IG2",
-                assetType: ["devices", "Software"],
+                assetType: ["Devices", "Software"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "perform automated vulnerability scans",
@@ -4534,7 +4462,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain an Audit Log Management Process",
                 description: "Establish and maintain a documented audit log management process that defines the enterprise's logging requirements. At a minimum, address the collection, review, and retention of audit logs for enterprise assets. Review and update documentation annually, or when significant enterprise changes occur that could impact this Safeguard.",
                 implementationGroup: "IG1",
-                assetType: ["enterprise assets", "data"],
+                assetType: ["enterprise assets", "Data"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "establish and maintain",
@@ -4610,7 +4538,7 @@ export class SafeguardManager {
                 title: "Collect Audit Logs",
                 description: "Collect audit logs. Ensure that logging, per the enterprise's audit log management process, has been enabled across enterprise assets.",
                 implementationGroup: "IG1",
-                assetType: ["enterprise assets", "data"],
+                assetType: ["enterprise assets", "Data"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "per the enterprise's audit log management process"
@@ -4679,7 +4607,7 @@ export class SafeguardManager {
                 title: "Ensure Adequate Audit Log Storage",
                 description: "Ensure that logging destinations maintain adequate storage to comply with the enterprise's audit log management process.",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "comply with the enterprise's audit log management process"
@@ -4749,7 +4677,7 @@ export class SafeguardManager {
                 title: "Standardize Time Synchronization",
                 description: "Standardize time synchronization. Configure at least two synchronized time sources across enterprise assets, where supported.",
                 implementationGroup: "IG2",
-                assetType: ["enterprise assets", "data"],
+                assetType: ["enterprise assets", "Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "standardize time synchronization"
@@ -4821,7 +4749,7 @@ export class SafeguardManager {
                 title: "Collect Detailed Audit Logs",
                 description: "Configure detailed audit logging for enterprise assets containing sensitive data. Include event source, date, username, timestamp, source addresses, destination addresses, and other useful elements that could assist in a forensic investigation.",
                 implementationGroup: "IG2",
-                assetType: ["enterprise assets", "data"],
+                assetType: ["enterprise assets", "Data"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "configure detailed audit logging"
@@ -4896,7 +4824,7 @@ export class SafeguardManager {
                 title: "Collect DNS Query Audit Logs",
                 description: "Collect DNS query audit logs on enterprise assets, where appropriate and supported.",
                 implementationGroup: "IG2",
-                assetType: ["enterprise assets", "data"],
+                assetType: ["enterprise assets", "Data"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "where appropriate and supported"
@@ -4967,7 +4895,7 @@ export class SafeguardManager {
                 title: "Collect URL Request Audit Logs",
                 description: "Collect URL request audit logs on enterprise assets, where appropriate and supported.",
                 implementationGroup: "IG2",
-                assetType: ["enterprise assets", "data"],
+                assetType: ["enterprise assets", "Data"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "where appropriate and supported"
@@ -5038,7 +4966,7 @@ export class SafeguardManager {
                 title: "Collect Command-Line Audit Logs",
                 description: "Collect command-line audit logs. Example implementations include collecting audit logs from PowerShell®, BASH™, and remote administrative terminals.",
                 implementationGroup: "IG2",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "collect command-line audit logs"
@@ -5108,7 +5036,7 @@ export class SafeguardManager {
                 title: "Centralize Audit Logs",
                 description: "Centralize, to the extent possible, audit log collection and retention across enterprise assets in accordance with the documented audit log management process. Example implementations include leveraging a SIEM tool to centralize multiple log sources.",
                 implementationGroup: "IG2",
-                assetType: ["enterprise assets", "data"],
+                assetType: ["enterprise assets", "Data"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "in accordance with documented audit log management process",
@@ -5180,7 +5108,7 @@ export class SafeguardManager {
                 title: "Retain Audit Logs",
                 description: "Retain audit logs across enterprise assets for a minimum of 90 days.",
                 implementationGroup: "IG2",
-                assetType: ["enterprise assets", "data"],
+                assetType: ["enterprise assets", "Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "minimum of 90 days"
@@ -5247,7 +5175,7 @@ export class SafeguardManager {
                 title: "Conduct Audit Log Reviews",
                 description: "Conduct reviews of audit logs to detect anomalies or abnormal events that could indicate a potential threat. Conduct reviews on a weekly, or more frequent, basis.",
                 implementationGroup: "IG2",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "conduct reviews on a weekly, or more frequent, basis"
@@ -5317,7 +5245,7 @@ export class SafeguardManager {
                 title: "Collect Service Provider Logs",
                 description: "Collect service provider logs, where supported. Example implementations include collecting authentication and authorization events, data creation and disposal events, and user management events.",
                 implementationGroup: "IG3",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "where supported"
@@ -5466,7 +5394,7 @@ export class SafeguardManager {
                 title: "Use DNS Filtering Services",
                 description: "Use DNS filtering services on all end-user devices, including remote and on-premise assets, to block access to known malicious domains",
                 implementationGroup: "IG1",
-                assetType: ["devices", "network"],
+                assetType: ["Devices", "network"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "use DNS filtering services on all end-user devices",
@@ -5938,7 +5866,7 @@ export class SafeguardManager {
                 title: "Deploy and Maintain Anti-Malware Software",
                 description: "Deploy and maintain anti-malware software on all enterprise assets",
                 implementationGroup: "IG1",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "deploy anti-malware software",
@@ -6017,7 +5945,7 @@ export class SafeguardManager {
                 title: "Configure Automatic Anti-Malware Signature Updates",
                 description: "Configure automatic updates for anti-malware signature files on all enterprise assets",
                 implementationGroup: "IG1",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "configure automatic updates",
@@ -6091,7 +6019,7 @@ export class SafeguardManager {
                 title: "Disable Autorun and Autoplay for Removable Media",
                 description: "Disable autorun and autoplay auto-execute functionality for removable media",
                 implementationGroup: "IG1",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "disable autorun functionality",
@@ -6170,7 +6098,7 @@ export class SafeguardManager {
                 title: "Configure Automatic Anti-Malware Scanning of Removable Media",
                 description: "Configure anti-malware software to automatically scan removable media",
                 implementationGroup: "IG2",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "configure anti-malware software",
@@ -6248,7 +6176,7 @@ export class SafeguardManager {
                 title: "Enable Anti-Exploitation Features",
                 description: "Enable anti-exploitation features on enterprise assets and software, where possible, such as Microsoft® Data Execution Prevention (DEP), Windows® Defender Exploit Guard (WDEG), or Apple® System Integrity Protection (SIP) and Gatekeeper™",
                 implementationGroup: "IG2",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "enable anti-exploitation features",
@@ -6328,7 +6256,7 @@ export class SafeguardManager {
                 title: "Centrally Manage Anti-Malware Software",
                 description: "Centrally manage anti-malware software",
                 implementationGroup: "IG2",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "centrally manage anti-malware",
@@ -6404,7 +6332,7 @@ export class SafeguardManager {
                 title: "Use Behavior-Based Anti-Malware Software",
                 description: "Use behavior-based anti-malware software",
                 implementationGroup: "IG2",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "use behavior-based anti-malware",
@@ -6481,7 +6409,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain a Data Recovery Process",
                 description: "Establish and maintain a documented data recovery process. In the process, address the scope of data recovery activities, recovery prioritization, and the security of backup data. Review and update documentation annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "establish documented data recovery process",
@@ -6564,7 +6492,7 @@ export class SafeguardManager {
                 title: "Perform Automated Backups",
                 description: "Perform automated backups of in-scope enterprise assets. Run backups weekly, or more frequently, based on the sensitivity of the data",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Recover"],
                 governanceElements: [
                     "perform automated backups",
@@ -6645,7 +6573,7 @@ export class SafeguardManager {
                 title: "Protect Recovery Data",
                 description: "Protect recovery data with equivalent controls to the original data. Reference encryption or data separation, based on requirements",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "protect recovery data",
@@ -6725,7 +6653,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain an Isolated Instance of Recovery Data",
                 description: "Establish and maintain an isolated instance of recovery data. Example implementations include version controlling backup destinations through offline, cloud, or off-site systems or services",
                 implementationGroup: "IG1",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Recover"],
                 governanceElements: [
                     "establish isolated instance of recovery data",
@@ -6808,7 +6736,7 @@ export class SafeguardManager {
                 title: "Test Data Recovery",
                 description: "Test backup recovery quarterly, or more frequently, for a sampling of in-scope enterprise assets",
                 implementationGroup: "IG2",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Recover"],
                 governanceElements: [
                     "test backup recovery quarterly or more frequently",
@@ -7372,7 +7300,7 @@ export class SafeguardManager {
                 title: "Ensure Remote Devices Utilize a VPN and are Connecting to an Enterprise's AAA Infrastructure",
                 description: "Require users to authenticate to enterprise-managed VPN and authentication services prior to accessing enterprise resources on end-user devices",
                 implementationGroup: "IG2",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "require users to authenticate to enterprise-managed VPN",
@@ -7452,7 +7380,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain Dedicated Computing Resources for All Administrative Work",
                 description: "Establish and maintain dedicated computing resources, either physically or logically separated, for all administrative tasks or tasks requiring administrative access. The computing resources should be segmented from the enterprise's primary network and not be allowed internet access",
                 implementationGroup: "IG3",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "establish dedicated computing resources for administrative work",
@@ -7534,7 +7462,7 @@ export class SafeguardManager {
                 title: "Centralize Security Event Alerting",
                 description: "Centralize security event alerting across enterprise assets for log correlation and analysis. Security event alerting includes, at a minimum, active exploitation attempts of enterprise assets",
                 implementationGroup: "IG2",
-                assetType: ["network", "devices"],
+                assetType: ["network", "Devices"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "centralize security event alerting across enterprise assets",
@@ -7613,7 +7541,7 @@ export class SafeguardManager {
                 title: "Deploy a Host-Based Intrusion Detection Solution",
                 description: "Deploy a host-based intrusion detection solution on enterprise assets, where technically feasible",
                 implementationGroup: "IG2",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "deploy host-based intrusion detection solution",
@@ -7839,7 +7767,7 @@ export class SafeguardManager {
                 title: "Manage Access Control for Remote Assets",
                 description: "Manage access control for assets remotely connecting to enterprise networks. Determine amount of access to the enterprise network based on: up-to-date anti-malware software, up-to date system patches, up-to-date host-based firewall, and up-to-date host-based intrusion detection or intrusion prevention system",
                 implementationGroup: "IG2",
-                assetType: ["devices", "network"],
+                assetType: ["Devices", "network"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "manage access control for assets remotely connecting to enterprise networks",
@@ -7993,7 +7921,7 @@ export class SafeguardManager {
                 title: "Deploy a Host-Based Intrusion Prevention Solution",
                 description: "Deploy a host-based intrusion prevention solution on enterprise assets, where technically feasible",
                 implementationGroup: "IG3",
-                assetType: ["devices"],
+                assetType: ["Devices"],
                 securityFunction: ["Respond"],
                 governanceElements: [
                     "deploy host-based intrusion prevention solution",
@@ -8294,7 +8222,7 @@ export class SafeguardManager {
                 title: "Tune Security Event Alerting Thresholds",
                 description: "Tune security event alerting thresholds monthly, or more frequently",
                 implementationGroup: "IG3",
-                assetType: ["network", "devices"],
+                assetType: ["network", "Devices"],
                 securityFunction: ["Detect"],
                 governanceElements: [
                     "tune security event alerting thresholds",
@@ -8368,7 +8296,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain a Security Awareness Program",
                 description: "Establish and maintain a security awareness program. The purpose of a security awareness program is to educate the enterprise's workforce on how to interact with enterprise assets and data in a secure manner. Conduct training at hire and, at a minimum, annually. Review and update content annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "establish and maintain a security awareness program",
@@ -8450,7 +8378,7 @@ export class SafeguardManager {
                 title: "Train Workforce Members to Recognize Social Engineering Attacks",
                 description: "Train workforce members to recognize social engineering attacks, such as phishing, business email compromise (BEC), pretexting, and tailgating",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "train workforce members to recognize social engineering attacks",
@@ -8529,7 +8457,7 @@ export class SafeguardManager {
                 title: "Train Workforce Members on Authentication Best Practices",
                 description: "Train workforce members on authentication best practices. Example topics include MFA, password composition, and credential management",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "train workforce members on authentication best practices",
@@ -8606,7 +8534,7 @@ export class SafeguardManager {
                 title: "Train Workforce on Data Handling Best Practices",
                 description: "Train workforce members on how to identify and properly store, transfer, archive, and destroy sensitive data. This also includes training workforce members on clear screen and desk best practices, such as locking their screen when they step away from their enterprise asset, erasing physical and virtual whiteboards at the end of meetings, and storing data and assets securely",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "train workforce members on how to identify and properly store, transfer, archive, and destroy sensitive data",
@@ -8691,7 +8619,7 @@ export class SafeguardManager {
                 title: "Train Workforce Members on Causes of Unintentional Data Exposure",
                 description: "Train workforce members to be aware of causes for unintentional data exposure. Example topics include mis-delivery of sensitive data, losing a portable end-user device, or publishing data to unintended audiences",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "train workforce members to be aware of causes for unintentional data exposure",
@@ -8768,7 +8696,7 @@ export class SafeguardManager {
                 title: "Train Workforce Members on Recognizing and Reporting Security Incidents",
                 description: "Train workforce members to be able to recognize a potential incident and be able to report such an incident",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "train workforce members to be able to recognize a potential incident",
@@ -8843,7 +8771,7 @@ export class SafeguardManager {
                 title: "Train Workforce on How to Identify and Report if Their Enterprise Assets are Missing Security Updates",
                 description: "Train workforce to understand how to verify and report out-of-date software patches or any failures in automated processes and tools. Part of this training should include notifying IT personnel of any failures in automated processes and tools",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "train workforce to understand how to verify and report out-of-date software patches",
@@ -8924,7 +8852,7 @@ export class SafeguardManager {
                 title: "Train Workforce on the Dangers of Connecting to and Transmitting Enterprise Data Over Insecure Networks",
                 description: "Train workforce members on the dangers of connecting to, and transmitting data over, insecure networks for enterprise activities. If the enterprise has remote workers, training must include guidance to ensure that all users securely configure their home network infrastructure",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "train workforce members on dangers of connecting to and transmitting data over insecure networks",
@@ -9004,7 +8932,7 @@ export class SafeguardManager {
                 title: "Conduct Role-Specific Security Awareness and Skills Training",
                 description: "Conduct role-specific security awareness and skills training. Example implementations include secure system administration courses for IT professionals, OWASP Top 10 vulnerability awareness and prevention training for web application developers, and advanced social engineering awareness training for high-profile roles",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "conduct role-specific security awareness and skills training",
@@ -9082,7 +9010,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain an Inventory of Service Providers",
                 description: "Establish and maintain an inventory of service providers. The inventory is to list all known service providers, include classification(s), and designate an enterprise contact for each service provider. Review and update the inventory annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Identify"],
                 governanceElements: [
                     "establish and maintain an inventory of service providers",
@@ -9162,7 +9090,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain a Service Provider Management Policy",
                 description: "Establish and maintain a service provider management policy. Ensure the policy addresses the classification, inventory, assessment, monitoring, and decommissioning of service providers. Review and update the policy annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "establish and maintain a service provider management policy",
@@ -9247,7 +9175,7 @@ export class SafeguardManager {
                 title: "Classify Service Providers",
                 description: "Classify service providers. Classification consideration may include one or more characteristics, such as data sensitivity, data volume, availability requirements, applicable regulations, inherent risk, and mitigated risk. Update and review classifications annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "classify service providers",
@@ -9330,7 +9258,7 @@ export class SafeguardManager {
                 title: "Ensure Service Provider Contracts Include Security Requirements",
                 description: "Ensure service provider contracts include security requirements. Example requirements may include minimum security program requirements, security incident and/or data breach notification and response, data encryption requirements, and data disposal commitments. These security requirements must be consistent with the enterprise's service provider management policy. Review service provider contracts annually to ensure contracts are not missing security requirements",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "ensure service provider contracts include security requirements",
@@ -9412,7 +9340,7 @@ export class SafeguardManager {
                 title: "Assess Service Providers",
                 description: "Assess service providers consistent with the enterprise's service provider management policy. Assessment scope may vary based on classification(s), and may include review of standardized assessment reports, such as Service Organization Control 2 (SOC 2) and Payment Card Industry (PCI) Attestation of Compliance (AoC), customized questionnaires, or other appropriately rigorous processes. Reassess service providers annually, at a minimum, or with new and renewed contracts",
                 implementationGroup: "IG3",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "assess service providers consistent with enterprise's service provider management policy",
@@ -9494,7 +9422,7 @@ export class SafeguardManager {
                 title: "Monitor Service Providers",
                 description: "Monitor service providers consistent with the enterprise's service provider management policy. Monitoring may include periodic reassessment of service provider compliance, monitoring service provider release notes, and dark web monitoring",
                 implementationGroup: "IG3",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "monitor service providers consistent with enterprise's service provider management policy",
@@ -9571,7 +9499,7 @@ export class SafeguardManager {
                 title: "Securely Decommission Service Providers",
                 description: "Securely decommission service providers. Example considerations include user and service account deactivation, termination of data flows, and secure disposal of enterprise data within service provider systems",
                 implementationGroup: "IG3",
-                assetType: ["data"],
+                assetType: ["Data"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "securely decommission service providers",
@@ -10277,7 +10205,7 @@ export class SafeguardManager {
                 title: "Train Developers in Application Security Concepts and Secure Coding",
                 description: "Ensure that all software development personnel receive training in writing secure code for their specific development environment and responsibilities. Training can include general security principles and application security standard practices. Conduct training at least annually and design in a way to promote security within the development team, and build a culture of security among the developers",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Protect"],
                 governanceElements: [
                     "ensure that all software development personnel receive training in writing secure code",
@@ -10753,7 +10681,7 @@ export class SafeguardManager {
                 title: "Designate Personnel to Manage Incident Handling",
                 description: "Designate one key person, and at least one backup, who will manage the enterprise's incident handling process. Management personnel are responsible for the coordination and documentation of incident response and recovery efforts and can consist of employees internal to the enterprise, service providers, or a hybrid approach. If using a service provider, designate at least one person internal to the enterprise to oversee any third-party work. Review annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Respond"],
                 governanceElements: [
                     "designate one key person and at least one backup who will manage the enterprise's incident handling process",
@@ -10831,7 +10759,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain Contact Information for Reporting Security Incidents",
                 description: "Establish and maintain contact information for reporting security incidents. This information must be available to all workforce members and should include various contact methods (e.g., phone, email) and be regularly updated. Consider the availability of these contact methods in different circumstances, such as when primary communication systems are compromised",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Respond"],
                 governanceElements: [
                     "establish and maintain contact information for reporting security incidents",
@@ -10907,7 +10835,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain an Enterprise Process for Reporting Incidents",
                 description: "Establish and maintain an documented enterprise process for the workforce to report security incidents. The process includes reporting timeframe, personnel to report to, mechanism for reporting, and the minimum information to be reported. Ensure the process is publicly available to all of the workforce. Review annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG1",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "establish and maintain a documented enterprise process for the workforce to report security incidents",
@@ -10985,7 +10913,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain an Incident Response Process",
                 description: "Establish and maintain a documented incident response process that addresses roles and responsibilities, compliance requirements, and a communication plan. Review annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Govern"],
                 governanceElements: [
                     "establish and maintain a documented incident response process",
@@ -11060,7 +10988,7 @@ export class SafeguardManager {
                 title: "Assign Key Roles and Responsibilities",
                 description: "Assign key roles and responsibilities for incident response, including staff from legal, IT, information security, facilities, public relations, human resources, incident responders, and analysts. Review annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Respond"],
                 governanceElements: [
                     "assign key roles and responsibilities for incident response",
@@ -11138,7 +11066,7 @@ export class SafeguardManager {
                 title: "Define Mechanisms for Communicating During Incident Response",
                 description: "Determine which primary and secondary mechanisms will be used to communicate and report during a security incident. Mechanisms can include phone calls, emails, secure chat or notification letters. Keep in mind that certain mechanisms, such as emails, can be affected during a security incident. Review annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Respond"],
                 governanceElements: [
                     "determine which primary and secondary mechanisms will be used to communicate and report during a security incident",
@@ -11215,7 +11143,7 @@ export class SafeguardManager {
                 title: "Conduct Routine Incident Response Exercises",
                 description: "Plan and conduct routine incident response exercises and scenarios for key personnel involved in the incident response process to prepare for responding to real-world incidents. Exercises need to test communication channels, decision-making, and workflows. Conduct testing on an annual basis, at a minimum",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Recover"],
                 governanceElements: [
                     "plan and conduct routine incident response exercises and scenarios for key personnel involved in the incident response process",
@@ -11292,7 +11220,7 @@ export class SafeguardManager {
                 title: "Conduct Post-Incident Reviews",
                 description: "Conduct post-incident reviews. Post-incident reviews help prevent incident recurrence through identifying lessons learned and follow-up action",
                 implementationGroup: "IG2",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Recover"],
                 governanceElements: [
                     "conduct post-incident reviews"
@@ -11365,7 +11293,7 @@ export class SafeguardManager {
                 title: "Establish and Maintain Security Incident Thresholds",
                 description: "Establish and maintain security incident thresholds, including, at a minimum, differentiating between an incident and an event. Examples can include: abnormal activity, security vulnerability, security weakness, data breach, privacy incident, etc. Review annually, or when significant enterprise changes occur that could impact this Safeguard",
                 implementationGroup: "IG3",
-                assetType: ["users"],
+                assetType: ["Users"],
                 securityFunction: ["Recover"],
                 governanceElements: [
                     "establish and maintain security incident thresholds",