diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac4efb6..75e35aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,10 @@
 
 1. pdr: Allow record_handle to be NULL for pldm_pdr_add_check()
 
+### Removed
+
+1. bios_table: Remove pldm_bios_table_attr_entry_integer_encode_length()
+
 ### Fixed
 
 1. requester: Fix response buffer cast in pldm_send_recv()
diff --git a/abi/aarch64/gcc.dump b/abi/aarch64/gcc.dump
index 75aa123..f805635 100644
--- a/abi/aarch64/gcc.dump
+++ b/abi/aarch64/gcc.dump
@@ -158,7 +158,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '109534' => {
+                            '109286' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -177,7 +177,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '109717' => {
+                            '109469' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -221,22 +221,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '10972' => {
-                                         'Header' => 'bios.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_date_time_req'
-                                       },
-                            '109935' => {
+                            '109687' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -255,7 +240,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '110042' => {
+                            '10972' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '109794' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -298,7 +298,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '110335' => {
+                            '110087' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -317,7 +317,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '110513' => {
+                            '110265' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -361,7 +361,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '110711' => {
+                            '110463' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -380,7 +380,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '110813' => {
+                            '110565' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -423,7 +423,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '111106' => {
+                            '110858' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -442,7 +442,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '111213' => {
+                            '110965' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -469,7 +469,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '111431' => {
+                            '111183' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -488,7 +488,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '111604' => {
+                            '111356' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -515,7 +515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '111740' => {
+                            '111492' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -538,7 +538,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '111867' => {
+                            '111619' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -573,7 +573,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '112125' => {
+                            '111877' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -600,7 +600,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '112338' => {
+                            '112090' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -631,7 +631,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '112488' => {
+                            '112240' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -650,7 +650,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '112595' => {
+                            '112347' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -677,7 +677,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '112813' => {
+                            '112565' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -696,7 +696,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '112986' => {
+                            '112738' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -723,7 +723,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '113122' => {
+                            '112874' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -746,7 +746,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '113249' => {
+                            '113001' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -785,7 +785,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '113527' => {
+                            '113279' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -812,7 +812,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '113740' => {
+                            '113492' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -847,7 +847,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '113904' => {
+                            '113656' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -870,7 +870,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '114102' => {
+                            '113854' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -893,7 +893,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '114224' => {
+                            '113976' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -920,7 +920,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '114442' => {
+                            '114194' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -951,7 +951,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '114591' => {
+                            '114343' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -974,7 +974,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '114789' => {
+                            '114541' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1001,7 +1001,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '114919' => {
+                            '114671' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1028,7 +1028,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '115137' => {
+                            '114889' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1055,7 +1055,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '115266' => {
+                            '115018' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1090,7 +1090,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '115432' => {
+                            '115184' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1117,7 +1117,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '115641' => {
+                            '115393' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1152,7 +1152,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '115924' => {
+                            '115676' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1179,7 +1179,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '116053' => {
+                            '115805' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1202,7 +1202,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '116174' => {
+                            '115926' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1237,7 +1237,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '116421' => {
+                            '116173' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1264,7 +1264,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '116625' => {
+                            '116377' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1295,7 +1295,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '117571' => {
+                            '117323' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1326,7 +1326,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '117802' => {
+                            '117554' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1345,7 +1345,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '117890' => {
+                            '117642' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1372,7 +1372,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '118023' => {
+                            '117775' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1395,7 +1395,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '119062' => {
+                            '118814' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -4168,29 +4168,10 @@
                                        },
                             '55449' => {
                                          'Header' => 'bios_table.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'entry',
-                                                               'type' => '166'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entry_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'info',
-                                                               'type' => '55177'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_bios_table_attr_entry_integer_encode'
-                                       },
-                            '55697' => {
-                                         'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_length'
                                        },
-                            '55859' => {
+                            '55611' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4209,7 +4190,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string'
                                        },
-                            '56055' => {
+                            '55807' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4220,7 +4201,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_min_length'
                                        },
-                            '56130' => {
+                            '55882' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4231,7 +4212,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_max_length'
                                        },
-                            '56205' => {
+                            '55957' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4242,7 +4223,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_string_type'
                                        },
-                            '56280' => {
+                            '56032' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4257,7 +4238,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string_length_check'
                                        },
-                            '56456' => {
+                            '56208' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4270,18 +4251,18 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '56742'
+                                                               'type' => '56494'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_check'
                                        },
-                            '56747' => {
+                            '56499' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '56742'
+                                                               'type' => '56494'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
@@ -4291,7 +4272,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_info_check'
                                        },
-                            '57016' => {
+                            '56768' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4302,7 +4283,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_length'
                                        },
-                            '57251' => {
+                            '57003' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4321,7 +4302,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_indices'
                                        },
-                            '57457' => {
+                            '57209' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4340,7 +4321,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_hdls_check'
                                        },
-                            '57615' => {
+                            '57367' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4355,7 +4336,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_num_check'
                                        },
-                            '57780' => {
+                            '57532' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4370,7 +4351,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_num_check'
                                        },
-                            '57846' => {
+                            '57598' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4383,13 +4364,13 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '58104'
+                                                               'type' => '57856'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_check'
                                        },
-                            '58109' => {
+                            '57861' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4404,7 +4385,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_length'
                                        },
-                            '58175' => {
+                            '57927' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4415,7 +4396,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_string_handle'
                                        },
-                            '58228' => {
+                            '57980' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4426,7 +4407,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_type'
                                        },
-                            '58281' => {
+                            '58033' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4437,7 +4418,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_handle'
                                        },
-                            '58903' => {
+                            '58655' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4456,7 +4437,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_check'
                                        },
-                            '59069' => {
+                            '58821' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4467,7 +4448,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_length'
                                        },
-                            '59122' => {
+                            '58874' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4478,7 +4459,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_handle'
                                        },
-                            '59175' => {
+                            '58927' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4501,7 +4482,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_encode_check'
                                        },
-                            '59444' => {
+                            '59196' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4618,6 +4599,17 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_req'
                                       },
+                            '64786' => {
+                                         'Header' => 'utils.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'transfer_flag',
+                                                               'type' => '168'
+                                                             }
+                                                    },
+                                         'Return' => '6265',
+                                         'ShortName' => 'is_transfer_flag_valid'
+                                       },
                             '6491' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -4641,18 +4633,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_resp'
                                       },
-                            '65034' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'transfer_flag',
-                                                               'type' => '168'
-                                                             }
-                                                    },
-                                         'Return' => '6265',
-                                         'ShortName' => 'is_transfer_flag_valid'
-                                       },
-                            '65185' => {
+                            '64937' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4669,17 +4650,17 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'non_functioning_component_indication',
-                                                               'type' => '65369'
+                                                               'type' => '65121'
                                                              },
                                                       '4' => {
                                                                'name' => 'non_functioning_component_bitmap',
-                                                               'type' => '65374'
+                                                               'type' => '65126'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_resp'
                                        },
-                            '65384' => {
+                            '65136' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4698,7 +4679,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_req'
                                        },
-                            '65537' => {
+                            '65289' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4717,7 +4698,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_component_resp'
                                        },
-                            '65619' => {
+                            '65371' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4736,7 +4717,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_component_req'
                                        },
-                            '65772' => {
+                            '65524' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4777,13 +4758,13 @@
                                                              },
                                                       '9' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '66113'
+                                                               'type' => '65865'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_status_resp'
                                        },
-                            '66123' => {
+                            '65875' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4802,7 +4783,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_status_req'
                                        },
-                            '66276' => {
+                            '66028' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4825,7 +4806,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_activate_firmware_resp'
                                        },
-                            '66402' => {
+                            '66154' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4848,7 +4829,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_activate_firmware_req'
                                        },
-                            '66623' => {
+                            '66375' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4871,7 +4852,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_apply_complete_resp'
                                        },
-                            '66795' => {
+                            '66547' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4888,13 +4869,13 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_activation_methods_modification',
-                                                               'type' => '66917'
+                                                               'type' => '66669'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_apply_complete_req'
                                        },
-                            '66927' => {
+                            '66679' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4917,6 +4898,25 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_verify_complete_resp'
                                        },
+                            '66851' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2029'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'verify_result',
+                                                               'type' => '2034'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_verify_complete_req'
+                                       },
                             '6693' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -4940,26 +4940,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_resp'
                                       },
-                            '67099' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2029'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'verify_result',
-                                                               'type' => '2034'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_verify_complete_req'
-                                       },
-                            '67181' => {
+                            '66933' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4982,7 +4963,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_transfer_complete_resp'
                                        },
-                            '67353' => {
+                            '67105' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5001,7 +4982,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_transfer_complete_req'
                                        },
-                            '67435' => {
+                            '67187' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5024,7 +5005,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_firmware_data_resp'
                                        },
-                            '67607' => {
+                            '67359' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5047,7 +5028,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_firmware_data_req'
                                        },
-                            '67739' => {
+                            '67491' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5072,7 +5053,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '66113'
+                                                               'type' => '65865'
                                                              },
                                                       '6' => {
                                                                'name' => 'time_before_req_fw_data',
@@ -5082,7 +5063,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_update_component_resp'
                                        },
-                            '67975' => {
+                            '67727' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5119,7 +5100,7 @@
                                                              },
                                                       '6' => {
                                                                'name' => 'update_option_flags',
-                                                               'type' => '60868'
+                                                               'type' => '60620'
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_ver_str_type',
@@ -5131,7 +5112,7 @@
                                                              },
                                                       '9' => {
                                                                'name' => 'comp_ver_str',
-                                                               'type' => '68379'
+                                                               'type' => '68131'
                                                              }
                                                     },
                                          'Return' => '74',
@@ -5176,7 +5157,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_req'
                                       },
-                            '68389' => {
+                            '68141' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5203,7 +5184,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pass_component_table_resp'
                                        },
-                            '68585' => {
+                            '68337' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5244,7 +5225,7 @@
                                                              },
                                                       '8' => {
                                                                'name' => 'comp_ver_str',
-                                                               'type' => '68379'
+                                                               'type' => '68131'
                                                              },
                                                       '9' => {
                                                                'name' => 'msg',
@@ -5254,7 +5235,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_pass_component_table_req'
                                        },
-                            '68998' => {
+                            '68750' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5281,7 +5262,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_update_resp'
                                        },
-                            '69139' => {
+                            '68891' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5314,7 +5295,7 @@
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_img_set_ver_str',
-                                                               'type' => '68379'
+                                                               'type' => '68131'
                                                              },
                                                       '8' => {
                                                                'name' => 'msg',
@@ -5328,7 +5309,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_update_req'
                                        },
-                            '69504' => {
+                            '69256' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5341,7 +5322,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'component_data',
-                                                               'type' => '69660'
+                                                               'type' => '69412'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_ver_str',
@@ -5355,7 +5336,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp_comp_entry'
                                        },
-                            '69670' => {
+                            '69422' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5368,7 +5349,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'resp_data',
-                                                               'type' => '69890'
+                                                               'type' => '69642'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_image_set_ver_str',
@@ -5386,7 +5367,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp'
                                        },
-                            '69895' => {
+                            '69647' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5405,7 +5386,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_firmware_parameters_req'
                                        },
-                            '70032' => {
+                            '69784' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5430,13 +5411,13 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'descriptor_data',
-                                                               'type' => '70188'
+                                                               'type' => '69940'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_query_device_identifiers_resp'
                                        },
-                            '70198' => {
+                            '69950' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5455,7 +5436,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_query_device_identifiers_req'
                                        },
-                            '70335' => {
+                            '70087' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5468,7 +5449,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_comp_image_info',
-                                                               'type' => '70482'
+                                                               'type' => '70234'
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_version_str',
@@ -5478,7 +5459,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pldm_comp_image_info'
                                        },
-                            '70487' => {
+                            '70239' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5505,7 +5486,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_vendor_defined_descriptor_value'
                                        },
-                            '70666' => {
+                            '70418' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5528,7 +5509,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_descriptor_type_length_value'
                                        },
-                            '70838' => {
+                            '70590' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5545,7 +5526,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'fw_device_id_record',
-                                                               'type' => '71105'
+                                                               'type' => '70857'
                                                              },
                                                       '4' => {
                                                                'name' => 'applicable_components',
@@ -5567,7 +5548,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_firmware_device_id_record'
                                        },
-                            '71110' => {
+                            '70862' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5580,7 +5561,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'package_header_info',
-                                                               'type' => '71257'
+                                                               'type' => '71009'
                                                              },
                                                       '3' => {
                                                                'name' => 'package_version_str',
@@ -5640,7 +5621,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_attribute_current_value_req'
                                       },
-                            '73448' => {
+                            '73200' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5667,7 +5648,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_set_fru_record_table_resp'
                                        },
-                            '73671' => {
+                            '73423' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5694,7 +5675,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_set_fru_record_table_req'
                                        },
-                            '73838' => {
+                            '73590' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5729,7 +5710,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '74086' => {
+                            '73838' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5768,7 +5749,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '74344' => {
+                            '74096' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5795,7 +5776,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '74562' => {
+                            '74314' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5826,30 +5807,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_resp'
                                        },
-                            '7461' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'msg',
-                                                              'type' => '2029'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'completion_code',
-                                                              'type' => '2034'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'next_transfer_handle',
-                                                              'type' => '2039'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
-                                      },
-                            '74723' => {
+                            '74475' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5888,7 +5846,30 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_resp'
                                        },
-                            '75032' => {
+                            '7461' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'msg',
+                                                              'type' => '2029'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'completion_code',
+                                                              'type' => '2034'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'next_transfer_handle',
+                                                              'type' => '2039'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
+                                      },
+                            '74784' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5927,7 +5908,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '75220' => {
+                            '74972' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5970,7 +5951,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_req'
                                        },
-                            '75513' => {
+                            '75265' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6005,6 +5986,41 @@
                                          'Return' => '74',
                                          'ShortName' => 'get_fru_record_by_option_check'
                                        },
+                            '75691' => {
+                                         'Header' => 'fru.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'table',
+                                                               'type' => '6087'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'table_size',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'record_table',
+                                                               'type' => '2034'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'record_size',
+                                                               'type' => '8822'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'rsi',
+                                                               'type' => '4895'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'rt',
+                                                               'type' => '168'
+                                                             },
+                                                      '6' => {
+                                                               'name' => 'ft',
+                                                               'type' => '168'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'get_fru_record_by_option'
+                                       },
                             '7577' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6040,42 +6056,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_req'
                                       },
-                            '75939' => {
-                                         'Header' => 'fru.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'table',
-                                                               'type' => '6087'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'table_size',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'record_table',
-                                                               'type' => '2034'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'record_size',
-                                                               'type' => '8822'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'rsi',
-                                                               'type' => '4895'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'rt',
-                                                               'type' => '168'
-                                                             },
-                                                      '6' => {
-                                                               'name' => 'ft',
-                                                               'type' => '168'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'get_fru_record_by_option'
-                                       },
-                            '76376' => {
+                            '76128' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6118,7 +6099,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
-                            '76639' => {
+                            '76391' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6145,7 +6126,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_resp'
                                        },
-                            '76843' => {
+                            '76595' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6168,7 +6149,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '76959' => {
+                            '76711' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6215,7 +6196,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '77263' => {
+                            '77015' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6263,7 +6244,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '77470' => {
+                            '77222' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6317,7 +6298,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '79087' => {
+                            '78839' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6334,81 +6315,81 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'entities',
-                                                               'type' => '79400'
+                                                               'type' => '79152'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_extract'
                                        },
-                            '79420' => {
+                            '79172' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_is_empty_entity_assoc_tree'
                                        },
-                            '79480' => {
+                            '79232' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy_root'
                                        },
-                            '79543' => {
+                            '79295' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'org_tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              },
                                                       '1' => {
                                                                'name' => 'new_tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_copy_root'
                                        },
-                            '79759' => {
+                            '79511' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79405'
+                                                               'type' => '79157'
                                                              }
                                                     },
-                                         'Return' => '78975',
+                                         'Return' => '78727',
                                          'ShortName' => 'pldm_entity_association_tree_find'
                                        },
-                            '80504' => {
+                            '80256' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80753'
+                                                               'type' => '80505'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_remote_pdrs'
                                        },
-                            '80758' => {
+                            '80510' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80753'
+                                                               'type' => '80505'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6418,40 +6399,40 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
-                            '81027' => {
+                            '80779' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
                                                                'offset' => '-8',
-                                                               'type' => '78116'
+                                                               'type' => '77868'
                                                              },
                                                       '2' => {
                                                                'name' => 'node',
-                                                               'type' => '79754'
+                                                               'type' => '79506'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_find_entity_ref_in_tree'
                                        },
-                            '81544' => {
+                            '81296' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78975'
+                                                               'type' => '78727'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80753'
+                                                               'type' => '80505'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '79400'
+                                                               'type' => '79152'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6469,6 +6450,37 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
+                            '81512' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '78727'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80505'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'entities',
+                                                               'type' => '79152'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'num_entities',
+                                                               'type' => '123'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'is_remote',
+                                                               'type' => '6265'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '4895'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_pdr_add_from_node'
+                                       },
                             '8158' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6496,47 +6508,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '81760' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '78975'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80753'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'entities',
-                                                               'type' => '79400'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'num_entities',
-                                                               'type' => '123'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6265'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '4895'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_pdr_add_from_node'
-                                       },
-                            '82089' => {
+                            '81841' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80753'
+                                                               'type' => '80505'
                                                              },
                                                       '2' => {
                                                                'name' => 'is_remote',
@@ -6581,27 +6562,27 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '83544' => {
+                            '83296' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'parent',
-                                                               'type' => '78975'
+                                                               'type' => '78727'
                                                              },
                                                       '1' => {
                                                                'name' => 'node',
-                                                               'type' => '79405'
+                                                               'type' => '79157'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '83633' => {
+                            '83385' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78975'
+                                                               'type' => '78727'
                                                              },
                                                       '1' => {
                                                                'name' => 'association_type',
@@ -6611,60 +6592,60 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '83848' => {
+                            '83600' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78975'
+                                                               'type' => '78727'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '84003' => {
+                            '83755' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78975'
+                                                               'type' => '78727'
                                                              }
                                                     },
-                                         'Return' => '78116',
+                                         'Return' => '77868',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '84158' => {
+                            '83910' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78975'
+                                                               'type' => '78727'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '84313' => {
+                            '84065' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
-                            '84492' => {
+                            '84244' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              },
                                                       '1' => {
                                                                'name' => 'entities',
-                                                               'type' => '79400'
+                                                               'type' => '79152'
                                                              },
                                                       '2' => {
                                                                'name' => 'size',
@@ -6701,16 +6682,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '85424' => {
+                            '85176' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79475'
+                                                               'type' => '79227'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79405'
+                                                               'type' => '79157'
                                                              },
                                                       '2' => {
                                                                'name' => 'entity_instance_number',
@@ -6718,32 +6699,59 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'parent',
-                                                               'type' => '78975'
+                                                               'type' => '78727'
                                                              },
                                                       '4' => {
                                                                'name' => 'association_type',
                                                                'type' => '168'
                                                              }
                                                     },
-                                         'Return' => '78975',
+                                         'Return' => '78727',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
-                            '85861' => {
+                            '85613' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '79475',
+                                         'Return' => '79227',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
-                            '86095' => {
+                            '85847' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78975'
+                                                               'type' => '78727'
                                                              }
                                                     },
-                                         'Return' => '78116',
+                                         'Return' => '77868',
                                          'ShortName' => 'pldm_entity_extract'
                                        },
+                            '86653' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80251'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '4895'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'tid',
+                                                               'type' => '168'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'tl_eid',
+                                                               'type' => '168'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'valid_bit',
+                                                               'type' => '6265'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_pdr_update_TL_pdr'
+                                       },
                             '8672' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6775,39 +6783,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '86901' => {
+                            '86993' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80499'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '4895'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'tid',
-                                                               'type' => '168'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'tl_eid',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'valid_bit',
-                                                               'type' => '6265'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_pdr_update_TL_pdr'
-                                       },
-                            '87241' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80499'
+                                                               'type' => '80251'
                                                              },
                                                       '1' => {
                                                                'name' => 'fru_rsi',
@@ -6830,15 +6811,15 @@
                                                                'type' => '8294'
                                                              }
                                                     },
-                                         'Return' => '87226',
+                                         'Return' => '86978',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '87572' => {
+                            '87324' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80753'
+                                                               'type' => '80505'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6868,12 +6849,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '87894' => {
+                            '87646' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80753'
+                                                               'type' => '80505'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6903,17 +6884,32 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set'
                                        },
-                            '88233' => {
+                            '87985' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '87226'
+                                                               'type' => '86978'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
+                            '88140' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80251'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'record',
+                                                               'type' => '86978'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_get_record_handle'
+                                       },
                             '8832' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6941,49 +6937,34 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '88388' => {
+                            '88358' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80499'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'record',
-                                                               'type' => '87226'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_get_record_handle'
-                                       },
-                            '88606' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80499'
+                                                               'type' => '80251'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '88737' => {
+                            '88489' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80499'
+                                                               'type' => '80251'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '88868' => {
+                            '88620' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80499'
+                                                               'type' => '80251'
                                                              },
                                                       '1' => {
                                                                'name' => 'pdr_type',
@@ -6991,34 +6972,34 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '87226'
+                                                               'type' => '86978'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
-                                                               'type' => '70188'
+                                                               'type' => '69940'
                                                              },
                                                       '4' => {
                                                                'name' => 'size',
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '87226',
+                                         'Return' => '86978',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
-                            '89046' => {
+                            '88798' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80499'
+                                                               'type' => '80251'
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '87226'
+                                                               'type' => '86978'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '70188'
+                                                               'type' => '69940'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7029,15 +7010,15 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '87226',
+                                         'Return' => '86978',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '89220' => {
+                            '88972' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80499'
+                                                               'type' => '80251'
                                                              },
                                                       '1' => {
                                                                'name' => 'record_handle',
@@ -7045,7 +7026,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '70188'
+                                                               'type' => '69940'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7056,31 +7037,31 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '87226',
+                                         'Return' => '86978',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '89388' => {
+                            '89140' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80753'
+                                                               'type' => '80505'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '89543' => {
+                            '89295' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '80753',
+                                         'Return' => '80505',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '89615' => {
+                            '89367' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80753'
+                                                               'type' => '80505'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7133,12 +7114,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '90049' => {
+                            '89801' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80753'
+                                                               'type' => '80505'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7164,7 +7145,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_add'
                                        },
-                            '91555' => {
+                            '91307' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7175,7 +7156,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '91647' => {
+                            '91399' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7221,7 +7202,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '92057' => {
+                            '91809' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7240,7 +7221,7 @@
                                          'Return' => '12204',
                                          'ShortName' => 'ver2str'
                                        },
-                            '92185' => {
+                            '91937' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7255,72 +7236,72 @@
                                          'Return' => '168',
                                          'ShortName' => 'crc8'
                                        },
-                            '93456' => {
+                            '93208' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93664'
+                                                               'type' => '93416'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '92781'
+                                                               'type' => '92533'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '92793'
+                                                               'type' => '92545'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '93669' => {
+                            '93421' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93664'
+                                                               'type' => '93416'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '92781'
+                                                               'type' => '92533'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '94070'
+                                                               'type' => '93822'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '94075' => {
+                            '93827' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93664'
+                                                               'type' => '93416'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '94160' => {
+                            '93912' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94246'
+                                                               'type' => '93998'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '94251' => {
+                            '94003' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94246'
+                                                               'type' => '93998'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7349,6 +7330,29 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_date_time_resp'
                                       },
+                            '95150' => {
+                                         'Header' => 'pldm.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'eid',
+                                                               'type' => '94488'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'mctp_fd',
+                                                               'type' => '74'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'pldm_req_msg',
+                                                               'type' => '6087'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'req_msg_len',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '94597',
+                                         'ShortName' => 'pldm_send'
+                                       },
                             '9534' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7372,35 +7376,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_date_time_resp'
                                       },
-                            '95398' => {
+                            '95566' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94736'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'mctp_fd',
-                                                               'type' => '74'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'pldm_req_msg',
-                                                               'type' => '6087'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'req_msg_len',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '94845',
-                                         'ShortName' => 'pldm_send'
-                                       },
-                            '95814' => {
-                                         'Header' => 'pldm.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'eid',
-                                                               'type' => '94736'
+                                                               'type' => '94488'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7416,22 +7397,22 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '70188'
+                                                               'type' => '69940'
                                                              },
                                                       '5' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '94845',
+                                         'Return' => '94597',
                                          'ShortName' => 'pldm_send_recv'
                                        },
-                            '96290' => {
+                            '96042' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94736'
+                                                               'type' => '94488'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7443,22 +7424,22 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '70188'
+                                                               'type' => '69940'
                                                              },
                                                       '4' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '94845',
+                                         'Return' => '94597',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '96513' => {
+                            '96265' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94736'
+                                                               'type' => '94488'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7466,19 +7447,19 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '70188'
+                                                               'type' => '69940'
                                                              },
                                                       '3' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '94845',
+                                         'Return' => '94597',
                                          'ShortName' => 'pldm_recv_any'
                                        },
-                            '96955' => {
+                            '96707' => {
                                          'Header' => 'pldm.h',
-                                         'Return' => '94845',
+                                         'Return' => '94597',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9723' => {
@@ -7738,7 +7719,6 @@
                                                  'pldm_bios_table_attr_entry_enum_encode_check' => 1,
                                                  'pldm_bios_table_attr_entry_enum_encode_length' => 1,
                                                  'pldm_bios_table_attr_entry_integer_decode' => 1,
-                                                 'pldm_bios_table_attr_entry_integer_encode' => 1,
                                                  'pldm_bios_table_attr_entry_integer_encode_check' => 1,
                                                  'pldm_bios_table_attr_entry_integer_encode_length' => 1,
                                                  'pldm_bios_table_attr_entry_integer_info_check' => 1,
@@ -9148,7 +9128,7 @@
                                     },
                           '46638' => {
                                        'Header' => undef,
-                                       'Line' => '993',
+                                       'Line' => '982',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'table_data',
@@ -9259,13 +9239,13 @@
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '56742' => {
+                          '56494' => {
                                        'BaseType' => '46106',
                                        'Name' => 'struct pldm_bios_table_attr_entry_string_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '58104' => {
+                          '57856' => {
                                        'BaseType' => '45972',
                                        'Name' => 'struct pldm_bios_table_attr_entry_enum_info const*',
                                        'Size' => '8',
@@ -9301,14 +9281,14 @@
                                       'Size' => '1',
                                       'Type' => 'Intrinsic'
                                     },
-                          '63365' => {
+                          '63117' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '329',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'uuid',
                                                             'offset' => '0',
-                                                            'type' => '63469'
+                                                            'type' => '63221'
                                                           },
                                                    '1' => {
                                                             'name' => 'package_header_format_version',
@@ -9345,13 +9325,13 @@
                                        'Size' => '36',
                                        'Type' => 'Struct'
                                      },
-                          '63469' => {
+                          '63221' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[16]',
                                        'Size' => '16',
                                        'Type' => 'Array'
                                      },
-                          '63501' => {
+                          '63253' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '343',
                                        'Memb' => {
@@ -9368,7 +9348,7 @@
                                                    '2' => {
                                                             'name' => 'device_update_option_flags',
                                                             'offset' => '3',
-                                                            'type' => '60868'
+                                                            'type' => '60620'
                                                           },
                                                    '3' => {
                                                             'name' => 'comp_image_set_version_string_type',
@@ -9390,7 +9370,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '63696' => {
+                          '63448' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '377',
                                        'Memb' => {
@@ -9412,12 +9392,12 @@
                                                    '3' => {
                                                             'name' => 'comp_options',
                                                             'offset' => '8',
-                                                            'type' => '60370'
+                                                            'type' => '60122'
                                                           },
                                                    '4' => {
                                                             'name' => 'requested_comp_activation_method',
                                                             'offset' => '16',
-                                                            'type' => '60370'
+                                                            'type' => '60122'
                                                           },
                                                    '5' => {
                                                             'name' => 'comp_location_offset',
@@ -9444,7 +9424,7 @@
                                        'Size' => '22',
                                        'Type' => 'Struct'
                                      },
-                          '63878' => {
+                          '63630' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '403',
                                        'Memb' => {
@@ -9456,7 +9436,7 @@
                                                    '1' => {
                                                             'name' => 'capabilities_during_update',
                                                             'offset' => '1',
-                                                            'type' => '60868'
+                                                            'type' => '60620'
                                                           },
                                                    '2' => {
                                                             'name' => 'comp_count',
@@ -9488,7 +9468,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '63982' => {
+                          '63734' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '417',
                                        'Memb' => {
@@ -9505,17 +9485,17 @@
                                                    '10' => {
                                                              'name' => 'pending_comp_release_date',
                                                              'offset' => '37',
-                                                             'type' => '64164'
+                                                             'type' => '63916'
                                                            },
                                                    '11' => {
                                                              'name' => 'comp_activation_methods',
                                                              'offset' => '51',
-                                                             'type' => '60370'
+                                                             'type' => '60122'
                                                            },
                                                    '12' => {
                                                              'name' => 'capabilities_during_update',
                                                              'offset' => '53',
-                                                             'type' => '60868'
+                                                             'type' => '60620'
                                                            },
                                                    '2' => {
                                                             'name' => 'comp_classification_index',
@@ -9540,7 +9520,7 @@
                                                    '6' => {
                                                             'name' => 'active_comp_release_date',
                                                             'offset' => '17',
-                                                            'type' => '64164'
+                                                            'type' => '63916'
                                                           },
                                                    '7' => {
                                                             'name' => 'pending_comp_comparison_stamp',
@@ -9562,25 +9542,25 @@
                                        'Size' => '39',
                                        'Type' => 'Struct'
                                      },
-                          '64164' => {
+                          '63916' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[8]',
                                        'Size' => '8',
                                        'Type' => 'Array'
                                      },
+                          '64776' => {
+                                       'BaseType' => '6048',
+                                       'Name' => 'struct variable_field const',
+                                       'Size' => '16',
+                                       'Type' => 'Const'
+                                     },
                           '6481' => {
                                       'BaseType' => '6048',
                                       'Name' => 'struct variable_field*',
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '65024' => {
-                                       'BaseType' => '6048',
-                                       'Name' => 'struct variable_field const',
-                                       'Size' => '16',
-                                       'Type' => 'Const'
-                                     },
-                          '65369' => {
+                          '65121' => {
                                        'BaseType' => '11646',
                                        'Name' => 'bool8_t*',
                                        'Size' => '8',
@@ -9591,44 +9571,44 @@
                                     'Size' => '2',
                                     'Type' => 'Intrinsic'
                                   },
-                          '68379' => {
-                                       'BaseType' => '65024',
+                          '68131' => {
+                                       'BaseType' => '64776',
                                        'Name' => 'struct variable_field const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69660' => {
-                                       'BaseType' => '63982',
+                          '69412' => {
+                                       'BaseType' => '63734',
                                        'Name' => 'struct pldm_component_parameter_entry*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69890' => {
-                                       'BaseType' => '63878',
+                          '69642' => {
+                                       'BaseType' => '63630',
                                        'Name' => 'struct pldm_get_firmware_parameters_resp*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70188' => {
+                          '69940' => {
                                        'BaseType' => '2034',
                                        'Name' => 'uint8_t**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70482' => {
-                                       'BaseType' => '63696',
+                          '70234' => {
+                                       'BaseType' => '63448',
                                        'Name' => 'struct pldm_component_image_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '71105' => {
-                                       'BaseType' => '63501',
+                          '70857' => {
+                                       'BaseType' => '63253',
                                        'Name' => 'struct pldm_firmware_device_id_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '71257' => {
-                                       'BaseType' => '63365',
+                          '71009' => {
+                                       'BaseType' => '63117',
                                        'Name' => 'struct pldm_package_header_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9652,8 +9632,8 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '77881' => {
-                                       'BaseType' => '77898',
+                          '77633' => {
+                                       'BaseType' => '77650',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -9661,13 +9641,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '77893' => {
-                                       'BaseType' => '77881',
+                          '77645' => {
+                                       'BaseType' => '77633',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '77898' => {
+                          '77650' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -9684,12 +9664,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '78970'
+                                                            'type' => '78722'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '78970'
+                                                            'type' => '78722'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -9697,8 +9677,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '77958' => {
-                                       'BaseType' => '77975',
+                          '77710' => {
+                                       'BaseType' => '77727',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -9706,13 +9686,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '77970' => {
-                                       'BaseType' => '77958',
+                          '77722' => {
+                                       'BaseType' => '77710',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '77975' => {
+                          '77727' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -9734,7 +9714,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '78958'
+                                                            'type' => '78710'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -9752,7 +9732,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '78059' => {
+                          '77811' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -9776,16 +9756,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '78116' => {
-                                       'BaseType' => '78059',
+                          '77868' => {
+                                       'BaseType' => '77811',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '78160' => {
-                                       'BaseType' => '78172',
+                          '77912' => {
+                                       'BaseType' => '77924',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -9793,14 +9773,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '78172' => {
+                          '77924' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '78975'
+                                                            'type' => '78727'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -9813,8 +9793,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '78215' => {
-                                       'BaseType' => '78232',
+                          '77967' => {
+                                       'BaseType' => '77984',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -9822,19 +9802,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '78232' => {
+                          '77984' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '78116'
+                                                            'type' => '77868'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '78116'
+                                                            'type' => '77868'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -9844,12 +9824,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '78975'
+                                                            'type' => '78727'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '78975'
+                                                            'type' => '78727'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -9862,56 +9842,56 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '78958' => {
-                                       'BaseType' => '77975',
+                          '78710' => {
+                                       'BaseType' => '77727',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78970' => {
-                                       'BaseType' => '77958',
+                          '78722' => {
+                                       'BaseType' => '77710',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78975' => {
-                                       'BaseType' => '78215',
+                          '78727' => {
+                                       'BaseType' => '77967',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79400' => {
-                                       'BaseType' => '79405',
+                          '79152' => {
+                                       'BaseType' => '79157',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79405' => {
-                                       'BaseType' => '78116',
+                          '79157' => {
+                                       'BaseType' => '77868',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79475' => {
-                                       'BaseType' => '78160',
+                          '79227' => {
+                                       'BaseType' => '77912',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79754' => {
-                                       'BaseType' => '78975',
+                          '79506' => {
+                                       'BaseType' => '78727',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80499' => {
-                                       'BaseType' => '77893',
+                          '80251' => {
+                                       'BaseType' => '77645',
                                        'Name' => 'pldm_pdr const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80753' => {
-                                       'BaseType' => '77881',
+                          '80505' => {
+                                       'BaseType' => '77633',
                                        'Name' => 'pldm_pdr*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9958,8 +9938,8 @@
                                      'Size' => '4',
                                      'Type' => 'Const'
                                    },
-                          '87226' => {
-                                       'BaseType' => '77970',
+                          '86978' => {
+                                       'BaseType' => '77722',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10010,7 +9990,7 @@
                                      'Size' => '8',
                                      'Type' => 'Struct'
                                    },
-                          '92781' => {
+                          '92533' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -10018,7 +9998,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92793' => {
+                          '92545' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -10026,14 +10006,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93170' => {
+                          '92922' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '92793'
+                                                            'type' => '92545'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -10046,14 +10026,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '93209' => {
+                          '92961' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '93251'
+                                                            'type' => '93003'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10066,31 +10046,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '93251' => {
-                                       'BaseType' => '93170',
+                          '93003' => {
+                                       'BaseType' => '92922',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '93664' => {
-                                       'BaseType' => '93209',
+                          '93416' => {
+                                       'BaseType' => '92961',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94070' => {
-                                       'BaseType' => '92793',
+                          '93822' => {
+                                       'BaseType' => '92545',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94246' => {
-                                       'BaseType' => '93664',
+                          '93998' => {
+                                       'BaseType' => '93416',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94736' => {
+                          '94488' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10098,7 +10078,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '94748' => {
+                          '94500' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10159,8 +10139,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '94845' => {
-                                       'BaseType' => '94748',
+                          '94597' => {
+                                       'BaseType' => '94500',
                                        'Header' => 'pldm.h',
                                        'Line' => '28',
                                        'Name' => 'pldm_requester_rc_t',
diff --git a/abi/x86_64/gcc.dump b/abi/x86_64/gcc.dump
index a8fbf9c..857bb4f 100644
--- a/abi/x86_64/gcc.dump
+++ b/abi/x86_64/gcc.dump
@@ -211,7 +211,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '111140' => {
+                            '110892' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -230,7 +230,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '111340' => {
+                            '111092' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -280,7 +280,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '111572' => {
+                            '111324' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -304,7 +304,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '111673' => {
+                            '111425' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -350,7 +350,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '111970' => {
+                            '111722' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -369,7 +369,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '112165' => {
+                            '111917' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -419,7 +419,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '112377' => {
+                            '112129' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -443,7 +443,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '112473' => {
+                            '112225' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -489,7 +489,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '112770' => {
+                            '112522' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -513,7 +513,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '112871' => {
+                            '112623' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -540,22 +540,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '11299' => {
-                                         'Header' => 'bios.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_date_time_req'
-                                       },
-                            '113106' => {
+                            '112858' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -574,7 +559,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '113296' => {
+                            '11299' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '113048' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -605,7 +605,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '113438' => {
+                            '113190' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -634,7 +634,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '113553' => {
+                            '113305' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -670,7 +670,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '113823' => {
+                            '113575' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -697,7 +697,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '114053' => {
+                            '113805' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -732,7 +732,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '114215' => {
+                            '113967' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -756,7 +756,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '114316' => {
+                            '114068' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -783,7 +783,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '114551' => {
+                            '114303' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -802,7 +802,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '114741' => {
+                            '114493' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -833,7 +833,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '114883' => {
+                            '114635' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -862,7 +862,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '114998' => {
+                            '114750' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -903,7 +903,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '115283' => {
+                            '115035' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -930,7 +930,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '115513' => {
+                            '115265' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -970,7 +970,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '115690' => {
+                            '115442' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -993,7 +993,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '115905' => {
+                            '115657' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1022,7 +1022,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '116015' => {
+                            '115767' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1049,7 +1049,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '116250' => {
+                            '116002' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1086,7 +1086,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '116405' => {
+                            '116157' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1109,7 +1109,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '116620' => {
+                            '116372' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1141,7 +1141,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '116756' => {
+                            '116508' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1168,7 +1168,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '116991' => {
+                            '116743' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1199,7 +1199,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '117126' => {
+                            '116878' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1239,7 +1239,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '117299' => {
+                            '117051' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1266,7 +1266,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '117525' => {
+                            '117277' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1302,7 +1302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '117822' => {
+                            '117574' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1333,7 +1333,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '117957' => {
+                            '117709' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1362,7 +1362,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '118066' => {
+                            '117818' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1398,7 +1398,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '118325' => {
+                            '118077' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1425,7 +1425,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '118546' => {
+                            '118298' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1460,7 +1460,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '119513' => {
+                            '119265' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1491,7 +1491,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '119761' => {
+                            '119513' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1515,7 +1515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '119844' => {
+                            '119596' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1546,7 +1546,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '119983' => {
+                            '119735' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1569,7 +1569,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '121052' => {
+                            '120804' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -4495,29 +4495,10 @@
                                        },
                             '56556' => {
                                          'Header' => 'bios_table.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'entry',
-                                                               'type' => '166'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entry_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'info',
-                                                               'type' => '56242'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_bios_table_attr_entry_integer_encode'
-                                       },
-                            '56804' => {
-                                         'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_length'
                                        },
-                            '56966' => {
+                            '56718' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4536,7 +4517,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string'
                                        },
-                            '57162' => {
+                            '56914' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4550,7 +4531,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_min_length'
                                        },
-                            '57231' => {
+                            '56983' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4564,7 +4545,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_max_length'
                                        },
-                            '57300' => {
+                            '57052' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4578,7 +4559,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_string_type'
                                        },
-                            '57369' => {
+                            '57121' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4593,7 +4574,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string_length_check'
                                        },
-                            '57539' => {
+                            '57291' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4606,18 +4587,18 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '57825'
+                                                               'type' => '57577'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_check'
                                        },
-                            '57830' => {
+                            '57582' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '57825'
+                                                               'type' => '57577'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
@@ -4627,7 +4608,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_info_check'
                                        },
-                            '58099' => {
+                            '57851' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4641,7 +4622,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_length'
                                        },
-                            '58331' => {
+                            '58083' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4660,7 +4641,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_indices'
                                        },
-                            '58537' => {
+                            '58289' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4682,7 +4663,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_hdls_check'
                                        },
-                            '58702' => {
+                            '58454' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4697,7 +4678,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_num_check'
                                        },
-                            '58861' => {
+                            '58613' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4716,7 +4697,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_num_check'
                                        },
-                            '58921' => {
+                            '58673' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4729,13 +4710,13 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '59179'
+                                                               'type' => '58931'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_check'
                                        },
-                            '59184' => {
+                            '58936' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4754,7 +4735,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_length'
                                        },
-                            '59244' => {
+                            '58996' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4768,7 +4749,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_string_handle'
                                        },
-                            '59291' => {
+                            '59043' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4782,7 +4763,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_type'
                                        },
-                            '59338' => {
+                            '59090' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4796,7 +4777,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_handle'
                                        },
-                            '59971' => {
+                            '59723' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4815,7 +4796,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_check'
                                        },
-                            '60137' => {
+                            '59889' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4829,7 +4810,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_length'
                                        },
-                            '60184' => {
+                            '59936' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4843,7 +4824,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_handle'
                                        },
-                            '60231' => {
+                            '59983' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4866,7 +4847,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_encode_check'
                                        },
-                            '60522' => {
+                            '60274' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4996,7 +4977,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_req'
                                       },
-                            '66115' => {
+                            '65867' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -5007,7 +4988,7 @@
                                          'Return' => '6423',
                                          'ShortName' => 'is_transfer_flag_valid'
                                        },
-                            '66266' => {
+                            '66018' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5024,17 +5005,17 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'non_functioning_component_indication',
-                                                               'type' => '66453'
+                                                               'type' => '66205'
                                                              },
                                                       '4' => {
                                                                'name' => 'non_functioning_component_bitmap',
-                                                               'type' => '66458'
+                                                               'type' => '66210'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_resp'
                                        },
-                            '66468' => {
+                            '66220' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5053,6 +5034,49 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_req'
                                        },
+                            '66390' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2077'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '2082'
+                                                             }
+                                                    },
+                                         'Reg' => {
+                                                    '0' => 'rdi',
+                                                    '1' => 'rsi',
+                                                    '2' => 'rdx'
+                                                  },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_cancel_update_component_resp'
+                                       },
+                            '66466' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_cancel_update_component_req'
+                                       },
                             '6655' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5076,50 +5100,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_resp'
                                       },
-                            '66638' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2077'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '2082'
-                                                             }
-                                                    },
-                                         'Reg' => {
-                                                    '0' => 'rdi',
-                                                    '1' => 'rsi',
-                                                    '2' => 'rdx'
-                                                  },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_cancel_update_component_resp'
-                                       },
-                            '66714' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_cancel_update_component_req'
-                                       },
-                            '66884' => {
+                            '66636' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5164,13 +5145,13 @@
                                                       '9' => {
                                                                'name' => 'update_option_flags_enabled',
                                                                'offset' => '24',
-                                                               'type' => '67211'
+                                                               'type' => '66963'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_status_resp'
                                        },
-                            '67221' => {
+                            '66973' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5189,7 +5170,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_status_req'
                                        },
-                            '67391' => {
+                            '67143' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5217,7 +5198,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_activate_firmware_resp'
                                        },
-                            '67517' => {
+                            '67269' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5240,7 +5221,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_activate_firmware_req'
                                        },
-                            '67759' => {
+                            '67511' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5263,7 +5244,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_apply_complete_resp'
                                        },
-                            '67948' => {
+                            '67700' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5280,7 +5261,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_activation_methods_modification',
-                                                               'type' => '68058'
+                                                               'type' => '67810'
                                                              }
                                                     },
                                          'Reg' => {
@@ -5292,7 +5273,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_apply_complete_req'
                                        },
-                            '68068' => {
+                            '67820' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5315,7 +5296,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_verify_complete_resp'
                                        },
-                            '68257' => {
+                            '68009' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5339,7 +5320,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_verify_complete_req'
                                        },
-                            '68333' => {
+                            '68085' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5362,7 +5343,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_transfer_complete_resp'
                                        },
-                            '68522' => {
+                            '68274' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5386,7 +5367,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_transfer_complete_req'
                                        },
-                            '68598' => {
+                            '68350' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5409,6 +5390,71 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_firmware_data_resp'
                                        },
+                            '68539' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2077'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'offset',
+                                                               'type' => '2087'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'length',
+                                                               'type' => '2087'
+                                                             }
+                                                    },
+                                         'Reg' => {
+                                                    '0' => 'rdi',
+                                                    '1' => 'rsi',
+                                                    '2' => 'rdx',
+                                                    '3' => 'rcx'
+                                                  },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_request_firmware_data_req'
+                                       },
+                            '68659' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2077'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '2082'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'comp_compatibility_resp',
+                                                               'type' => '2082'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'comp_compatibility_resp_code',
+                                                               'type' => '2082'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'update_option_flags_enabled',
+                                                               'type' => '66963'
+                                                             },
+                                                      '6' => {
+                                                               'name' => 'time_before_req_fw_data',
+                                                               'offset' => '0',
+                                                               'type' => '8521'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_update_component_resp'
+                                       },
                             '6874' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5438,72 +5484,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_resp'
                                       },
-                            '68787' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2077'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'offset',
-                                                               'type' => '2087'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'length',
-                                                               'type' => '2087'
-                                                             }
-                                                    },
-                                         'Reg' => {
-                                                    '0' => 'rdi',
-                                                    '1' => 'rsi',
-                                                    '2' => 'rdx',
-                                                    '3' => 'rcx'
-                                                  },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_request_firmware_data_req'
-                                       },
-                            '68907' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2077'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '2082'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'comp_compatibility_resp',
-                                                               'type' => '2082'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'comp_compatibility_resp_code',
-                                                               'type' => '2082'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'update_option_flags_enabled',
-                                                               'type' => '67211'
-                                                             },
-                                                      '6' => {
-                                                               'name' => 'time_before_req_fw_data',
-                                                               'offset' => '0',
-                                                               'type' => '8521'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_update_component_resp'
-                                       },
-                            '69141' => {
+                            '68893' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5543,7 +5524,7 @@
                                                       '6' => {
                                                                'name' => 'update_option_flags',
                                                                'offset' => '0',
-                                                               'type' => '61949'
+                                                               'type' => '61701'
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_ver_str_type',
@@ -5558,13 +5539,13 @@
                                                       '9' => {
                                                                'name' => 'comp_ver_str',
                                                                'offset' => '24',
-                                                               'type' => '69533'
+                                                               'type' => '69285'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'encode_update_component_req'
                                        },
-                            '69543' => {
+                            '69295' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5591,7 +5572,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pass_component_table_resp'
                                        },
-                            '69742' => {
+                            '69494' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5636,7 +5617,7 @@
                                                       '8' => {
                                                                'name' => 'comp_ver_str',
                                                                'offset' => '16',
-                                                               'type' => '69533'
+                                                               'type' => '69285'
                                                              },
                                                       '9' => {
                                                                'name' => 'msg',
@@ -5688,7 +5669,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_req'
                                       },
-                            '70152' => {
+                            '69904' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5719,7 +5700,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_update_resp'
                                        },
-                            '70299' => {
+                            '70051' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5754,7 +5735,7 @@
                                                       '7' => {
                                                                'name' => 'comp_img_set_ver_str',
                                                                'offset' => '8',
-                                                               'type' => '69533'
+                                                               'type' => '69285'
                                                              },
                                                       '8' => {
                                                                'name' => 'msg',
@@ -5770,7 +5751,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_update_req'
                                        },
-                            '70667' => {
+                            '70419' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5783,7 +5764,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'component_data',
-                                                               'type' => '70835'
+                                                               'type' => '70587'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_ver_str',
@@ -5800,7 +5781,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp_comp_entry'
                                        },
-                            '70845' => {
+                            '70597' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5813,7 +5794,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'resp_data',
-                                                               'type' => '71065'
+                                                               'type' => '70817'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_image_set_ver_str',
@@ -5831,7 +5812,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp'
                                        },
-                            '71070' => {
+                            '70822' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5850,7 +5831,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_firmware_parameters_req'
                                        },
-                            '71210' => {
+                            '70962' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5875,7 +5856,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'descriptor_data',
-                                                               'type' => '71366'
+                                                               'type' => '71118'
                                                              }
                                                     },
                                          'Reg' => {
@@ -5886,7 +5867,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_query_device_identifiers_resp'
                                        },
-                            '71376' => {
+                            '71128' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5905,7 +5886,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_query_device_identifiers_req'
                                        },
-                            '71516' => {
+                            '71268' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5918,7 +5899,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_comp_image_info',
-                                                               'type' => '71663'
+                                                               'type' => '71415'
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_version_str',
@@ -5928,7 +5909,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pldm_comp_image_info'
                                        },
-                            '71668' => {
+                            '71420' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5955,7 +5936,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_vendor_defined_descriptor_value'
                                        },
-                            '71850' => {
+                            '71602' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5978,7 +5959,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_descriptor_type_length_value'
                                        },
-                            '72022' => {
+                            '71774' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5995,7 +5976,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'fw_device_id_record',
-                                                               'type' => '72279'
+                                                               'type' => '72031'
                                                              },
                                                       '4' => {
                                                                'name' => 'applicable_components',
@@ -6019,7 +6000,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_firmware_device_id_record'
                                        },
-                            '72284' => {
+                            '72036' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -6032,7 +6013,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'package_header_info',
-                                                               'type' => '72431'
+                                                               'type' => '72183'
                                                              },
                                                       '3' => {
                                                                'name' => 'package_version_str',
@@ -6065,7 +6046,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_resp'
                                       },
-                            '74589' => {
+                            '74341' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6092,7 +6073,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_set_fru_record_table_resp'
                                        },
-                            '74829' => {
+                            '74581' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6123,7 +6104,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_set_fru_record_table_req'
                                        },
-                            '74996' => {
+                            '74748' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6159,38 +6140,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '7515' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'msg',
-                                                              'type' => '2077'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'transfer_handle',
-                                                              'type' => '2087'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'transfer_flag',
-                                                              'type' => '2082'
-                                                            },
-                                                     '4' => {
-                                                              'name' => 'attribute',
-                                                              'type' => '6645'
-                                                            }
-                                                   },
-                                        'Reg' => {
-                                                   '3' => 'rcx',
-                                                   '4' => 'r8'
-                                                 },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_set_bios_attribute_current_value_req'
-                                      },
-                            '75226' => {
+                            '74978' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6231,7 +6181,38 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '75474' => {
+                            '7515' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'msg',
+                                                              'type' => '2077'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'transfer_handle',
+                                                              'type' => '2087'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'transfer_flag',
+                                                              'type' => '2082'
+                                                            },
+                                                     '4' => {
+                                                              'name' => 'attribute',
+                                                              'type' => '6645'
+                                                            }
+                                                   },
+                                        'Reg' => {
+                                                   '3' => 'rcx',
+                                                   '4' => 'r8'
+                                                 },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_set_bios_attribute_current_value_req'
+                                      },
+                            '75226' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6258,7 +6239,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '75709' => {
+                            '75461' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6293,7 +6274,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_resp'
                                        },
-                            '75876' => {
+                            '75628' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6334,7 +6315,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_resp'
                                        },
-                            '76194' => {
+                            '75946' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6379,7 +6360,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '76396' => {
+                            '76148' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6425,36 +6406,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_req'
                                        },
-                            '7662' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'msg',
-                                                              'type' => '2077'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'completion_code',
-                                                              'type' => '2082'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'next_transfer_handle',
-                                                              'type' => '2087'
-                                                            }
-                                                   },
-                                        'Reg' => {
-                                                   '0' => 'rdi',
-                                                   '1' => 'rsi',
-                                                   '2' => 'rdx',
-                                                   '3' => 'rcx'
-                                                 },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
-                                      },
-                            '76693' => {
+                            '76445' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6490,7 +6442,36 @@
                                          'Return' => '74',
                                          'ShortName' => 'get_fru_record_by_option_check'
                                        },
-                            '77116' => {
+                            '7662' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'msg',
+                                                              'type' => '2077'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'completion_code',
+                                                              'type' => '2082'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'next_transfer_handle',
+                                                              'type' => '2087'
+                                                            }
+                                                   },
+                                        'Reg' => {
+                                                   '0' => 'rdi',
+                                                   '1' => 'rsi',
+                                                   '2' => 'rdx',
+                                                   '3' => 'rcx'
+                                                 },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
+                                      },
+                            '76868' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6526,7 +6507,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'get_fru_record_by_option'
                                        },
-                            '77542' => {
+                            '77294' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6572,6 +6553,33 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
+                            '77542' => {
+                                         'Header' => 'fru.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '168'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'next_data_transfer_handle',
+                                                               'type' => '180'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'transfer_flag',
+                                                               'type' => '168'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_fru_record_table_resp'
+                                       },
                             '7772' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6608,34 +6616,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_req'
                                       },
-                            '77790' => {
-                                         'Header' => 'fru.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '168'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'next_data_transfer_handle',
-                                                               'type' => '180'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'transfer_flag',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_fru_record_table_resp'
-                                       },
-                            '78011' => {
+                            '77763' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6664,7 +6645,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '78115' => {
+                            '77867' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6715,7 +6696,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '78418' => {
+                            '78170' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6770,7 +6751,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '78628' => {
+                            '78380' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6789,7 +6770,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_req'
                                        },
-                            '80271' => {
+                            '80023' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6806,18 +6787,18 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'entities',
-                                                               'type' => '80584'
+                                                               'type' => '80336'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_extract'
                                        },
-                            '80604' => {
+                            '80356' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80653'
+                                                               'type' => '80405'
                                                              }
                                                     },
                                          'Reg' => {
@@ -6826,17 +6807,47 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_empty_entity_assoc_tree'
                                        },
-                            '80658' => {
+                            '80410' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80653'
+                                                               'type' => '80405'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy_root'
                                        },
+                            '80473' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'org_tree',
+                                                               'type' => '80405'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'new_tree',
+                                                               'type' => '80405'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_tree_copy_root'
+                                       },
+                            '80689' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '80405'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'entity',
+                                                               'type' => '80341'
+                                                             }
+                                                    },
+                                         'Return' => '79911',
+                                         'ShortName' => 'pldm_entity_association_tree_find'
+                                       },
                             '8072' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6873,53 +6884,23 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '80721' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'org_tree',
-                                                               'type' => '80653'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'new_tree',
-                                                               'type' => '80653'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_tree_copy_root'
-                                       },
-                            '80937' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '80653'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entity',
-                                                               'type' => '80589'
-                                                             }
-                                                    },
-                                         'Return' => '80159',
-                                         'ShortName' => 'pldm_entity_association_tree_find'
-                                       },
-                            '81719' => {
+                            '81471' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_remote_pdrs'
                                        },
-                            '81973' => {
+                            '81725' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6929,39 +6910,39 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
-                            '82242' => {
+                            '81994' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80653'
+                                                               'type' => '80405'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79300'
+                                                               'type' => '79052'
                                                              },
                                                       '2' => {
                                                                'name' => 'node',
-                                                               'type' => '80932'
+                                                               'type' => '80684'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_find_entity_ref_in_tree'
                                        },
-                            '82754' => {
+                            '82506' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '80159'
+                                                               'type' => '79911'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '80584'
+                                                               'type' => '80336'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6979,20 +6960,20 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '82972' => {
+                            '82724' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '80159'
+                                                               'type' => '79911'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '80584'
+                                                               'type' => '80336'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -7010,16 +6991,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node'
                                        },
-                            '83308' => {
+                            '83060' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80653'
+                                                               'type' => '80405'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              },
                                                       '2' => {
                                                                'name' => 'is_remote',
@@ -7064,16 +7045,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '84780' => {
+                            '84532' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'parent',
-                                                               'type' => '80159'
+                                                               'type' => '79911'
                                                              },
                                                       '1' => {
                                                                'name' => 'node',
-                                                               'type' => '80589'
+                                                               'type' => '80341'
                                                              }
                                                     },
                                          'Reg' => {
@@ -7082,12 +7063,12 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '84869' => {
+                            '84621' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '80159'
+                                                               'type' => '79911'
                                                              },
                                                       '1' => {
                                                                'name' => 'association_type',
@@ -7097,28 +7078,50 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '85084' => {
+                            '84836' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '80159'
+                                                               'type' => '79911'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '85239' => {
+                            '84991' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '80159'
+                                                               'type' => '79911'
                                                              }
                                                     },
-                                         'Return' => '79300',
+                                         'Return' => '79052',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
+                            '85146' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '79911'
+                                                             }
+                                                    },
+                                         'Return' => '6423',
+                                         'ShortName' => 'pldm_entity_is_node_parent'
+                                       },
+                            '85301' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '80405'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_tree_destroy'
+                                       },
                             '8531' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7154,38 +7157,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '85394' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '80159'
-                                                             }
-                                                    },
-                                         'Return' => '6423',
-                                         'ShortName' => 'pldm_entity_is_node_parent'
-                                       },
-                            '85549' => {
+                            '85480' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80653'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_tree_destroy'
-                                       },
-                            '85728' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '80653'
+                                                               'type' => '80405'
                                                              },
                                                       '1' => {
                                                                'name' => 'entities',
-                                                               'type' => '80584'
+                                                               'type' => '80336'
                                                              },
                                                       '2' => {
                                                                'name' => 'size',
@@ -7195,16 +7176,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_visit'
                                        },
-                            '86690' => {
+                            '86442' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80653'
+                                                               'type' => '80405'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '80589'
+                                                               'type' => '80341'
                                                              },
                                                       '2' => {
                                                                'name' => 'entity_instance_number',
@@ -7212,16 +7193,21 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'parent',
-                                                               'type' => '80159'
+                                                               'type' => '79911'
                                                              },
                                                       '4' => {
                                                                'name' => 'association_type',
                                                                'type' => '168'
                                                              }
                                                     },
-                                         'Return' => '80159',
+                                         'Return' => '79911',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
+                            '86875' => {
+                                         'Header' => 'pdr.h',
+                                         'Return' => '80405',
+                                         'ShortName' => 'pldm_entity_association_tree_init'
+                                       },
                             '8693' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7249,28 +7235,23 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '87123' => {
-                                         'Header' => 'pdr.h',
-                                         'Return' => '80653',
-                                         'ShortName' => 'pldm_entity_association_tree_init'
-                                       },
-                            '87357' => {
+                            '87109' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '80159'
+                                                               'type' => '79911'
                                                              }
                                                     },
-                                         'Return' => '79300',
+                                         'Return' => '79052',
                                          'ShortName' => 'pldm_entity_extract'
                                        },
-                            '88152' => {
+                            '87904' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81714'
+                                                               'type' => '81466'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7292,12 +7273,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
-                            '88512' => {
+                            '88264' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81714'
+                                                               'type' => '81466'
                                                              },
                                                       '1' => {
                                                                'name' => 'fru_rsi',
@@ -7320,15 +7301,15 @@
                                                                'type' => '8521'
                                                              }
                                                     },
-                                         'Return' => '88497',
+                                         'Return' => '88249',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '88866' => {
+                            '88618' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7359,12 +7340,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '89204' => {
+                            '88956' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7429,60 +7410,60 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '89557' => {
+                            '89309' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '88497'
+                                                               'type' => '88249'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '89712' => {
+                            '89464' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81714'
+                                                               'type' => '81466'
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '88497'
+                                                               'type' => '88249'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
-                            '89930' => {
+                            '89682' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81714'
+                                                               'type' => '81466'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '90061' => {
+                            '89813' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81714'
+                                                               'type' => '81466'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '90192' => {
+                            '89944' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81714'
+                                                               'type' => '81466'
                                                              },
                                                       '1' => {
                                                                'name' => 'pdr_type',
@@ -7490,11 +7471,11 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '88497'
+                                                               'type' => '88249'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
-                                                               'type' => '71366'
+                                                               'type' => '71118'
                                                              },
                                                       '4' => {
                                                                'name' => 'size',
@@ -7506,23 +7487,23 @@
                                                     '3' => 'rcx',
                                                     '4' => 'r8'
                                                   },
-                                         'Return' => '88497',
+                                         'Return' => '88249',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
-                            '90364' => {
+                            '90116' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81714'
+                                                               'type' => '81466'
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '88497'
+                                                               'type' => '88249'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '71366'
+                                                               'type' => '71118'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7533,15 +7514,15 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '88497',
+                                         'Return' => '88249',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '90531' => {
+                            '90283' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81714'
+                                                               'type' => '81466'
                                                              },
                                                       '1' => {
                                                                'name' => 'record_handle',
@@ -7549,7 +7530,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '71366'
+                                                               'type' => '71118'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7560,31 +7541,31 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '88497',
+                                         'Return' => '88249',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '90699' => {
+                            '90451' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '90854' => {
+                            '90606' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '81968',
+                                         'Return' => '81720',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '90926' => {
+                            '90678' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7641,12 +7622,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '91364' => {
+                            '91116' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81968'
+                                                               'type' => '81720'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7699,7 +7680,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '92863' => {
+                            '92615' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7710,7 +7691,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '92992' => {
+                            '92744' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7721,7 +7702,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
-                            '93393' => {
+                            '93145' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7743,7 +7724,7 @@
                                          'Return' => '12557',
                                          'ShortName' => 'ver2str'
                                        },
-                            '93521' => {
+                            '93273' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7758,6 +7739,25 @@
                                          'Return' => '168',
                                          'ShortName' => 'crc8'
                                        },
+                            '94531' => {
+                                         'Header' => 'instance-id.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'ctx',
+                                                               'type' => '94754'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'tid',
+                                                               'type' => '93853'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'iid',
+                                                               'type' => '93865'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_instance_id_free'
+                                       },
                             '9464' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7794,72 +7794,53 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '94779' => {
+                            '94759' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '95002'
+                                                               'type' => '94754'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '94101'
+                                                               'type' => '93853'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '94113'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_instance_id_free'
-                                       },
-                            '95007' => {
-                                         'Header' => 'instance-id.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'ctx',
-                                                               'type' => '95002'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'tid',
-                                                               'type' => '94101'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'iid',
-                                                               'type' => '95428'
+                                                               'type' => '95180'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '95433' => {
+                            '95185' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '95002'
+                                                               'type' => '94754'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '95518' => {
+                            '95270' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '95604'
+                                                               'type' => '95356'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '95609' => {
+                            '95361' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '95604'
+                                                               'type' => '95356'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7869,12 +7850,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init'
                                        },
-                            '96782' => {
+                            '96534' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '96120'
+                                                               'type' => '95872'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7889,15 +7870,15 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '96229',
+                                         'Return' => '95981',
                                          'ShortName' => 'pldm_send'
                                        },
-                            '97201' => {
+                            '96953' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '96120'
+                                                               'type' => '95872'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7913,16 +7894,43 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '71366'
+                                                               'type' => '71118'
                                                              },
                                                       '5' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '96229',
+                                         'Return' => '95981',
                                          'ShortName' => 'pldm_send_recv'
                                        },
+                            '97436' => {
+                                         'Header' => 'pldm.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'eid',
+                                                               'type' => '95872'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'mctp_fd',
+                                                               'type' => '74'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'pldm_resp_msg',
+                                                               'type' => '71118'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'resp_msg_len',
+                                                               'type' => '9084'
+                                                             }
+                                                    },
+                                         'Return' => '95981',
+                                         'ShortName' => 'pldm_recv'
+                                       },
                             '9755' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7947,39 +7955,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_date_time_resp'
                                       },
-                            '97684' => {
+                            '97662' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '96120'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'mctp_fd',
-                                                               'type' => '74'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'pldm_resp_msg',
-                                                               'type' => '71366'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'resp_msg_len',
-                                                               'type' => '9084'
-                                                             }
-                                                    },
-                                         'Return' => '96229',
-                                         'ShortName' => 'pldm_recv'
-                                       },
-                            '97910' => {
-                                         'Header' => 'pldm.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'eid',
-                                                               'type' => '96120'
+                                                               'type' => '95872'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7987,16 +7968,21 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '71366'
+                                                               'type' => '71118'
                                                              },
                                                       '3' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '96229',
+                                         'Return' => '95981',
                                          'ShortName' => 'pldm_recv_any'
                                        },
+                            '98107' => {
+                                         'Header' => 'pldm.h',
+                                         'Return' => '95981',
+                                         'ShortName' => 'pldm_open'
+                                       },
                             '9827' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -8019,12 +8005,7 @@
                                                    },
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_date_time_resp'
-                                      },
-                            '98355' => {
-                                         'Header' => 'pldm.h',
-                                         'Return' => '96229',
-                                         'ShortName' => 'pldm_open'
-                                       }
+                                      }
                           },
           'SymbolVersion' => {},
           'Symbols' => {
@@ -8243,7 +8224,6 @@
                                                  'pldm_bios_table_attr_entry_enum_encode_check' => 1,
                                                  'pldm_bios_table_attr_entry_enum_encode_length' => 1,
                                                  'pldm_bios_table_attr_entry_integer_decode' => 1,
-                                                 'pldm_bios_table_attr_entry_integer_encode' => 1,
                                                  'pldm_bios_table_attr_entry_integer_encode_check' => 1,
                                                  'pldm_bios_table_attr_entry_integer_encode_length' => 1,
                                                  'pldm_bios_table_attr_entry_integer_info_check' => 1,
@@ -9641,7 +9621,7 @@
                                      },
                           '47725' => {
                                        'Header' => undef,
-                                       'Line' => '993',
+                                       'Line' => '982',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'table_data',
@@ -9764,13 +9744,13 @@
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '57825' => {
+                          '57577' => {
                                        'BaseType' => '47193',
                                        'Name' => 'struct pldm_bios_table_attr_entry_string_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '59179' => {
+                          '58931' => {
                                        'BaseType' => '47059',
                                        'Name' => 'struct pldm_bios_table_attr_entry_enum_info const*',
                                        'Size' => '8',
@@ -9801,19 +9781,14 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '6423' => {
-                                      'Name' => '_Bool',
-                                      'Size' => '1',
-                                      'Type' => 'Intrinsic'
-                                    },
-                          '64446' => {
+                          '64198' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '329',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'uuid',
                                                             'offset' => '0',
-                                                            'type' => '64550'
+                                                            'type' => '64302'
                                                           },
                                                    '1' => {
                                                             'name' => 'package_header_format_version',
@@ -9850,13 +9825,18 @@
                                        'Size' => '36',
                                        'Type' => 'Struct'
                                      },
-                          '64550' => {
+                          '6423' => {
+                                      'Name' => '_Bool',
+                                      'Size' => '1',
+                                      'Type' => 'Intrinsic'
+                                    },
+                          '64302' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[16]',
                                        'Size' => '16',
                                        'Type' => 'Array'
                                      },
-                          '64582' => {
+                          '64334' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '343',
                                        'Memb' => {
@@ -9873,7 +9853,7 @@
                                                    '2' => {
                                                             'name' => 'device_update_option_flags',
                                                             'offset' => '3',
-                                                            'type' => '61949'
+                                                            'type' => '61701'
                                                           },
                                                    '3' => {
                                                             'name' => 'comp_image_set_version_string_type',
@@ -9895,7 +9875,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '64777' => {
+                          '64529' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '377',
                                        'Memb' => {
@@ -9917,12 +9897,12 @@
                                                    '3' => {
                                                             'name' => 'comp_options',
                                                             'offset' => '8',
-                                                            'type' => '61451'
+                                                            'type' => '61203'
                                                           },
                                                    '4' => {
                                                             'name' => 'requested_comp_activation_method',
                                                             'offset' => '16',
-                                                            'type' => '61451'
+                                                            'type' => '61203'
                                                           },
                                                    '5' => {
                                                             'name' => 'comp_location_offset',
@@ -9949,7 +9929,7 @@
                                        'Size' => '22',
                                        'Type' => 'Struct'
                                      },
-                          '64959' => {
+                          '64711' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '403',
                                        'Memb' => {
@@ -9961,7 +9941,7 @@
                                                    '1' => {
                                                             'name' => 'capabilities_during_update',
                                                             'offset' => '1',
-                                                            'type' => '61949'
+                                                            'type' => '61701'
                                                           },
                                                    '2' => {
                                                             'name' => 'comp_count',
@@ -9993,7 +9973,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '65063' => {
+                          '64815' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '417',
                                        'Memb' => {
@@ -10010,17 +9990,17 @@
                                                    '10' => {
                                                              'name' => 'pending_comp_release_date',
                                                              'offset' => '37',
-                                                             'type' => '65245'
+                                                             'type' => '64997'
                                                            },
                                                    '11' => {
                                                              'name' => 'comp_activation_methods',
                                                              'offset' => '51',
-                                                             'type' => '61451'
+                                                             'type' => '61203'
                                                            },
                                                    '12' => {
                                                              'name' => 'capabilities_during_update',
                                                              'offset' => '53',
-                                                             'type' => '61949'
+                                                             'type' => '61701'
                                                            },
                                                    '2' => {
                                                             'name' => 'comp_classification_index',
@@ -10045,7 +10025,7 @@
                                                    '6' => {
                                                             'name' => 'active_comp_release_date',
                                                             'offset' => '17',
-                                                            'type' => '65245'
+                                                            'type' => '64997'
                                                           },
                                                    '7' => {
                                                             'name' => 'pending_comp_comparison_stamp',
@@ -10067,54 +10047,54 @@
                                        'Size' => '39',
                                        'Type' => 'Struct'
                                      },
-                          '65245' => {
+                          '64997' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[8]',
                                        'Size' => '8',
                                        'Type' => 'Array'
                                      },
-                          '66105' => {
+                          '65857' => {
                                        'BaseType' => '6206',
                                        'Name' => 'struct variable_field const',
                                        'Size' => '16',
                                        'Type' => 'Const'
                                      },
+                          '66205' => {
+                                       'BaseType' => '11999',
+                                       'Name' => 'bool8_t*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '6645' => {
                                       'BaseType' => '6206',
                                       'Name' => 'struct variable_field*',
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '66453' => {
-                                       'BaseType' => '11999',
-                                       'Name' => 'bool8_t*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
                           '67' => {
                                     'Name' => 'unsigned short',
                                     'Size' => '2',
                                     'Type' => 'Intrinsic'
                                   },
-                          '69533' => {
-                                       'BaseType' => '66105',
+                          '69285' => {
+                                       'BaseType' => '65857',
                                        'Name' => 'struct variable_field const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70835' => {
-                                       'BaseType' => '65063',
+                          '70587' => {
+                                       'BaseType' => '64815',
                                        'Name' => 'struct pldm_component_parameter_entry*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '71065' => {
-                                       'BaseType' => '64959',
+                          '70817' => {
+                                       'BaseType' => '64711',
                                        'Name' => 'struct pldm_get_firmware_parameters_resp*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '71366' => {
+                          '71118' => {
                                        'BaseType' => '2082',
                                        'Name' => 'uint8_t**',
                                        'Size' => '8',
@@ -10134,20 +10114,20 @@
                                      'Size' => '3',
                                      'Type' => 'Struct'
                                    },
-                          '71663' => {
-                                       'BaseType' => '64777',
+                          '71415' => {
+                                       'BaseType' => '64529',
                                        'Name' => 'struct pldm_component_image_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '72279' => {
-                                       'BaseType' => '64582',
+                          '72031' => {
+                                       'BaseType' => '64334',
                                        'Name' => 'struct pldm_firmware_device_id_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '72431' => {
-                                       'BaseType' => '64446',
+                          '72183' => {
+                                       'BaseType' => '64198',
                                        'Name' => 'struct pldm_package_header_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10157,8 +10137,8 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '79065' => {
-                                       'BaseType' => '79082',
+                          '78817' => {
+                                       'BaseType' => '78834',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -10166,13 +10146,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '79077' => {
-                                       'BaseType' => '79065',
+                          '78829' => {
+                                       'BaseType' => '78817',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '79082' => {
+                          '78834' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -10189,12 +10169,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '80154'
+                                                            'type' => '79906'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '80154'
+                                                            'type' => '79906'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -10202,8 +10182,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '79142' => {
-                                       'BaseType' => '79159',
+                          '78894' => {
+                                       'BaseType' => '78911',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -10211,13 +10191,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '79154' => {
-                                       'BaseType' => '79142',
+                          '78906' => {
+                                       'BaseType' => '78894',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '79159' => {
+                          '78911' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -10239,7 +10219,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '80142'
+                                                            'type' => '79894'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -10257,7 +10237,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '79243' => {
+                          '78995' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -10281,16 +10261,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '79300' => {
-                                       'BaseType' => '79243',
+                          '79052' => {
+                                       'BaseType' => '78995',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '79344' => {
-                                       'BaseType' => '79356',
+                          '79096' => {
+                                       'BaseType' => '79108',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -10298,14 +10278,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '79356' => {
+                          '79108' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '80159'
+                                                            'type' => '79911'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -10318,8 +10298,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '79399' => {
-                                       'BaseType' => '79416',
+                          '79151' => {
+                                       'BaseType' => '79168',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -10327,19 +10307,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '79416' => {
+                          '79168' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '79300'
+                                                            'type' => '79052'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '79300'
+                                                            'type' => '79052'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -10349,12 +10329,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '80159'
+                                                            'type' => '79911'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '80159'
+                                                            'type' => '79911'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -10367,44 +10347,44 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '80142' => {
-                                       'BaseType' => '79159',
+                          '79894' => {
+                                       'BaseType' => '78911',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80154' => {
-                                       'BaseType' => '79142',
+                          '79906' => {
+                                       'BaseType' => '78894',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80159' => {
-                                       'BaseType' => '79399',
+                          '79911' => {
+                                       'BaseType' => '79151',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80584' => {
-                                       'BaseType' => '80589',
+                          '80336' => {
+                                       'BaseType' => '80341',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80589' => {
-                                       'BaseType' => '79300',
+                          '80341' => {
+                                       'BaseType' => '79052',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80653' => {
-                                       'BaseType' => '79344',
+                          '80405' => {
+                                       'BaseType' => '79096',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80932' => {
-                                       'BaseType' => '80159',
+                          '80684' => {
+                                       'BaseType' => '79911',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10414,14 +10394,14 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '81714' => {
-                                       'BaseType' => '79077',
+                          '81466' => {
+                                       'BaseType' => '78829',
                                        'Name' => 'pldm_pdr const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '81968' => {
-                                       'BaseType' => '79065',
+                          '81720' => {
+                                       'BaseType' => '78817',
                                        'Name' => 'pldm_pdr*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10469,8 +10449,8 @@
                                      'Size' => '1',
                                      'Type' => 'Array'
                                    },
-                          '88497' => {
-                                       'BaseType' => '79154',
+                          '88249' => {
+                                       'BaseType' => '78906',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10515,7 +10495,7 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '94101' => {
+                          '93853' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -10523,7 +10503,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '94113' => {
+                          '93865' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -10531,14 +10511,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '94493' => {
+                          '94245' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '94113'
+                                                            'type' => '93865'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -10551,14 +10531,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '94532' => {
+                          '94284' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '94574'
+                                                            'type' => '94326'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10571,31 +10551,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '94574' => {
-                                       'BaseType' => '94493',
+                          '94326' => {
+                                       'BaseType' => '94245',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '95002' => {
-                                       'BaseType' => '94532',
+                          '94754' => {
+                                       'BaseType' => '94284',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '95428' => {
-                                       'BaseType' => '94113',
+                          '95180' => {
+                                       'BaseType' => '93865',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '95604' => {
-                                       'BaseType' => '95002',
+                          '95356' => {
+                                       'BaseType' => '94754',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '96120' => {
+                          '95872' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10603,7 +10583,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '96132' => {
+                          '95884' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10664,8 +10644,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '96229' => {
-                                       'BaseType' => '96132',
+                          '95981' => {
+                                       'BaseType' => '95884',
                                        'Header' => 'pldm.h',
                                        'Line' => '28',
                                        'Name' => 'pldm_requester_rc_t',
diff --git a/include/libpldm/bios_table.h b/include/libpldm/bios_table.h
index 0424b49..b492f2d 100644
--- a/include/libpldm/bios_table.h
+++ b/include/libpldm/bios_table.h
@@ -404,16 +404,6 @@
  */
 size_t pldm_bios_table_attr_entry_integer_encode_length(void);
 
-/** @brief Create an entry of BIOS Attribute Table (type: integer)
- *  @param[out] entry - Pointer to a buffer to create an entry
- *  @param[in] entry_length - Length of the buffer to create an entry
- *  @param[in] info - Pointer to an auxiliary structure @ref
- * pldm_bios_table_attr_entry_integer_info
- */
-void pldm_bios_table_attr_entry_integer_encode(
-	void *entry, size_t entry_length,
-	const struct pldm_bios_table_attr_entry_integer_info *info);
-
 /** @brief Create an entry of BIOS Attribute Table (type: integer) and check the
  * validity of the parameters
  *  @param[out] entry - Pointer to a buffer to create an entry
diff --git a/src/bios_table.c b/src/bios_table.c
index 1ca984e..347cbb0 100644
--- a/src/bios_table.c
+++ b/src/bios_table.c
@@ -493,17 +493,6 @@
 	       sizeof(struct attr_table_integer_entry_fields);
 }
 
-LIBPLDM_ABI_DEPRECATED
-void pldm_bios_table_attr_entry_integer_encode(
-	void *entry, size_t entry_length,
-	const struct pldm_bios_table_attr_entry_integer_info *info)
-{
-	int rc = pldm_bios_table_attr_entry_integer_encode_check(
-		entry, entry_length, info);
-	(void)rc;
-	assert(rc == PLDM_SUCCESS);
-}
-
 LIBPLDM_ABI_STABLE
 int pldm_bios_table_attr_entry_integer_info_check(
 	const struct pldm_bios_table_attr_entry_integer_info *info,
diff --git a/tests/libpldm_bios_table_test.cpp b/tests/libpldm_bios_table_test.cpp
index 55280f8..76cc9d4 100644
--- a/tests/libpldm_bios_table_test.cpp
+++ b/tests/libpldm_bios_table_test.cpp
@@ -371,17 +371,18 @@
     EXPECT_EQ(encodeLength, integerEntry.size());
 
     std::vector<uint8_t> encodeEntry(encodeLength, 0);
-    pldm_bios_table_attr_entry_integer_encode(encodeEntry.data(),
-                                              encodeEntry.size(), &info);
+    ASSERT_EQ(pldm_bios_table_attr_entry_integer_encode_check(
+                  encodeEntry.data(), encodeEntry.size(), &info),
+              PLDM_SUCCESS);
     // set attr handle = 0
     encodeEntry[0] = 0;
     encodeEntry[1] = 0;
 
     EXPECT_EQ(integerEntry, encodeEntry);
 
-    EXPECT_DEATH(pldm_bios_table_attr_entry_integer_encode(
-                     encodeEntry.data(), encodeEntry.size() - 1, &info),
-                 "rc == PLDM_SUCCESS");
+    EXPECT_NE(pldm_bios_table_attr_entry_integer_encode_check(
+                  encodeEntry.data(), encodeEntry.size() - 1, &info),
+              PLDM_SUCCESS);
 
     auto rc = pldm_bios_table_attr_entry_integer_encode_check(
         encodeEntry.data(), encodeEntry.size(), &info);