diff --git a/libpldmresponder/bios_attribute.hpp b/libpldmresponder/bios_attribute.hpp
index 46c34cd..c07d86f 100644
--- a/libpldmresponder/bios_attribute.hpp
+++ b/libpldmresponder/bios_attribute.hpp
@@ -22,6 +22,7 @@
 {
 
 using Json = nlohmann::json;
+using ValueDisplayNamesMap = std::map<uint16_t, std::vector<std::string>>;
 
 /** @class BIOSAttribute
  *  @brief Provide interfaces to implement specific types of attributes
@@ -99,6 +100,8 @@
 
     const std::string helpText;
 
+    ValueDisplayNamesMap valueDisplayNamesMap;
+
   protected:
     /** @brief dbus backend, nullopt if this attribute is read-only*/
     std::optional<pldm::utils::DBusMapping> dBusMap;
diff --git a/libpldmresponder/bios_config.cpp b/libpldmresponder/bios_config.cpp
index aea24a0..1514664 100644
--- a/libpldmresponder/bios_config.cpp
+++ b/libpldmresponder/bios_config.cpp
@@ -249,6 +249,8 @@
         MenuPath menuPath{};
         CurrentValue currentValue{};
         DefaultValue defaultValue{};
+        std::vector<ValueDisplayName> valueDisplayNames;
+        std::map<uint16_t, std::vector<std::string>> valueDisplayNamesMap;
         Option options{};
 
         auto attrValueHandle =
@@ -291,6 +293,9 @@
                 biosAttributes[attrHandle % biosAttributes.size()]->helpText;
             displayName =
                 biosAttributes[attrHandle % biosAttributes.size()]->displayName;
+            valueDisplayNamesMap =
+                biosAttributes[attrHandle % biosAttributes.size()]
+                    ->valueDisplayNamesMap;
         }
 
         switch (attrType)
@@ -298,6 +303,13 @@
             case PLDM_BIOS_ENUMERATION:
             case PLDM_BIOS_ENUMERATION_READ_ONLY:
             {
+                if (valueDisplayNamesMap.contains(attrHandle))
+                {
+                    const std::vector<ValueDisplayName>& vdn =
+                        valueDisplayNamesMap[attrHandle];
+                    valueDisplayNames.insert(valueDisplayNames.end(),
+                                             vdn.begin(), vdn.end());
+                }
                 auto getValue = [](uint16_t handle,
                                    const Table& table) -> std::string {
                     auto stringEntry = pldm_bios_table_string_find_by_handle(
@@ -334,7 +346,8 @@
                     options.push_back(
                         std::make_tuple("xyz.openbmc_project.BIOSConfig."
                                         "Manager.BoundType.OneOf",
-                                        getValue(pvHandls[i], *stringTable)));
+                                        getValue(pvHandls[i], *stringTable),
+                                        valueDisplayNames[i]));
                 }
 
                 auto count =
@@ -380,18 +393,18 @@
                 uint32_t scalar;
                 pldm_bios_table_attr_entry_integer_decode(
                     attrEntry, &lower, &upper, &scalar, &def);
-                options.push_back(
-                    std::make_tuple("xyz.openbmc_project.BIOSConfig.Manager."
-                                    "BoundType.LowerBound",
-                                    static_cast<int64_t>(lower)));
-                options.push_back(
-                    std::make_tuple("xyz.openbmc_project.BIOSConfig.Manager."
-                                    "BoundType.UpperBound",
-                                    static_cast<int64_t>(upper)));
-                options.push_back(
-                    std::make_tuple("xyz.openbmc_project.BIOSConfig.Manager."
-                                    "BoundType.ScalarIncrement",
-                                    static_cast<int64_t>(scalar)));
+                options.push_back(std::make_tuple(
+                    "xyz.openbmc_project.BIOSConfig.Manager."
+                    "BoundType.LowerBound",
+                    static_cast<int64_t>(lower), attributeName));
+                options.push_back(std::make_tuple(
+                    "xyz.openbmc_project.BIOSConfig.Manager."
+                    "BoundType.UpperBound",
+                    static_cast<int64_t>(upper), attributeName));
+                options.push_back(std::make_tuple(
+                    "xyz.openbmc_project.BIOSConfig.Manager."
+                    "BoundType.ScalarIncrement",
+                    static_cast<int64_t>(scalar), attributeName));
                 defaultValue = static_cast<int64_t>(def);
                 break;
             }
@@ -420,11 +433,11 @@
                 options.push_back(
                     std::make_tuple("xyz.openbmc_project.BIOSConfig.Manager."
                                     "BoundType.MinStringLength",
-                                    static_cast<int64_t>(min)));
+                                    static_cast<int64_t>(min), attributeName));
                 options.push_back(
                     std::make_tuple("xyz.openbmc_project.BIOSConfig.Manager."
                                     "BoundType.MaxStringLength",
-                                    static_cast<int64_t>(max)));
+                                    static_cast<int64_t>(max), attributeName));
                 defaultValue = defString.data();
                 break;
             }
diff --git a/libpldmresponder/bios_config.hpp b/libpldmresponder/bios_config.hpp
index 77a0764..10cc013 100644
--- a/libpldmresponder/bios_config.hpp
+++ b/libpldmresponder/bios_config.hpp
@@ -47,7 +47,9 @@
 using DefaultValue = std::variant<int64_t, std::string>;
 using OptionString = std::string;
 using OptionValue = std::variant<int64_t, std::string>;
-using Option = std::vector<std::tuple<OptionString, OptionValue>>;
+using ValueDisplayName = std::string;
+using Option =
+    std::vector<std::tuple<OptionString, OptionValue, ValueDisplayName>>;
 using BIOSTableObj =
     std::tuple<AttributeType, ReadonlyStatus, DisplayName, Description,
                MenuPath, CurrentValue, DefaultValue, Option>;
diff --git a/libpldmresponder/bios_enum_attribute.cpp b/libpldmresponder/bios_enum_attribute.cpp
index ba8895e..dd37057 100644
--- a/libpldmresponder/bios_enum_attribute.cpp
+++ b/libpldmresponder/bios_enum_attribute.cpp
@@ -33,6 +33,12 @@
     {
         defaultValues.emplace_back(val);
     }
+
+    Json vdn = entry.at("value_names");
+    for (auto& val : vdn)
+    {
+        valueDisplayNames.emplace_back(val);
+    }
     assert(defaultValues.size() == 1);
     defaultValue = defaultValues[0];
     if (dBusMap.has_value())
@@ -189,6 +195,14 @@
     dbusHandler->setDbusProperty(*dBusMap, it->first);
 }
 
+void BIOSEnumAttribute::populateValueDisplayNamesMap(uint16_t attrHandle)
+{
+    for (auto& vdn : valueDisplayNames)
+    {
+        valueDisplayNamesMap[attrHandle].push_back(vdn);
+    }
+}
+
 void BIOSEnumAttribute::constructEntry(
     const BIOSStringTable& stringTable, Table& attrTable, Table& attrValueTable,
     std::optional<std::variant<int64_t, std::string>> optAttributeValue)
@@ -201,14 +215,15 @@
     pldm_bios_table_attr_entry_enum_info info = {
         stringTable.findHandle(name),         readOnly,
         (uint8_t)possibleValuesHandle.size(), possibleValuesHandle.data(),
-        (uint8_t)defaultIndices.size(),       defaultIndices.data(),
-    };
+        (uint8_t)defaultIndices.size(),       defaultIndices.data()};
 
     auto attrTableEntry = table::attribute::constructEnumEntry(attrTable,
                                                                &info);
     auto [attrHandle, attrType,
           _] = table::attribute::decodeHeader(attrTableEntry);
 
+    populateValueDisplayNamesMap(attrHandle);
+
     std::vector<uint8_t> currValueIndices(1, 0);
 
     if (optAttributeValue.has_value())
diff --git a/libpldmresponder/bios_enum_attribute.hpp b/libpldmresponder/bios_enum_attribute.hpp
index b175cc4..e26a32a 100644
--- a/libpldmresponder/bios_enum_attribute.hpp
+++ b/libpldmresponder/bios_enum_attribute.hpp
@@ -69,6 +69,7 @@
 
   private:
     std::vector<std::string> possibleValues;
+    std::vector<std::string> valueDisplayNames;
     std::string defaultValue;
 
     /** @brief Get index of the given value in possible values
@@ -88,6 +89,11 @@
         getPossibleValuesHandle(const BIOSStringTable& stringTable,
                                 const std::vector<std::string>& pVs);
 
+    /** @brief Method to populate the valueDisplayNamesMap
+     *  @param[in] attrHandle - attribute handle
+     */
+    void populateValueDisplayNamesMap(uint16_t attrHandle);
+
     using ValMap = std::map<pldm::utils::PropertyValue, std::string>;
 
     /** @brief Map of value on dbus and pldm */
diff --git a/libpldmresponder/test/libpldmresponder_bios_enum_attribute_test.cpp b/libpldmresponder/test/libpldmresponder_bios_enum_attribute_test.cpp
index bb0f652..775cd15 100644
--- a/libpldmresponder/test/libpldmresponder_bios_enum_attribute_test.cpp
+++ b/libpldmresponder/test/libpldmresponder_bios_enum_attribute_test.cpp
@@ -37,6 +37,7 @@
     auto jsonEnumReadOnly = R"({
          "attribute_name" : "CodeUpdatePolicy",
          "possible_values" : [ "Concurrent", "Disruptive" ],
+         "value_names" : [ "Concurrent", "Disruptive" ],
          "default_values" : [ "Concurrent" ],
          "readOnly" : true,
          "helpText" : "HelpText",
@@ -53,6 +54,7 @@
     auto jsonEnumReadOnlyError = R"({
          "attribute_name" : "CodeUpdatePolicy",
          "possible_value" : [ "Concurrent", "Disruptive" ],
+         "value_names" : [ "Concurrent", "Disruptive" ],
          "default_values" : [ "Concurrent" ],
          "readOnly" : true,
          "helpText" : "HelpText",
@@ -64,6 +66,7 @@
     auto jsonEnumReadWrite = R"({
          "attribute_name" : "FWBootSide",
          "possible_values" : [ "Perm", "Temp" ],
+         "value_names" : [ "Perm", "Temp" ],
          "default_values" : [ "Perm" ],
          "readOnly" : false,
          "helpText" : "HelpText",
@@ -91,6 +94,7 @@
     auto jsonEnumReadOnly = R"({
          "attribute_name" : "CodeUpdatePolicy",
          "possible_values" : [ "Concurrent", "Disruptive" ],
+         "value_names" : [ "Concurrent", "Disruptive" ],
          "default_values" : [ "Disruptive" ],
          "readOnly" : true,
          "helpText" : "HelpText",
@@ -130,6 +134,7 @@
     auto jsonEnumReadWrite = R"({
          "attribute_name" : "CodeUpdatePolicy",
          "possible_values" : [ "Concurrent", "Disruptive" ],
+         "value_names" : [ "Concurrent", "Disruptive" ],
          "default_values" : [ "Disruptive" ],
          "readOnly" : false,
          "helpText" : "HelpText",
@@ -182,6 +187,7 @@
     auto jsonEnumReadWrite = R"({
          "attribute_name" : "CodeUpdatePolicy",
          "possible_values" : [ "Concurrent", "Disruptive" ],
+         "value_names" : [ "Concurrent", "Disruptive" ],
          "default_values" : [ "Disruptive" ],
          "readOnly" : false,
          "helpText" : "HelpText",
diff --git a/oem/ibm/configurations/bios/enum_attrs.json b/oem/ibm/configurations/bios/enum_attrs.json
index 89c2302..0f0393b 100644
--- a/oem/ibm/configurations/bios/enum_attrs.json
+++ b/oem/ibm/configurations/bios/enum_attrs.json
@@ -3,6 +3,7 @@
         {
             "attribute_name": "fw_boot_side",
             "possible_values": ["Perm", "Temp"],
+            "value_names": ["Perm", "Temp"],
             "default_values": ["Temp"],
             "helpText": "Specifies the next boot side to the host, i.e. Temp or Perm. Host can set/query this attribute at anytime to know which is the side the host would boot in the next reboot.",
             "displayName": "Current Firmware Boot Side (pending)"
@@ -10,6 +11,7 @@
         {
             "attribute_name": "fw_boot_side_current",
             "possible_values": ["Perm", "Temp"],
+            "value_names": ["Perm", "Temp"],
             "default_values": ["Temp"],
             "helpText": "Specifies the current boot side to the host, i.e. Temp or Perm. Host can query this attribute at anytime to know which side it is running on. This attribute is set by the BMC. Set fw_boot_side instead.",
             "displayName": "Current Firmware Boot Side (current)"
@@ -17,6 +19,7 @@
         {
             "attribute_name": "pvm_pcie_error_inject",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Enabled"],
             "helpText": "pvm_pcie_error_inject",
             "displayName": "pvm_pcie_error_inject"
@@ -24,6 +27,7 @@
         {
             "attribute_name": "vmi_if0_ipv4_method",
             "possible_values": ["IPv4Static", "IPv4DHCP"],
+            "value_names": ["IPv4Static", "IPv4DHCP"],
             "default_values": ["IPv4Static"],
             "helpText": "vmi_if0_ipv4_method",
             "displayName": "vmi_if0_ipv4_method"
@@ -31,6 +35,7 @@
         {
             "attribute_name": "vmi_if1_ipv4_method",
             "possible_values": ["IPv4Static", "IPv4DHCP"],
+            "value_names": ["IPv4Static", "IPv4DHCP"],
             "default_values": ["IPv4Static"],
             "helpText": "vmi_if1_ipv4_method",
             "displayName": "vmi_if1_ipv4_method"
@@ -38,6 +43,7 @@
         {
             "attribute_name": "vmi_if0_ipv6_method",
             "possible_values": ["IPv6Static", "IPv6DHCP", "IPv6SLAAC"],
+            "value_names": ["IPv6Static", "IPv6DHCP", "IPv6SLAAC"],
             "default_values": ["IPv6Static"],
             "helpText": "vmi_if0_ipv6_method",
             "displayName": "vmi_if0_ipv6_method"
@@ -45,6 +51,7 @@
         {
             "attribute_name": "vmi_if1_ipv6_method",
             "possible_values": ["IPv6Static", "IPv6DHCP", "IPv6SLAAC"],
+            "value_names": ["IPv6Static", "IPv6DHCP", "IPv6SLAAC"],
             "default_values": ["IPv6Static"],
             "helpText": "vmi_if1_ipv6_method",
             "displayName": "vmi_if1_ipv6_method"
@@ -52,6 +59,7 @@
         {
             "attribute_name": "hb_hyp_switch",
             "possible_values": ["PowerVM", "OPAL"],
+            "value_names": ["PowerVM", "OPAL"],
             "default_values": ["PowerVM"],
             "helpText": "Tells the host boot fw which type of hypervisor will be loaded.",
             "displayName": "hb_hyp_switch",
@@ -69,6 +77,7 @@
         {
             "attribute_name": "hb_hyp_switch_current",
             "possible_values": ["PowerVM", "OPAL"],
+            "value_names": ["PowerVM", "OPAL"],
             "default_values": ["PowerVM"],
             "helpText": "Do not set this attribute directly; set hb_hyp_switch instead.",
             "displayName": "hb_hyp_switch (current)",
@@ -77,6 +86,7 @@
         {
             "attribute_name": "pvm_stop_at_standby",
             "possible_values": ["Disabled", "Enabled", "ManualOnly"],
+            "value_names": ["Disabled", "Enabled", "ManualOnly"],
             "default_values": ["Disabled"],
             "helpText": "Select hypervisor boot policy, requires a reboot for a change to be applied. Disabled: Instructs server not to activate server firmware and partitions for either a user-initated power on or a recovery power on, Enabled: Instructs the server to automatically activate certain partitions for either a user-initated power on or a recovery power on, ManualOnly: Instructs the server to activate server firmware and partitions automatically only in case of a recovery power on after an abnormal termination.",
             "displayName": "pvm_stop_at_standby",
@@ -95,6 +105,7 @@
         {
             "attribute_name": "pvm_stop_at_standby_current",
             "possible_values": ["Disabled", "Enabled", "ManualOnly"],
+            "value_names": ["Disabled", "Enabled", "ManualOnly"],
             "default_values": ["Disabled"],
             "helpText": "Specifies the current hypervisor boot policy. Do not set this attribute directly; set pvm_stop_at_standby instead.",
             "displayName": "pvm_stop_at_standby_current (current)",
@@ -103,6 +114,7 @@
         {
             "attribute_name": "hb_debug_console",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "When set to Enabled Hostboot should emit debug trace information to the VUART2 device.",
             "displayName": "hb-debug-console"
@@ -110,6 +122,7 @@
         {
             "attribute_name": "hb_inhibit_bmc_reset",
             "possible_values": ["NoInhibit", "Inhibit"],
+            "value_names": ["NoInhibit", "Inhibit"],
             "default_values": ["NoInhibit"],
             "helpText": "When set to Inhibit, the hypervisor shall not reset/reload the BMC at runtime.",
             "displayName": "hb-inhibit-bmc-reset",
@@ -118,6 +131,7 @@
         {
             "attribute_name": "pvm_system_power_off_policy",
             "possible_values": ["Power Off", "Stay On", "Automatic"],
+            "value_names": ["Power Off", "Stay On", "Automatic"],
             "default_values": ["Automatic"],
             "helpText": "The system power off policy flag is a system parameter that controls the system's behavior when the last partition (or only partition in the case of a system that is not managed by an HMC) is powered off.",
             "displayName": "System Automatic Power Off Policy"
@@ -125,6 +139,7 @@
         {
             "attribute_name": "pvm_hmc_managed",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "This option enables or disables the system is managed by HMC.",
             "displayName": "HMC managed System"
@@ -132,6 +147,7 @@
         {
             "attribute_name": "pvm_vmi_support",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "Indicates whether or not VMI support has been provisioned by Hypervisor. Enabled - VMI is available, Disabled - VMI is not available.",
             "displayName": "VMI Support",
@@ -140,6 +156,7 @@
         {
             "attribute_name": "pvm_rtad",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "This option enables or disables the Remote Trusted Attestation Daemon for host firmware.",
             "displayName": "Remote Trusted Attestation Daemon State"
@@ -153,6 +170,7 @@
                 "Linux KVM",
                 "Default"
             ],
+            "value_names": ["AIX", "Linux", "IBM I", "Linux KVM", "Default"],
             "default_values": ["Default"],
             "helpText": "CEC Primary OS",
             "displayName": "CEC Primary OS"
@@ -166,6 +184,7 @@
                 "Linux KVM",
                 "Default"
             ],
+            "value_names": ["AIX", "Linux", "IBM I", "Linux KVM", "Default"],
             "default_values": ["Default"],
             "helpText": "Specifies the current CEC Primary OS type. Do not set this attribute directly; set pvm_default_os_type instead.",
             "displayName": "CEC Primary OS (current)",
@@ -174,6 +193,7 @@
         {
             "attribute_name": "pvm_system_operating_mode",
             "possible_values": ["Normal", "Manual"],
+            "value_names": ["Normal", "Manual"],
             "default_values": ["Normal"],
             "helpText": "Manual mode is used for service or maintenance purpose of the system hardware. When the system is in manual mode, various automatic functions such as recovery on error, system poweron on power loss and reboot of host on failure are disabled.",
             "displayName": "Server Operating Mode"
@@ -187,6 +207,13 @@
                 "OkPrompt",
                 "DefaultList"
             ],
+            "value_names": [
+                "Normal",
+                "SavedList",
+                "SmsMenu",
+                "OkPrompt",
+                "DefaultList"
+            ],
             "default_values": ["Normal"],
             "helpText": "Select the boot type for an AIX/Linux partition. Normal: The partition boots directly to the operating system, SavedList: The system boots from the saved service mode boot list, SmsMenu: The partition stops at the System Management Services(SMS) menu, OkPrompt: The system stops at the open firmware prompt, DefaultList: The system boots from the default boot list.",
             "displayName": "AIX/Linux Partition Boot Mode"
@@ -200,6 +227,13 @@
                 "OkPrompt",
                 "DefaultList"
             ],
+            "value_names": [
+                "Normal",
+                "SavedList",
+                "SmsMenu",
+                "OkPrompt",
+                "DefaultList"
+            ],
             "default_values": ["Normal"],
             "helpText": "Specifies the current boot type for an AIX/Linux partition. Do not set this attribute directly; set pvm_rpa_boot_mode instead.",
             "displayName": "AIX/Linux Partition Boot Mode (current)",
@@ -208,6 +242,7 @@
         {
             "attribute_name": "pvm_os_boot_type",
             "possible_values": ["A_Mode", "B_Mode", "C_Mode", "D_Mode"],
+            "value_names": ["A_Mode", "B_Mode", "C_Mode", "D_Mode"],
             "default_values": ["A_Mode"],
             "helpText": "Select the IBM i partition boot mode for next system boot. A_Mode: Boot from disk using copy A, B_Mode: Boot from disk using copy B, C_Mode: Reserved for IBM lab use only, D_Mode: Boot from media/drives.",
             "displayName": "IBM i Partition Boot Mode"
@@ -215,6 +250,7 @@
         {
             "attribute_name": "pvm_os_boot_type_current",
             "possible_values": ["A_Mode", "B_Mode", "C_Mode", "D_Mode"],
+            "value_names": ["A_Mode", "B_Mode", "C_Mode", "D_Mode"],
             "default_values": ["A_Mode"],
             "helpText": "Specifies the current IBM i partition boot mode for next system boot. Do not set this attribute directly; set pvm_os_boot_type instead.",
             "displayName": "IBM i Partition Boot Mode (current)",
@@ -223,6 +259,7 @@
         {
             "attribute_name": "pvm_vtpm",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Enabled"],
             "helpText": "Enabling vTPM makes a TPM available to the guest operating system.",
             "displayName": "Virtual Trusted Platform Module"
@@ -230,6 +267,7 @@
         {
             "attribute_name": "pvm_vtpm_current",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Enabled"],
             "helpText": "Specifies the current vTPM policy. Do not set this attribute directly; set pvm_vtpm instead.",
             "displayName": "Virtual Trusted Platform Module (current)",
@@ -238,6 +276,7 @@
         {
             "attribute_name": "pvm_sys_dump_active",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled"],
             "default_values": ["Disabled"],
             "helpText": "Enabled when a system dump is in progress or stored in hypervisor memory and ready for offload, Disabled otherwise.",
             "displayName": "System Dump Active"
@@ -245,6 +284,7 @@
         {
             "attribute_name": "hb_memory_region_size",
             "possible_values": ["128MB", "256MB", "1024MB", "2048MB", "4096MB"],
+            "value_names": ["128MB", "256MB", "1024MB", "2048MB", "4096MB"],
             "default_values": ["256MB"],
             "helpText": "Specifies the size of the logical memory block the system uses to read memory, requires a reboot for a change to be applied.",
             "displayName": "Memory Region Size (pending)"
@@ -252,6 +292,7 @@
         {
             "attribute_name": "hb_memory_region_size_current",
             "possible_values": ["128MB", "256MB", "1024MB", "2048MB", "4096MB"],
+            "value_names": ["128MB", "256MB", "1024MB", "2048MB", "4096MB"],
             "default_values": ["256MB"],
             "helpText": "Specifies the size of the logical memory block the system uses to read memory for the current IPL. Do not set this attribute directly; set hb_memory_region_size instead.",
             "displayName": "Memory Region Size (current)",
@@ -260,6 +301,7 @@
         {
             "attribute_name": "hb_power_limit_enable",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies whether the power limit is enabled.",
             "displayName": "Power Limit Enable",
@@ -274,6 +316,7 @@
         {
             "attribute_name": "hb_power_limit_enable_current",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies if the power limit is enabled for the current IPL. Do not set this attribute directly; set hb_power_limit_enable instead.",
             "displayName": "Power Limit Enable (current)",
@@ -282,6 +325,7 @@
         {
             "attribute_name": "hb_secure_ver_lockin_enabled",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies whether the secure version lockin functionality is enabled.",
             "displayName": "Secure Version Lockin Enabled"
@@ -289,6 +333,7 @@
         {
             "attribute_name": "hb_memory_mirror_mode",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies if the memory mirroring is enabled, requires a reboot for a change to be applied.",
             "displayName": "Memory Mirror Mode (pending)"
@@ -296,6 +341,7 @@
         {
             "attribute_name": "hb_memory_mirror_mode_current",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies if the memory mirroring is enabled for the current IPL. Do not set this attribute directly; set hb_memory_mirror_mode instead.",
             "displayName": "Memory Mirror Mode (current)",
@@ -304,6 +350,7 @@
         {
             "attribute_name": "hb_tpm_required",
             "possible_values": ["Required", "Not Required"],
+            "value_names": ["Required", "Not Required"],
             "default_values": ["Required"],
             "helpText": "When the 'TPM Required Policy' is 'Required', a functional TPM is required to boot the system",
             "displayName": "TPM Required Policy (pending)",
@@ -318,6 +365,7 @@
         {
             "attribute_name": "hb_tpm_required_current",
             "possible_values": ["Required", "Not Required"],
+            "value_names": ["Required", "Not Required"],
             "default_values": ["Required"],
             "helpText": "When the 'TPM Required Policy' is 'Required', a functional TPM is required to boot the system. Do not set this attribute directly; set hb_tpm_required instead.",
             "displayName": "TPM Required Policy (current)",
@@ -333,6 +381,14 @@
                 "MFG_ALL",
                 "MFG"
             ],
+            "value_names": [
+                "NONE",
+                "ALL",
+                "OS_KEYS",
+                "POWERVM_SYSKEY",
+                "MFG_ALL",
+                "MFG"
+            ],
             "default_values": ["NONE"],
             "helpText": "Specifies the requested level of security keys to be cleared from the system, requires a reboot to take effect",
             "displayName": "Key Clear Request (pending)"
@@ -347,6 +403,14 @@
                 "MFG_ALL",
                 "MFG"
             ],
+            "value_names": [
+                "NONE",
+                "ALL",
+                "OS_KEYS",
+                "POWERVM_SYSKEY",
+                "MFG_ALL",
+                "MFG"
+            ],
             "default_values": ["NONE"],
             "helpText": "Specifies the requested level of security keys to be cleared from the system for the current IPL. Do not set this attribute directly; set hb_key_clear_request instead.",
             "displayName": "Key Clear Request (current)",
@@ -355,6 +419,7 @@
         {
             "attribute_name": "hb_host_usb_enablement",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Enabled"],
             "helpText": "Specifies if Host USB is disabled or enabled for security reasons, requires a reboot for a change to be applied.",
             "displayName": "Host USB Enablement (pending)"
@@ -362,6 +427,7 @@
         {
             "attribute_name": "hb_host_usb_enablement_current",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Enabled"],
             "helpText": "Specifies if Host USB is disabled or enabled for security reasons. Do not set this attribute directly; set hb_host_usb_enablement instead.",
             "displayName": "Host USB Enablement (current)",
@@ -370,6 +436,7 @@
         {
             "attribute_name": "pvm_auto_poweron_restart",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "Select auto poweron policy. Disabled: Instructs server not to activate any auto poweron logic, Enabled: The system will boot automatically once power is restored after a power disturbance.",
             "displayName": "pvm_auto_poweron_restart",
@@ -387,6 +454,7 @@
         {
             "attribute_name": "hb_lateral_cast_out_mode",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Enabled"],
             "helpText": "Only change this value if instructed by service provider as it might degrade system performance. Specifies if Lateral Cast Out mode is disabled or enabled, requires a reboot for a change to be applied.",
             "displayName": "Lateral Cast Out mode (pending)"
@@ -394,6 +462,7 @@
         {
             "attribute_name": "hb_lateral_cast_out_mode_current",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Enabled"],
             "helpText": "Only change this value if instructed by service provider as it might degrade system performance. Specifies if Lateral Cast Out mode is disabled or enabled. Do not set this attribute directly; set hb_lateral_cast_out_mode instead.",
             "displayName": "Lateral Cast Out mode (current)",
@@ -402,6 +471,7 @@
         {
             "attribute_name": "hb_proc_favor_aggressive_prefetch",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "Only change this value if instructed by service provider as it might degrade system performance. Specifies if Proc Favor Aggressive Prefetch is disabled or enabled, requires a reboot for a change to be applied.",
             "displayName": "Proc Favor Aggressive Prefetch (pending)"
@@ -409,6 +479,7 @@
         {
             "attribute_name": "hb_proc_favor_aggressive_prefetch_current",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "Only change this value if instructed by service provider as it might degrade system performance. Specifies if Proc Favor Aggressive Prefetch is disabled or enabled. Do not set this attribute directly; set hb_proc_favor_aggressive_prefetch instead.",
             "displayName": "Proc Favor Aggressive Prefetch (current)",
@@ -417,6 +488,7 @@
         {
             "attribute_name": "pvm_create_default_lpar",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "When enabled creates a new default partition after NVRAM is cleared. This is primarily for machines that are managed by hardware management console.",
             "displayName": "pvm_create_default_lpar (pending)"
@@ -424,6 +496,7 @@
         {
             "attribute_name": "pvm_create_default_lpar_current",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "When enabled creates a new default partition after NVRAM is cleared. This is primarily for machines that are managed by hardware management console.Do not set this attribute directly; set pvm_create_default_lpar instead.",
             "displayName": "pvm_create_default_lpar (current)",
@@ -432,6 +505,7 @@
         {
             "attribute_name": "pvm_keep_and_clear",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "The hypervisor needs to clear most of PHYP NVRAM, but preserve the NVRAM for the manufacturing default partition",
             "displayName": "pvm_keep_and_clear"
@@ -439,6 +513,7 @@
         {
             "attribute_name": "pvm_clear_nvram",
             "possible_values": ["Disabled", "Enabled"],
+            "value_names": ["Disabled", "Enabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies if the hypervisor needs to clear PHYP NVRAM",
             "displayName": "pvm_clear_nvram"
@@ -446,6 +521,7 @@
         {
             "attribute_name": "pvm_boot_initiator",
             "possible_values": ["User", "HMC", "Host", "Auto"],
+            "value_names": ["User", "HMC", "Host", "Auto"],
             "default_values": ["User"],
             "helpText": "Specifies who initiated the IPL.",
             "displayName": "IPL Initiator (pending)"
@@ -453,6 +529,7 @@
         {
             "attribute_name": "pvm_boot_initiator_current",
             "possible_values": ["User", "HMC", "Host", "Auto"],
+            "value_names": ["User", "HMC", "Host", "Auto"],
             "default_values": ["User"],
             "helpText": "Specifies who initiated the IPL. Set pvm_boot_initiator instead.",
             "displayName": "IPL Initiator (current)",
@@ -461,6 +538,7 @@
         {
             "attribute_name": "pvm_boot_type",
             "possible_values": ["IPL", "ReIPL"],
+            "value_names": ["IPL", "ReIPL"],
             "default_values": ["IPL"],
             "helpText": "Specifies if the boot type is an IPL or a ReIPL",
             "displayName": "Boot Type Indicator (pending)"
@@ -468,6 +546,7 @@
         {
             "attribute_name": "pvm_boot_type_current",
             "possible_values": ["IPL", "ReIPL"],
+            "value_names": ["IPL", "ReIPL"],
             "default_values": ["IPL"],
             "helpText": "Specifies if the boot type is an IPL or a ReIPL. Set pvm_boot_type instead",
             "displayName": "Boot Type Indicator (current)",
@@ -476,6 +555,7 @@
         {
             "attribute_name": "pvm_rpd_guard_policy",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled"],
             "default_values": ["Enabled"],
             "helpText": "Controls whether or not a processor core will be de-configured on error.",
             "displayName": "Guard on error"
@@ -483,6 +563,7 @@
         {
             "attribute_name": "pvm_rpd_policy",
             "possible_values": ["Enabled", "Scheduled", "Disabled"],
+            "value_names": ["Enabled", "Scheduled", "Disabled"],
             "default_values": ["Enabled"],
             "helpText": "Enabled (Run on each core once daily, at an equally spaced interval, to test each core every 24 hours. For example, on a 48-core system, the RPD would test one core every 30 minutes), Run Now (Run sequentially on each core starting immediately), Scheduled (Run sequentially on each core at the scheduled time each day), Disabled (No diagnostics or exercisers will be run).",
             "displayName": "Runtime Processor Diagnostics Policy"
@@ -490,6 +571,7 @@
         {
             "attribute_name": "pvm_rpd_immediate_test",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled", "Automatic"],
             "default_values": ["Disabled"],
             "helpText": "Enabled (Override the pvm_rpd_policy and start a diagnostic test run immediately. RPD will set pvm_rpd_immediate_test to “Disabled” when an immediate test run completes), Disabled (The pvm_rpd_policy is used).",
             "displayName": "Immediate Test Requested"
@@ -497,6 +579,7 @@
         {
             "attribute_name": "pvm_rpd_feature",
             "possible_values": ["Enabled", "Disabled", "Automatic"],
+            "value_names": ["Enabled", "Disabled", "Automatic"],
             "default_values": ["Automatic"],
             "helpText": "Controls whether or not the Runtime Processor Diagnostics (RPD) Feature will be configured on the system. Enabled ( The RPD feature will be configured regardless of the amount of installed memory), Automatic (The RPD feature will be configured on systems with at least 128GB of installed memory and not configured on systems with less than 128GB), Disabled (The RPD feature will not be configured).",
             "displayName": "Runtime Processor Diagnostics Feature"
@@ -504,6 +587,7 @@
         {
             "attribute_name": "pvm_rpd_feature_current",
             "possible_values": ["Enabled", "Disabled", "Automatic"],
+            "value_names": ["Enabled", "Disabled", "Automatic"],
             "default_values": ["Automatic"],
             "helpText": "Controls whether or not the Runtime Processor Diagnostics (RPD) Feature will be configured on the system. Enabled ( The RPD feature will be configured regardless of the amount of installed memory), Automatic (The RPD feature will be configured on systems with at least 128GB of installed memory and not configured on systems with less than 128GB), Disabled (The RPD feature will not be configured).",
             "displayName": "Runtime Processor Diagnostics Feature"
@@ -511,6 +595,7 @@
         {
             "attribute_name": "hb_power_PS0_present",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies if Power Supply 0 is present. (Enabled is Present)",
             "displayName": "Power Supply 0 is functional",
@@ -525,6 +610,7 @@
         {
             "attribute_name": "hb_power_PS1_present",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies if Power Supply 1 is present. (Enabled is Present)",
             "displayName": "Power Supply 1 is functional",
@@ -539,6 +625,7 @@
         {
             "attribute_name": "hb_power_PS2_present",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies if Power Supply 2 is Present. (Enabled is Present)",
             "displayName": "Power Supply 2 is functional",
@@ -553,6 +640,7 @@
         {
             "attribute_name": "hb_power_PS3_present",
             "possible_values": ["Enabled", "Disabled"],
+            "value_names": ["Enabled", "Disabled"],
             "default_values": ["Disabled"],
             "helpText": "Specifies if Power Supply 3 is present. (Enabled is Present)",
             "displayName": "Power Supply 3 is functional",
@@ -567,6 +655,7 @@
         {
             "attribute_name": "pvm_ibmi_network_install_type",
             "possible_values": ["Disabled", "NFS", "iSCSI"],
+            "value_names": ["Disabled", "NFS", "iSCSI"],
             "default_values": ["Disabled"],
             "helpText": "Specifies whether the IBM i network install type is NFS Optical or iSCSI Tape. Disabled: indicates the IBM i Network Install BIOS attributes should not be used.",
             "displayName": "IBM i Network Install Type"
@@ -574,6 +663,7 @@
         {
             "attribute_name": "pvm_ibmi_ipaddress_protocol",
             "possible_values": ["IPv4", "IPv6"],
+            "value_names": ["IPv4", "IPv6"],
             "default_values": ["IPv4"],
             "helpText": "Specifies whether the IP address protocol for IBM i network install is IPv4 or IPv6.",
             "displayName": "IBM i IP Address Protocol"
@@ -581,6 +671,7 @@
         {
             "attribute_name": "pvm_ibmi_max_frame_size",
             "possible_values": ["MTU1500", "MTU9000"],
+            "value_names": ["MTU1500", "MTU9000"],
             "default_values": ["MTU1500"],
             "helpText": "Specifies the maximum frame size (maximum transmission unit, MTU). The value is in terms of bytes per packet size.",
             "displayName": "Maximum Frame Size"
@@ -588,6 +679,7 @@
         {
             "attribute_name": "pvm_linux_kvm_memory",
             "possible_values": ["Automatic", "Custom"],
+            "value_names": ["Automatic", "Custom"],
             "default_values": ["Automatic"],
             "helpText": "Controls whether the system or user specified percentage of available system memory will be reserved for the management of KVM guests. Automatic (default) – The system will determine the percentage of available system memory to be reserved for the management of KVM guests. Custom – The user specified percentage of available system memory will be reserved for the management of KVM guests.",
             "displayName": "Memory setting for KVM Guest Management"
@@ -595,6 +687,7 @@
         {
             "attribute_name": "pvm_linux_kvm_memory_current",
             "possible_values": ["Automatic", "Custom"],
+            "value_names": ["Automatic", "Custom"],
             "default_values": ["Automatic"],
             "helpText": "Controls whether the system or user specified percentage of available system memory will be reserved for the management of KVM guests. Automatic (default) – The system will determine the percentage of available system memory to be reserved for the management of KVM guests. Custom – The user specified percentage of available system memory will be reserved for the management of KVM guests.",
             "displayName": "Memory setting for KVM Guest Management (current)",