diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e7918a..ccd00df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 
 1. bios_table: Remove pldm_bios_table_attr_entry_integer_encode_length()
 2. bios_table: Remove pldm_bios_table_attr_value_entry_encode_enum()
+3. bios_table: Remove pldm_bios_table_attr_value_entry_encode_string()
 
 ### Fixed
 
diff --git a/abi/aarch64/gcc.dump b/abi/aarch64/gcc.dump
index 88630bb..09374a8 100644
--- a/abi/aarch64/gcc.dump
+++ b/abi/aarch64/gcc.dump
@@ -158,7 +158,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '108957' => {
+                            '108628' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -177,7 +177,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '109140' => {
+                            '108811' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -198,7 +198,7 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '54571'
+                                                                'type' => '54242'
                                                               },
                                                        '5' => {
                                                                 'name' => 'file_meta_data_1',
@@ -221,7 +221,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '109358' => {
+                            '109029' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -240,7 +240,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '109465' => {
+                            '109136' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -283,22 +283,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_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'
-                                       },
-                            '109758' => {
+                            '109429' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -317,7 +302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '109936' => {
+                            '109607' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -361,7 +346,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '110134' => {
+                            '10972' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '109805' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -380,7 +380,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '110236' => {
+                            '109907' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -423,7 +423,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '110529' => {
+                            '110200' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -442,7 +442,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '110636' => {
+                            '110307' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -469,7 +469,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '110854' => {
+                            '110525' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -488,7 +488,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '111027' => {
+                            '110698' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -515,7 +515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '111163' => {
+                            '110834' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -538,7 +538,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '111290' => {
+                            '110961' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -573,7 +573,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '111548' => {
+                            '111219' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -600,7 +600,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '111761' => {
+                            '111432' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -631,7 +631,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '111911' => {
+                            '111582' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -650,7 +650,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '112018' => {
+                            '111689' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -677,7 +677,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '112236' => {
+                            '111907' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -696,7 +696,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '112409' => {
+                            '112080' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -717,13 +717,13 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '54571'
+                                                                'type' => '54242'
                                                               }
                                                      },
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '112545' => {
+                            '112216' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -746,7 +746,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '112672' => {
+                            '112343' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -785,7 +785,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '112950' => {
+                            '112621' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -812,7 +812,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '113163' => {
+                            '112834' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -841,13 +841,13 @@
                                                               },
                                                        '6' => {
                                                                 'name' => 'address',
-                                                                'type' => '54571'
+                                                                'type' => '54242'
                                                               }
                                                      },
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '113327' => {
+                            '112998' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -870,7 +870,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '113525' => {
+                            '113196' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -893,7 +893,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '113647' => {
+                            '113318' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -920,7 +920,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '113865' => {
+                            '113536' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -951,7 +951,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '114014' => {
+                            '113685' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -974,7 +974,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '114212' => {
+                            '113883' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1001,7 +1001,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '114342' => {
+                            '114013' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1028,7 +1028,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '114560' => {
+                            '114231' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1055,7 +1055,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '114689' => {
+                            '114360' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1090,7 +1090,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '114855' => {
+                            '114526' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1117,7 +1117,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '115064' => {
+                            '114735' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1152,7 +1152,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '115347' => {
+                            '115018' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1179,7 +1179,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '115476' => {
+                            '115147' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1202,7 +1202,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '115597' => {
+                            '115268' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1237,7 +1237,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '115844' => {
+                            '115515' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1264,7 +1264,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '116048' => {
+                            '115719' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1289,13 +1289,13 @@
                                                               },
                                                        '5' => {
                                                                 'name' => 'address',
-                                                                'type' => '54571'
+                                                                'type' => '54242'
                                                               }
                                                      },
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '116994' => {
+                            '116665' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1326,7 +1326,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '117225' => {
+                            '116896' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1345,7 +1345,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '117313' => {
+                            '116984' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1372,7 +1372,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '117446' => {
+                            '117117' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1395,7 +1395,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '118485' => {
+                            '118156' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -3942,37 +3942,6 @@
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
-                                                               'name' => 'entry',
-                                                               'type' => '166'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entry_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'attr_handle',
-                                                               'type' => '4895'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'attr_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'str_length',
-                                                               'type' => '4895'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'str',
-                                                               'type' => '12199'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_bios_table_attr_value_entry_encode_string'
-                                       },
-                            '53104' => {
-                                         'Header' => 'bios_table.h',
-                                         'Param' => {
-                                                      '0' => {
                                                                'name' => 'string_length',
                                                                'type' => '4895'
                                                              }
@@ -3980,7 +3949,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_string_length'
                                        },
-                            '53292' => {
+                            '52963' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4011,7 +3980,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_check'
                                        },
-                            '53546' => {
+                            '53217' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4030,7 +3999,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_enum_decode_handles'
                                        },
-                            '53720' => {
+                            '53391' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4041,7 +4010,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_enum_decode_number'
                                        },
-                            '53775' => {
+                            '53446' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4052,7 +4021,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_length'
                                        },
-                            '53830' => {
+                            '53501' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4063,7 +4032,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_type'
                                        },
-                            '53885' => {
+                            '53556' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4074,7 +4043,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_handle'
                                        },
-                            '54444' => {
+                            '54115' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4083,11 +4052,11 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'lower',
-                                                               'type' => '54571'
+                                                               'type' => '54242'
                                                              },
                                                       '2' => {
                                                                'name' => 'upper',
-                                                               'type' => '54571'
+                                                               'type' => '54242'
                                                              },
                                                       '3' => {
                                                                'name' => 'scalar',
@@ -4095,13 +4064,13 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'def',
-                                                               'type' => '54571'
+                                                               'type' => '54242'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_decode'
                                        },
-                            '54586' => {
+                            '54257' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4114,33 +4083,33 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '54848'
+                                                               'type' => '54519'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_check'
                                        },
-                            '54858' => {
+                            '54529' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '54848'
+                                                               'type' => '54519'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '55115'
+                                                               'type' => '54786'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_info_check'
                                        },
-                            '55120' => {
+                            '54791' => {
                                          'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_length'
                                        },
-                            '55282' => {
+                            '54953' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4159,7 +4128,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string'
                                        },
-                            '55478' => {
+                            '55149' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4170,7 +4139,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_min_length'
                                        },
-                            '55553' => {
+                            '55224' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4181,7 +4150,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_max_length'
                                        },
-                            '55628' => {
+                            '55299' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4192,7 +4161,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_string_type'
                                        },
-                            '55703' => {
+                            '55374' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4207,7 +4176,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string_length_check'
                                        },
-                            '55879' => {
+                            '55550' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4220,28 +4189,28 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '56165'
+                                                               'type' => '55836'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_check'
                                        },
-                            '56170' => {
+                            '55841' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '56165'
+                                                               'type' => '55836'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '55115'
+                                                               'type' => '54786'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_info_check'
                                        },
-                            '56439' => {
+                            '56110' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4252,7 +4221,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_length'
                                        },
-                            '56674' => {
+                            '56345' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4271,7 +4240,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_indices'
                                        },
-                            '56880' => {
+                            '56551' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4290,7 +4259,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_hdls_check'
                                        },
-                            '57038' => {
+                            '56709' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4305,7 +4274,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_num_check'
                                        },
-                            '57203' => {
+                            '56874' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4320,7 +4289,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_num_check'
                                        },
-                            '57269' => {
+                            '56940' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4333,13 +4302,13 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '57527'
+                                                               'type' => '57198'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_check'
                                        },
-                            '57532' => {
+                            '57203' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4354,7 +4323,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_length'
                                        },
-                            '57598' => {
+                            '57269' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4365,7 +4334,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_string_handle'
                                        },
-                            '57651' => {
+                            '57322' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4376,7 +4345,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_type'
                                        },
-                            '57704' => {
+                            '57375' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4387,7 +4356,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_handle'
                                        },
-                            '58326' => {
+                            '57997' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4406,7 +4375,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_check'
                                        },
-                            '58492' => {
+                            '58163' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4417,7 +4386,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_length'
                                        },
-                            '58545' => {
+                            '58216' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4428,7 +4397,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_handle'
                                        },
-                            '58598' => {
+                            '58269' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4451,7 +4420,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_encode_check'
                                        },
-                            '58867' => {
+                            '58538' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4568,7 +4537,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_req'
                                       },
-                            '64457' => {
+                            '64128' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -4579,7 +4548,7 @@
                                          'Return' => '6265',
                                          'ShortName' => 'is_transfer_flag_valid'
                                        },
-                            '64608' => {
+                            '64279' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4596,17 +4565,17 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'non_functioning_component_indication',
-                                                               'type' => '64792'
+                                                               'type' => '64463'
                                                              },
                                                       '4' => {
                                                                'name' => 'non_functioning_component_bitmap',
-                                                               'type' => '64797'
+                                                               'type' => '64468'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_resp'
                                        },
-                            '64807' => {
+                            '64478' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4625,30 +4594,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_req'
                                        },
-                            '6491' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'instance_id',
-                                                              'type' => '168'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'completion_code',
-                                                              'type' => '168'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'next_transfer_handle',
-                                                              'type' => '180'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'msg',
-                                                              'type' => '1615'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'encode_set_bios_table_resp'
-                                      },
-                            '64960' => {
+                            '64631' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4667,7 +4613,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_component_resp'
                                        },
-                            '65042' => {
+                            '64713' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4686,7 +4632,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_component_req'
                                        },
-                            '65195' => {
+                            '64866' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4727,13 +4673,36 @@
                                                              },
                                                       '9' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '65536'
+                                                               'type' => '65207'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_status_resp'
                                        },
-                            '65546' => {
+                            '6491' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'instance_id',
+                                                              'type' => '168'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'completion_code',
+                                                              'type' => '168'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'next_transfer_handle',
+                                                              'type' => '180'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'msg',
+                                                              'type' => '1615'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'encode_set_bios_table_resp'
+                                      },
+                            '65217' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4752,7 +4721,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_status_req'
                                        },
-                            '65699' => {
+                            '65370' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4775,7 +4744,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_activate_firmware_resp'
                                        },
-                            '65825' => {
+                            '65496' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4798,7 +4767,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_activate_firmware_req'
                                        },
-                            '66046' => {
+                            '65717' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4821,7 +4790,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_apply_complete_resp'
                                        },
-                            '66218' => {
+                            '65889' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4838,13 +4807,13 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_activation_methods_modification',
-                                                               'type' => '66340'
+                                                               'type' => '66011'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_apply_complete_req'
                                        },
-                            '66350' => {
+                            '66021' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4867,7 +4836,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_verify_complete_resp'
                                        },
-                            '66522' => {
+                            '66193' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4886,7 +4855,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_verify_complete_req'
                                        },
-                            '66604' => {
+                            '66275' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4909,7 +4878,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_transfer_complete_resp'
                                        },
-                            '66776' => {
+                            '66447' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4928,7 +4897,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_transfer_complete_req'
                                        },
-                            '66858' => {
+                            '66529' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4951,30 +4920,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_firmware_data_resp'
                                        },
-                            '6693' => {
-                                        '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_table_resp'
-                                      },
-                            '67030' => {
+                            '66701' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4997,7 +4943,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_firmware_data_req'
                                        },
-                            '67162' => {
+                            '66833' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5022,7 +4968,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '65536'
+                                                               'type' => '65207'
                                                              },
                                                       '6' => {
                                                                'name' => 'time_before_req_fw_data',
@@ -5032,7 +4978,30 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_update_component_resp'
                                        },
-                            '67398' => {
+                            '6693' => {
+                                        '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_table_resp'
+                                      },
+                            '67069' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5069,7 +5038,7 @@
                                                              },
                                                       '6' => {
                                                                'name' => 'update_option_flags',
-                                                               'type' => '60291'
+                                                               'type' => '59962'
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_ver_str_type',
@@ -5081,13 +5050,13 @@
                                                              },
                                                       '9' => {
                                                                'name' => 'comp_ver_str',
-                                                               'type' => '67802'
+                                                               'type' => '67473'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'encode_update_component_req'
                                        },
-                            '67812' => {
+                            '67483' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5114,7 +5083,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pass_component_table_resp'
                                        },
-                            '68008' => {
+                            '67679' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5155,7 +5124,7 @@
                                                              },
                                                       '8' => {
                                                                'name' => 'comp_ver_str',
-                                                               'type' => '67802'
+                                                               'type' => '67473'
                                                              },
                                                       '9' => {
                                                                'name' => 'msg',
@@ -5204,7 +5173,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_req'
                                       },
-                            '68421' => {
+                            '68092' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5231,7 +5200,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_update_resp'
                                        },
-                            '68562' => {
+                            '68233' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5264,7 +5233,7 @@
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_img_set_ver_str',
-                                                               'type' => '67802'
+                                                               'type' => '67473'
                                                              },
                                                       '8' => {
                                                                'name' => 'msg',
@@ -5278,7 +5247,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_update_req'
                                        },
-                            '68927' => {
+                            '68598' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5291,7 +5260,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'component_data',
-                                                               'type' => '69083'
+                                                               'type' => '68754'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_ver_str',
@@ -5305,7 +5274,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp_comp_entry'
                                        },
-                            '69093' => {
+                            '68764' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5318,7 +5287,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'resp_data',
-                                                               'type' => '69313'
+                                                               'type' => '68984'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_image_set_ver_str',
@@ -5336,7 +5305,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp'
                                        },
-                            '69318' => {
+                            '68989' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5355,7 +5324,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_firmware_parameters_req'
                                        },
-                            '69455' => {
+                            '69126' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5380,13 +5349,13 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'descriptor_data',
-                                                               'type' => '69611'
+                                                               'type' => '69282'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_query_device_identifiers_resp'
                                        },
-                            '69621' => {
+                            '69292' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5405,7 +5374,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_query_device_identifiers_req'
                                        },
-                            '69758' => {
+                            '69429' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5418,7 +5387,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_comp_image_info',
-                                                               'type' => '69905'
+                                                               'type' => '69576'
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_version_str',
@@ -5428,7 +5397,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pldm_comp_image_info'
                                        },
-                            '69910' => {
+                            '69581' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5455,7 +5424,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_vendor_defined_descriptor_value'
                                        },
-                            '70089' => {
+                            '69760' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5478,7 +5447,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_descriptor_type_length_value'
                                        },
-                            '70261' => {
+                            '69932' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5495,7 +5464,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'fw_device_id_record',
-                                                               'type' => '70528'
+                                                               'type' => '70199'
                                                              },
                                                       '4' => {
                                                                'name' => 'applicable_components',
@@ -5517,7 +5486,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_firmware_device_id_record'
                                        },
-                            '70533' => {
+                            '70204' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5530,7 +5499,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'package_header_info',
-                                                               'type' => '70680'
+                                                               'type' => '70351'
                                                              },
                                                       '3' => {
                                                                'name' => 'package_version_str',
@@ -5563,7 +5532,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_resp'
                                       },
-                            '72871' => {
+                            '72542' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5590,7 +5559,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_set_fru_record_table_resp'
                                        },
-                            '73094' => {
+                            '72765' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5617,34 +5586,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_set_fru_record_table_req'
                                        },
-                            '7314' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'msg',
-                                                              'type' => '2029'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'transfer_handle',
-                                                              'type' => '2039'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'transfer_flag',
-                                                              'type' => '2034'
-                                                            },
-                                                     '4' => {
-                                                              'name' => 'attribute',
-                                                              'type' => '6481'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_set_bios_attribute_current_value_req'
-                                      },
-                            '73261' => {
+                            '72932' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5679,7 +5621,34 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '73509' => {
+                            '7314' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'msg',
+                                                              'type' => '2029'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'transfer_handle',
+                                                              'type' => '2039'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'transfer_flag',
+                                                              'type' => '2034'
+                                                            },
+                                                     '4' => {
+                                                              'name' => 'attribute',
+                                                              'type' => '6481'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_set_bios_attribute_current_value_req'
+                                      },
+                            '73180' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5718,7 +5687,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '73767' => {
+                            '73438' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5745,7 +5714,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '73985' => {
+                            '73656' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5776,7 +5745,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_resp'
                                        },
-                            '74146' => {
+                            '73817' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5815,7 +5784,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_resp'
                                        },
-                            '74455' => {
+                            '74126' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5854,30 +5823,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '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'
-                                      },
-                            '74643' => {
+                            '74314' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5920,7 +5866,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_req'
                                        },
-                            '74936' => {
+                            '74607' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5955,7 +5901,30 @@
                                          'Return' => '74',
                                          'ShortName' => 'get_fru_record_by_option_check'
                                        },
-                            '75362' => {
+                            '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'
+                                      },
+                            '75033' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5990,42 +5959,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'get_fru_record_by_option'
                                        },
-                            '7577' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'instance_id',
-                                                              'type' => '168'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'transfer_handle',
-                                                              'type' => '180'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'transfer_flag',
-                                                              'type' => '168'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'attribute_data',
-                                                              'type' => '6087'
-                                                            },
-                                                     '4' => {
-                                                              'name' => 'attribute_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '5' => {
-                                                              'name' => 'msg',
-                                                              'type' => '1615'
-                                                            },
-                                                     '6' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'encode_set_bios_attribute_current_value_req'
-                                      },
-                            '75799' => {
+                            '75470' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6068,7 +6002,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
-                            '76062' => {
+                            '75733' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6095,7 +6029,42 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_resp'
                                        },
-                            '76266' => {
+                            '7577' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'instance_id',
+                                                              'type' => '168'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'transfer_handle',
+                                                              'type' => '180'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'transfer_flag',
+                                                              'type' => '168'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'attribute_data',
+                                                              'type' => '6087'
+                                                            },
+                                                     '4' => {
+                                                              'name' => 'attribute_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '5' => {
+                                                              'name' => 'msg',
+                                                              'type' => '1615'
+                                                            },
+                                                     '6' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'encode_set_bios_attribute_current_value_req'
+                                      },
+                            '75937' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6118,7 +6087,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '76382' => {
+                            '76053' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6165,7 +6134,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '76686' => {
+                            '76357' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6213,7 +6182,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '76893' => {
+                            '76564' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6232,7 +6201,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_req'
                                        },
-                            '78510' => {
+                            '78181' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6249,12 +6218,49 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'entities',
-                                                               'type' => '78823'
+                                                               'type' => '78494'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_extract'
                                        },
+                            '78514' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '78569'
+                                                             }
+                                                    },
+                                         'Return' => '6265',
+                                         'ShortName' => 'pldm_is_empty_entity_assoc_tree'
+                                       },
+                            '78574' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '78569'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_tree_destroy_root'
+                                       },
+                            '78637' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'org_tree',
+                                                               'type' => '78569'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'new_tree',
+                                                               'type' => '78569'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_tree_copy_root'
+                                       },
                             '7865' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6290,75 +6296,38 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '78843' => {
+                            '78853' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78898'
-                                                             }
-                                                    },
-                                         'Return' => '6265',
-                                         'ShortName' => 'pldm_is_empty_entity_assoc_tree'
-                                       },
-                            '78903' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '78898'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_tree_destroy_root'
-                                       },
-                            '78966' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'org_tree',
-                                                               'type' => '78898'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'new_tree',
-                                                               'type' => '78898'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_tree_copy_root'
-                                       },
-                            '79182' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '78898'
+                                                               'type' => '78569'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '78828'
+                                                               'type' => '78499'
                                                              }
                                                     },
-                                         'Return' => '78398',
+                                         'Return' => '78069',
                                          'ShortName' => 'pldm_entity_association_tree_find'
                                        },
-                            '79927' => {
+                            '79598' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80176'
+                                                               'type' => '79847'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_remote_pdrs'
                                        },
-                            '80181' => {
+                            '79852' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80176'
+                                                               'type' => '79847'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6368,40 +6337,40 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
-                            '80450' => {
+                            '80121' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78898'
+                                                               'type' => '78569'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
                                                                'offset' => '-8',
-                                                               'type' => '77539'
+                                                               'type' => '77210'
                                                              },
                                                       '2' => {
                                                                'name' => 'node',
-                                                               'type' => '79177'
+                                                               'type' => '78848'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_find_entity_ref_in_tree'
                                        },
-                            '80967' => {
+                            '80638' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78398'
+                                                               'type' => '78069'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80176'
+                                                               'type' => '79847'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '78823'
+                                                               'type' => '78494'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6419,20 +6388,20 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '81183' => {
+                            '80854' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78398'
+                                                               'type' => '78069'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80176'
+                                                               'type' => '79847'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '78823'
+                                                               'type' => '78494'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6450,16 +6419,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node'
                                        },
-                            '81512' => {
+                            '81183' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78898'
+                                                               'type' => '78569'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80176'
+                                                               'type' => '79847'
                                                              },
                                                       '2' => {
                                                                'name' => 'is_remote',
@@ -6500,21 +6469,47 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '82967' => {
+                            '82638' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'parent',
-                                                               'type' => '78398'
+                                                               'type' => '78069'
                                                              },
                                                       '1' => {
                                                                'name' => 'node',
-                                                               'type' => '78828'
+                                                               'type' => '78499'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
+                            '82727' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '78069'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'association_type',
+                                                               'type' => '168'
+                                                             }
+                                                    },
+                                         'Return' => '168',
+                                         'ShortName' => 'pldm_entity_get_num_children'
+                                       },
+                            '82942' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '78069'
+                                                             }
+                                                    },
+                                         'Return' => '6265',
+                                         'ShortName' => 'pldm_entity_is_exist_parent'
+                                       },
                             '8304' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6546,75 +6541,49 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '83056' => {
+                            '83097' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78398'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'association_type',
-                                                               'type' => '168'
+                                                               'type' => '78069'
                                                              }
                                                     },
-                                         'Return' => '168',
-                                         'ShortName' => 'pldm_entity_get_num_children'
-                                       },
-                            '83271' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '78398'
-                                                             }
-                                                    },
-                                         'Return' => '6265',
-                                         'ShortName' => 'pldm_entity_is_exist_parent'
-                                       },
-                            '83426' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '78398'
-                                                             }
-                                                    },
-                                         'Return' => '77539',
+                                         'Return' => '77210',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '83581' => {
+                            '83252' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78398'
+                                                               'type' => '78069'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '83736' => {
+                            '83407' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78898'
+                                                               'type' => '78569'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
-                            '83915' => {
+                            '83586' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78898'
+                                                               'type' => '78569'
                                                              },
                                                       '1' => {
                                                                'name' => 'entities',
-                                                               'type' => '78823'
+                                                               'type' => '78494'
                                                              },
                                                       '2' => {
                                                                'name' => 'size',
@@ -6624,6 +6593,33 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_visit'
                                        },
+                            '84518' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '78569'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'entity',
+                                                               'type' => '78499'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'entity_instance_number',
+                                                               'type' => '4895'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'parent',
+                                                               'type' => '78069'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'association_type',
+                                                               'type' => '168'
+                                                             }
+                                                    },
+                                         'Return' => '78069',
+                                         'ShortName' => 'pldm_entity_association_tree_add'
+                                       },
                             '8460' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6651,55 +6647,28 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '84847' => {
+                            '84955' => {
                                          'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '78898'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entity',
-                                                               'type' => '78828'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'entity_instance_number',
-                                                               'type' => '4895'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'parent',
-                                                               'type' => '78398'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'association_type',
-                                                               'type' => '168'
-                                                             }
-                                                    },
-                                         'Return' => '78398',
-                                         'ShortName' => 'pldm_entity_association_tree_add'
-                                       },
-                            '85284' => {
-                                         'Header' => 'pdr.h',
-                                         'Return' => '78898',
+                                         'Return' => '78569',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
-                            '85518' => {
+                            '85189' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78398'
+                                                               'type' => '78069'
                                                              }
                                                     },
-                                         'Return' => '77539',
+                                         'Return' => '77210',
                                          'ShortName' => 'pldm_entity_extract'
                                        },
-                            '86324' => {
+                            '85995' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79922'
+                                                               'type' => '79593'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6721,12 +6690,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
-                            '86664' => {
+                            '86335' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79922'
+                                                               'type' => '79593'
                                                              },
                                                       '1' => {
                                                                'name' => 'fru_rsi',
@@ -6749,9 +6718,44 @@
                                                                'type' => '8294'
                                                              }
                                                     },
-                                         'Return' => '86649',
+                                         'Return' => '86320',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
+                            '86666' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79847'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '4895'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'fru_rsi',
+                                                               'type' => '4895'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'entity_type',
+                                                               'type' => '4895'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'entity_instance_num',
+                                                               'type' => '4895'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'container_id',
+                                                               'type' => '4895'
+                                                             },
+                                                      '6' => {
+                                                               'name' => 'bmc_record_handle',
+                                                               'type' => '2039'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_pdr_add_fru_record_set_check'
+                                       },
                             '8672' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6783,47 +6787,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '86995' => {
+                            '86988' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80176'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '4895'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'fru_rsi',
-                                                               'type' => '4895'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'entity_type',
-                                                               'type' => '4895'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'entity_instance_num',
-                                                               'type' => '4895'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'container_id',
-                                                               'type' => '4895'
-                                                             },
-                                                      '6' => {
-                                                               'name' => 'bmc_record_handle',
-                                                               'type' => '2039'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_pdr_add_fru_record_set_check'
-                                       },
-                            '87317' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80176'
+                                                               'type' => '79847'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6853,60 +6822,60 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set'
                                        },
-                            '87656' => {
+                            '87327' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '86649'
+                                                               'type' => '86320'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '87811' => {
+                            '87482' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79922'
+                                                               'type' => '79593'
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '86649'
+                                                               'type' => '86320'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
-                            '88029' => {
+                            '87700' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79922'
+                                                               'type' => '79593'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '88160' => {
+                            '87831' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79922'
+                                                               'type' => '79593'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '88291' => {
+                            '87962' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79922'
+                                                               'type' => '79593'
                                                              },
                                                       '1' => {
                                                                'name' => 'pdr_type',
@@ -6914,20 +6883,74 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '86649'
+                                                               'type' => '86320'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
-                                                               'type' => '69611'
+                                                               'type' => '69282'
                                                              },
                                                       '4' => {
                                                                'name' => 'size',
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '86649',
+                                         'Return' => '86320',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
+                            '88140' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79593'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'curr_record',
+                                                               'type' => '86320'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'data',
+                                                               'type' => '69282'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'size',
+                                                               'type' => '2039'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'next_record_handle',
+                                                               'type' => '2039'
+                                                             }
+                                                    },
+                                         'Return' => '86320',
+                                         'ShortName' => 'pldm_pdr_get_next_record'
+                                       },
+                            '88314' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79593'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'record_handle',
+                                                               'type' => '180'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'data',
+                                                               'type' => '69282'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'size',
+                                                               'type' => '2039'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'next_record_handle',
+                                                               'type' => '2039'
+                                                             }
+                                                    },
+                                         'Return' => '86320',
+                                         'ShortName' => 'pldm_pdr_find_record'
+                                       },
                             '8832' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6955,82 +6978,28 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '88469' => {
+                            '88482' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79922'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'curr_record',
-                                                               'type' => '86649'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'data',
-                                                               'type' => '69611'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'size',
-                                                               'type' => '2039'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'next_record_handle',
-                                                               'type' => '2039'
-                                                             }
-                                                    },
-                                         'Return' => '86649',
-                                         'ShortName' => 'pldm_pdr_get_next_record'
-                                       },
-                            '88643' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '79922'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'record_handle',
-                                                               'type' => '180'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'data',
-                                                               'type' => '69611'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'size',
-                                                               'type' => '2039'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'next_record_handle',
-                                                               'type' => '2039'
-                                                             }
-                                                    },
-                                         'Return' => '86649',
-                                         'ShortName' => 'pldm_pdr_find_record'
-                                       },
-                            '88811' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80176'
+                                                               'type' => '79847'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '88966' => {
+                            '88637' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '80176',
+                                         'Return' => '79847',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '89038' => {
+                            '88709' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80176'
+                                                               'type' => '79847'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7056,12 +7025,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_check'
                                        },
-                            '89472' => {
+                            '89143' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80176'
+                                                               'type' => '79847'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7114,7 +7083,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '90978' => {
+                            '90649' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7125,7 +7094,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '91070' => {
+                            '90741' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7136,7 +7105,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
-                            '91480' => {
+                            '91151' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7155,7 +7124,7 @@
                                          'Return' => '12204',
                                          'ShortName' => 'ver2str'
                                        },
-                            '91608' => {
+                            '91279' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7205,72 +7174,72 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '92879' => {
+                            '92550' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93087'
+                                                               'type' => '92758'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '92204'
+                                                               'type' => '91875'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '92216'
+                                                               'type' => '91887'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '93092' => {
+                            '92763' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93087'
+                                                               'type' => '92758'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '92204'
+                                                               'type' => '91875'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '93493'
+                                                               'type' => '93164'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '93498' => {
+                            '93169' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93087'
+                                                               'type' => '92758'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '93583' => {
+                            '93254' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93669'
+                                                               'type' => '93340'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '93674' => {
+                            '93345' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93669'
+                                                               'type' => '93340'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7280,6 +7249,29 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init'
                                        },
+                            '94492' => {
+                                         'Header' => 'pldm.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'eid',
+                                                               'type' => '93830'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'mctp_fd',
+                                                               'type' => '74'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'pldm_req_msg',
+                                                               'type' => '6087'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'req_msg_len',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '93939',
+                                         'ShortName' => 'pldm_send'
+                                       },
                             '9456' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7299,35 +7291,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_date_time_resp'
                                       },
-                            '94821' => {
+                            '94908' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94159'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'mctp_fd',
-                                                               'type' => '74'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'pldm_req_msg',
-                                                               'type' => '6087'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'req_msg_len',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '94268',
-                                         'ShortName' => 'pldm_send'
-                                       },
-                            '95237' => {
-                                         'Header' => 'pldm.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'eid',
-                                                               'type' => '94159'
+                                                               'type' => '93830'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7343,14 +7312,14 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '69611'
+                                                               'type' => '69282'
                                                              },
                                                       '5' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '94268',
+                                         'Return' => '93939',
                                          'ShortName' => 'pldm_send_recv'
                                        },
                             '9534' => {
@@ -7376,12 +7345,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_date_time_resp'
                                       },
-                            '95713' => {
+                            '95384' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94159'
+                                                               'type' => '93830'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7393,22 +7362,22 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '69611'
+                                                               'type' => '69282'
                                                              },
                                                       '4' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '94268',
+                                         'Return' => '93939',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '95936' => {
+                            '95607' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94159'
+                                                               'type' => '93830'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7416,19 +7385,19 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '69611'
+                                                               'type' => '69282'
                                                              },
                                                       '3' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '94268',
+                                         'Return' => '93939',
                                          'ShortName' => 'pldm_recv_any'
                                        },
-                            '96378' => {
+                            '96049' => {
                                          'Header' => 'pldm.h',
-                                         'Return' => '94268',
+                                         'Return' => '93939',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9723' => {
@@ -7710,7 +7679,6 @@
                                                  'pldm_bios_table_attr_value_entry_encode_integer' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_integer_check' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_integer_length' => 1,
-                                                 'pldm_bios_table_attr_value_entry_encode_string' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_string_check' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_string_length' => 1,
                                                  'pldm_bios_table_attr_value_entry_enum_decode_handles' => 1,
@@ -9096,7 +9064,7 @@
                                     },
                           '46638' => {
                                        'Header' => undef,
-                                       'Line' => '971',
+                                       'Line' => '960',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'table_data',
@@ -9189,31 +9157,31 @@
                                     'Size' => '1',
                                     'Type' => 'Intrinsic'
                                   },
-                          '54571' => {
+                          '54242' => {
                                        'BaseType' => '45555',
                                        'Name' => 'uint64_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '54848' => {
+                          '54519' => {
                                        'BaseType' => '46214',
                                        'Name' => 'struct pldm_bios_table_attr_entry_integer_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55115' => {
+                          '54786' => {
                                        'BaseType' => '12199',
                                        'Name' => 'char const**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '56165' => {
+                          '55836' => {
                                        'BaseType' => '46106',
                                        'Name' => 'struct pldm_bios_table_attr_entry_string_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '57527' => {
+                          '57198' => {
                                        'BaseType' => '45972',
                                        'Name' => 'struct pldm_bios_table_attr_entry_enum_info const*',
                                        'Size' => '8',
@@ -9244,19 +9212,14 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '6265' => {
-                                      'Name' => '_Bool',
-                                      'Size' => '1',
-                                      'Type' => 'Intrinsic'
-                                    },
-                          '62788' => {
+                          '62459' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '329',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'uuid',
                                                             'offset' => '0',
-                                                            'type' => '62892'
+                                                            'type' => '62563'
                                                           },
                                                    '1' => {
                                                             'name' => 'package_header_format_version',
@@ -9293,13 +9256,13 @@
                                        'Size' => '36',
                                        'Type' => 'Struct'
                                      },
-                          '62892' => {
+                          '62563' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[16]',
                                        'Size' => '16',
                                        'Type' => 'Array'
                                      },
-                          '62924' => {
+                          '62595' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '343',
                                        'Memb' => {
@@ -9316,7 +9279,7 @@
                                                    '2' => {
                                                             'name' => 'device_update_option_flags',
                                                             'offset' => '3',
-                                                            'type' => '60291'
+                                                            'type' => '59962'
                                                           },
                                                    '3' => {
                                                             'name' => 'comp_image_set_version_string_type',
@@ -9338,7 +9301,12 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '63119' => {
+                          '6265' => {
+                                      'Name' => '_Bool',
+                                      'Size' => '1',
+                                      'Type' => 'Intrinsic'
+                                    },
+                          '62790' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '377',
                                        'Memb' => {
@@ -9360,12 +9328,12 @@
                                                    '3' => {
                                                             'name' => 'comp_options',
                                                             'offset' => '8',
-                                                            'type' => '59793'
+                                                            'type' => '59464'
                                                           },
                                                    '4' => {
                                                             'name' => 'requested_comp_activation_method',
                                                             'offset' => '16',
-                                                            'type' => '59793'
+                                                            'type' => '59464'
                                                           },
                                                    '5' => {
                                                             'name' => 'comp_location_offset',
@@ -9392,7 +9360,7 @@
                                        'Size' => '22',
                                        'Type' => 'Struct'
                                      },
-                          '63301' => {
+                          '62972' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '403',
                                        'Memb' => {
@@ -9404,7 +9372,7 @@
                                                    '1' => {
                                                             'name' => 'capabilities_during_update',
                                                             'offset' => '1',
-                                                            'type' => '60291'
+                                                            'type' => '59962'
                                                           },
                                                    '2' => {
                                                             'name' => 'comp_count',
@@ -9436,7 +9404,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '63405' => {
+                          '63076' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '417',
                                        'Memb' => {
@@ -9453,17 +9421,17 @@
                                                    '10' => {
                                                              'name' => 'pending_comp_release_date',
                                                              'offset' => '37',
-                                                             'type' => '63587'
+                                                             'type' => '63258'
                                                            },
                                                    '11' => {
                                                              'name' => 'comp_activation_methods',
                                                              'offset' => '51',
-                                                             'type' => '59793'
+                                                             'type' => '59464'
                                                            },
                                                    '12' => {
                                                              'name' => 'capabilities_during_update',
                                                              'offset' => '53',
-                                                             'type' => '60291'
+                                                             'type' => '59962'
                                                            },
                                                    '2' => {
                                                             'name' => 'comp_classification_index',
@@ -9488,7 +9456,7 @@
                                                    '6' => {
                                                             'name' => 'active_comp_release_date',
                                                             'offset' => '17',
-                                                            'type' => '63587'
+                                                            'type' => '63258'
                                                           },
                                                    '7' => {
                                                             'name' => 'pending_comp_comparison_stamp',
@@ -9510,19 +9478,19 @@
                                        'Size' => '39',
                                        'Type' => 'Struct'
                                      },
-                          '63587' => {
+                          '63258' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[8]',
                                        'Size' => '8',
                                        'Type' => 'Array'
                                      },
-                          '64447' => {
+                          '64118' => {
                                        'BaseType' => '6048',
                                        'Name' => 'struct variable_field const',
                                        'Size' => '16',
                                        'Type' => 'Const'
                                      },
-                          '64792' => {
+                          '64463' => {
                                        'BaseType' => '11646',
                                        'Name' => 'bool8_t*',
                                        'Size' => '8',
@@ -9539,44 +9507,44 @@
                                     'Size' => '2',
                                     'Type' => 'Intrinsic'
                                   },
-                          '67802' => {
-                                       'BaseType' => '64447',
+                          '67473' => {
+                                       'BaseType' => '64118',
                                        'Name' => 'struct variable_field const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69083' => {
-                                       'BaseType' => '63405',
+                          '68754' => {
+                                       'BaseType' => '63076',
                                        'Name' => 'struct pldm_component_parameter_entry*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69313' => {
-                                       'BaseType' => '63301',
+                          '68984' => {
+                                       'BaseType' => '62972',
                                        'Name' => 'struct pldm_get_firmware_parameters_resp*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69611' => {
+                          '69282' => {
                                        'BaseType' => '2034',
                                        'Name' => 'uint8_t**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69905' => {
-                                       'BaseType' => '63119',
+                          '69576' => {
+                                       'BaseType' => '62790',
                                        'Name' => 'struct pldm_component_image_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70528' => {
-                                       'BaseType' => '62924',
+                          '70199' => {
+                                       'BaseType' => '62595',
                                        'Name' => 'struct pldm_firmware_device_id_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70680' => {
-                                       'BaseType' => '62788',
+                          '70351' => {
+                                       'BaseType' => '62459',
                                        'Name' => 'struct pldm_package_header_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9600,8 +9568,8 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '77304' => {
-                                       'BaseType' => '77321',
+                          '76975' => {
+                                       'BaseType' => '76992',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -9609,13 +9577,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '77316' => {
-                                       'BaseType' => '77304',
+                          '76987' => {
+                                       'BaseType' => '76975',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '77321' => {
+                          '76992' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -9632,12 +9600,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '78393'
+                                                            'type' => '78064'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '78393'
+                                                            'type' => '78064'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -9645,8 +9613,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '77381' => {
-                                       'BaseType' => '77398',
+                          '77052' => {
+                                       'BaseType' => '77069',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -9654,13 +9622,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '77393' => {
-                                       'BaseType' => '77381',
+                          '77064' => {
+                                       'BaseType' => '77052',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '77398' => {
+                          '77069' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -9682,7 +9650,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '78381'
+                                                            'type' => '78052'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -9700,7 +9668,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '77482' => {
+                          '77153' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -9724,16 +9692,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '77539' => {
-                                       'BaseType' => '77482',
+                          '77210' => {
+                                       'BaseType' => '77153',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '77583' => {
-                                       'BaseType' => '77595',
+                          '77254' => {
+                                       'BaseType' => '77266',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -9741,14 +9709,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '77595' => {
+                          '77266' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '78398'
+                                                            'type' => '78069'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -9761,8 +9729,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '77638' => {
-                                       'BaseType' => '77655',
+                          '77309' => {
+                                       'BaseType' => '77326',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -9770,19 +9738,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '77655' => {
+                          '77326' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '77539'
+                                                            'type' => '77210'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '77539'
+                                                            'type' => '77210'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -9792,12 +9760,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '78398'
+                                                            'type' => '78069'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '78398'
+                                                            'type' => '78069'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -9810,56 +9778,56 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '78381' => {
-                                       'BaseType' => '77398',
+                          '78052' => {
+                                       'BaseType' => '77069',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78393' => {
-                                       'BaseType' => '77381',
+                          '78064' => {
+                                       'BaseType' => '77052',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78398' => {
-                                       'BaseType' => '77638',
+                          '78069' => {
+                                       'BaseType' => '77309',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78823' => {
-                                       'BaseType' => '78828',
+                          '78494' => {
+                                       'BaseType' => '78499',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78828' => {
-                                       'BaseType' => '77539',
+                          '78499' => {
+                                       'BaseType' => '77210',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78898' => {
-                                       'BaseType' => '77583',
+                          '78569' => {
+                                       'BaseType' => '77254',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79177' => {
-                                       'BaseType' => '78398',
+                          '78848' => {
+                                       'BaseType' => '78069',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79922' => {
-                                       'BaseType' => '77316',
+                          '79593' => {
+                                       'BaseType' => '76987',
                                        'Name' => 'pldm_pdr const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80176' => {
-                                       'BaseType' => '77304',
+                          '79847' => {
+                                       'BaseType' => '76975',
                                        'Name' => 'pldm_pdr*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9900,8 +9868,8 @@
                                      'Size' => '4',
                                      'Type' => 'Struct'
                                    },
-                          '86649' => {
-                                       'BaseType' => '77393',
+                          '86320' => {
+                                       'BaseType' => '77064',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9958,7 +9926,7 @@
                                      'Size' => '8',
                                      'Type' => 'Struct'
                                    },
-                          '92204' => {
+                          '91875' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -9966,7 +9934,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92216' => {
+                          '91887' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -9974,14 +9942,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92593' => {
+                          '92264' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '92216'
+                                                            'type' => '91887'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -9994,14 +9962,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '92632' => {
+                          '92303' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '92674'
+                                                            'type' => '92345'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10014,31 +9982,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '92674' => {
-                                       'BaseType' => '92593',
+                          '92345' => {
+                                       'BaseType' => '92264',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '93087' => {
-                                       'BaseType' => '92632',
+                          '92758' => {
+                                       'BaseType' => '92303',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93493' => {
-                                       'BaseType' => '92216',
+                          '93164' => {
+                                       'BaseType' => '91887',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93669' => {
-                                       'BaseType' => '93087',
+                          '93340' => {
+                                       'BaseType' => '92758',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94159' => {
+                          '93830' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10046,7 +10014,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '94171' => {
+                          '93842' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10107,8 +10075,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '94268' => {
-                                       'BaseType' => '94171',
+                          '93939' => {
+                                       'BaseType' => '93842',
                                        '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 fc61933..04d4d3c 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'
                                        },
-                            '110553' => {
+                            '110213' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -230,7 +230,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '110753' => {
+                            '110413' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -251,7 +251,7 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '55626'
+                                                                'type' => '55286'
                                                               },
                                                        '5' => {
                                                                 'name' => 'file_meta_data_1',
@@ -280,7 +280,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '110985' => {
+                            '110645' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -304,7 +304,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '111086' => {
+                            '110746' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -350,7 +350,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '111383' => {
+                            '111043' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -369,7 +369,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '111578' => {
+                            '111238' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -419,7 +419,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '111790' => {
+                            '111450' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -443,7 +443,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '111886' => {
+                            '111546' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -489,7 +489,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '112183' => {
+                            '111843' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -513,7 +513,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '112284' => {
+                            '111944' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -540,7 +540,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '112519' => {
+                            '112179' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -559,7 +559,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '112709' => {
+                            '112369' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -590,7 +590,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '112851' => {
+                            '112511' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -619,7 +619,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '112966' => {
+                            '112626' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -655,22 +655,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_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'
-                                       },
-                            '113236' => {
+                            '112896' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -697,7 +682,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '113466' => {
+                            '11299' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '113126' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -732,7 +732,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '113628' => {
+                            '113288' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -756,7 +756,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '113729' => {
+                            '113389' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -783,7 +783,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '113964' => {
+                            '113624' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -802,7 +802,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '114154' => {
+                            '113814' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -823,7 +823,7 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '55626'
+                                                                'type' => '55286'
                                                               }
                                                      },
                                           'Reg' => {
@@ -833,7 +833,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '114296' => {
+                            '113956' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -862,7 +862,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '114411' => {
+                            '114071' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -903,7 +903,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '114696' => {
+                            '114356' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -930,7 +930,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '114926' => {
+                            '114586' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -960,7 +960,7 @@
                                                        '6' => {
                                                                 'name' => 'address',
                                                                 'offset' => '0',
-                                                                'type' => '55626'
+                                                                'type' => '55286'
                                                               }
                                                      },
                                           'Reg' => {
@@ -970,7 +970,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '115103' => {
+                            '114763' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -993,7 +993,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '115318' => {
+                            '114978' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1022,7 +1022,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '115428' => {
+                            '115088' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1049,7 +1049,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '115663' => {
+                            '115323' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1086,7 +1086,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '115818' => {
+                            '115478' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1109,7 +1109,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '116033' => {
+                            '115693' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1141,7 +1141,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '116169' => {
+                            '115829' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1168,7 +1168,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '116404' => {
+                            '116064' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1199,7 +1199,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '116539' => {
+                            '116199' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1239,7 +1239,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '116712' => {
+                            '116372' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1266,7 +1266,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '116938' => {
+                            '116598' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1302,7 +1302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '117235' => {
+                            '116895' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1333,7 +1333,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '117370' => {
+                            '117030' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1362,7 +1362,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '117479' => {
+                            '117139' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1398,7 +1398,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '117738' => {
+                            '117398' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1425,7 +1425,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '117959' => {
+                            '117619' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1450,7 +1450,7 @@
                                                               },
                                                        '5' => {
                                                                 'name' => 'address',
-                                                                'type' => '55626'
+                                                                'type' => '55286'
                                                               }
                                                      },
                                           'Reg' => {
@@ -1460,7 +1460,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '118926' => {
+                            '118586' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1491,7 +1491,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '119174' => {
+                            '118834' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1515,7 +1515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '119257' => {
+                            '118917' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1546,7 +1546,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '119396' => {
+                            '119056' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1569,7 +1569,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '120465' => {
+                            '120125' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -4247,37 +4247,6 @@
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
-                                                               'name' => 'entry',
-                                                               'type' => '166'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entry_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'attr_handle',
-                                                               'type' => '5053'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'attr_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'str_length',
-                                                               'type' => '5053'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'str',
-                                                               'type' => '12552'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_bios_table_attr_value_entry_encode_string'
-                                       },
-                            '54197' => {
-                                         'Header' => 'bios_table.h',
-                                         'Param' => {
-                                                      '0' => {
                                                                'name' => 'string_length',
                                                                'type' => '5053'
                                                              }
@@ -4288,7 +4257,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_string_length'
                                        },
-                            '54379' => {
+                            '54039' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4319,7 +4288,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_check'
                                        },
-                            '54637' => {
+                            '54297' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4338,7 +4307,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_enum_decode_handles'
                                        },
-                            '54811' => {
+                            '54471' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4352,7 +4321,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_enum_decode_number'
                                        },
-                            '54860' => {
+                            '54520' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4366,7 +4335,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_length'
                                        },
-                            '54909' => {
+                            '54569' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4380,7 +4349,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_type'
                                        },
-                            '54958' => {
+                            '54618' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4394,7 +4363,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_handle'
                                        },
-                            '55505' => {
+                            '55165' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4403,11 +4372,11 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'lower',
-                                                               'type' => '55626'
+                                                               'type' => '55286'
                                                              },
                                                       '2' => {
                                                                'name' => 'upper',
-                                                               'type' => '55626'
+                                                               'type' => '55286'
                                                              },
                                                       '3' => {
                                                                'name' => 'scalar',
@@ -4415,7 +4384,7 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'def',
-                                                               'type' => '55626'
+                                                               'type' => '55286'
                                                              }
                                                     },
                                          'Reg' => {
@@ -4428,7 +4397,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_decode'
                                        },
-                            '55641' => {
+                            '55301' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4441,33 +4410,33 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '55903'
+                                                               'type' => '55563'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_check'
                                        },
-                            '55913' => {
+                            '55573' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '55903'
+                                                               'type' => '55563'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '56212'
+                                                               'type' => '55872'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_info_check'
                                        },
-                            '56217' => {
+                            '55877' => {
                                          'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_length'
                                        },
-                            '56379' => {
+                            '56039' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4486,7 +4455,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string'
                                        },
-                            '56575' => {
+                            '56235' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4500,7 +4469,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_min_length'
                                        },
-                            '56644' => {
+                            '56304' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4514,7 +4483,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_max_length'
                                        },
-                            '56713' => {
+                            '56373' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4528,7 +4497,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_string_type'
                                        },
-                            '56782' => {
+                            '56442' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4543,7 +4512,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string_length_check'
                                        },
-                            '56952' => {
+                            '56612' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4556,28 +4525,28 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '57238'
+                                                               'type' => '56898'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_check'
                                        },
-                            '57243' => {
+                            '56903' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '57238'
+                                                               'type' => '56898'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '56212'
+                                                               'type' => '55872'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_info_check'
                                        },
-                            '57512' => {
+                            '57172' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4591,7 +4560,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_length'
                                        },
-                            '57744' => {
+                            '57404' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4610,7 +4579,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_indices'
                                        },
-                            '57950' => {
+                            '57610' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4632,7 +4601,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_hdls_check'
                                        },
-                            '58115' => {
+                            '57775' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4647,7 +4616,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_num_check'
                                        },
-                            '58274' => {
+                            '57934' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4666,7 +4635,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_num_check'
                                        },
-                            '58334' => {
+                            '57994' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4679,13 +4648,13 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '58592'
+                                                               'type' => '58252'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_check'
                                        },
-                            '58597' => {
+                            '58257' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4704,7 +4673,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_length'
                                        },
-                            '58657' => {
+                            '58317' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4718,7 +4687,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_string_handle'
                                        },
-                            '58704' => {
+                            '58364' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4732,7 +4701,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_type'
                                        },
-                            '58751' => {
+                            '58411' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4746,7 +4715,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_handle'
                                        },
-                            '59384' => {
+                            '59044' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4765,7 +4734,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_check'
                                        },
-                            '59550' => {
+                            '59210' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4779,7 +4748,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_length'
                                        },
-                            '59597' => {
+                            '59257' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4793,7 +4762,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_handle'
                                        },
-                            '59644' => {
+                            '59304' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4816,7 +4785,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_encode_check'
                                        },
-                            '59935' => {
+                            '59595' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4946,7 +4915,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_req'
                                       },
-                            '65528' => {
+                            '65188' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -4957,7 +4926,7 @@
                                          'Return' => '6423',
                                          'ShortName' => 'is_transfer_flag_valid'
                                        },
-                            '65679' => {
+                            '65339' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4974,17 +4943,17 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'non_functioning_component_indication',
-                                                               'type' => '65866'
+                                                               'type' => '65526'
                                                              },
                                                       '4' => {
                                                                'name' => 'non_functioning_component_bitmap',
-                                                               'type' => '65871'
+                                                               'type' => '65531'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_resp'
                                        },
-                            '65881' => {
+                            '65541' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5003,7 +4972,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_req'
                                        },
-                            '66051' => {
+                            '65711' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5027,7 +4996,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_component_resp'
                                        },
-                            '66127' => {
+                            '65787' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5046,7 +5015,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_component_req'
                                        },
-                            '66297' => {
+                            '65957' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5091,36 +5060,13 @@
                                                       '9' => {
                                                                'name' => 'update_option_flags_enabled',
                                                                'offset' => '24',
-                                                               'type' => '66624'
+                                                               'type' => '66284'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_status_resp'
                                        },
-                            '6655' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'instance_id',
-                                                              'type' => '168'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'completion_code',
-                                                              'type' => '168'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'next_transfer_handle',
-                                                              'type' => '180'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'msg',
-                                                              'type' => '1632'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'encode_set_bios_table_resp'
-                                      },
-                            '66634' => {
+                            '66294' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5139,7 +5085,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_status_req'
                                        },
-                            '66804' => {
+                            '66464' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5167,7 +5113,30 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_activate_firmware_resp'
                                        },
-                            '66930' => {
+                            '6655' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'instance_id',
+                                                              'type' => '168'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'completion_code',
+                                                              'type' => '168'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'next_transfer_handle',
+                                                              'type' => '180'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'msg',
+                                                              'type' => '1632'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'encode_set_bios_table_resp'
+                                      },
+                            '66590' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5190,7 +5159,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_activate_firmware_req'
                                        },
-                            '67172' => {
+                            '66832' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5213,7 +5182,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_apply_complete_resp'
                                        },
-                            '67361' => {
+                            '67021' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5230,7 +5199,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_activation_methods_modification',
-                                                               'type' => '67471'
+                                                               'type' => '67131'
                                                              }
                                                     },
                                          'Reg' => {
@@ -5242,7 +5211,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_apply_complete_req'
                                        },
-                            '67481' => {
+                            '67141' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5265,7 +5234,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_verify_complete_resp'
                                        },
-                            '67670' => {
+                            '67330' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5289,7 +5258,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_verify_complete_req'
                                        },
-                            '67746' => {
+                            '67406' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5312,7 +5281,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_transfer_complete_resp'
                                        },
-                            '67935' => {
+                            '67595' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5336,7 +5305,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_transfer_complete_req'
                                        },
-                            '68011' => {
+                            '67671' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5359,7 +5328,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_firmware_data_resp'
                                        },
-                            '68200' => {
+                            '67860' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5388,7 +5357,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_firmware_data_req'
                                        },
-                            '68320' => {
+                            '67980' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5413,7 +5382,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '66624'
+                                                               'type' => '66284'
                                                              },
                                                       '6' => {
                                                                'name' => 'time_before_req_fw_data',
@@ -5424,7 +5393,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_update_component_resp'
                                        },
-                            '68554' => {
+                            '68214' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5464,7 +5433,7 @@
                                                       '6' => {
                                                                'name' => 'update_option_flags',
                                                                'offset' => '0',
-                                                               'type' => '61362'
+                                                               'type' => '61022'
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_ver_str_type',
@@ -5479,12 +5448,39 @@
                                                       '9' => {
                                                                'name' => 'comp_ver_str',
                                                                'offset' => '24',
-                                                               'type' => '68946'
+                                                               'type' => '68606'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'encode_update_component_req'
                                        },
+                            '68616' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2077'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '11648'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '2082'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'comp_resp',
+                                                               'type' => '2082'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'comp_resp_code',
+                                                               'type' => '2082'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_pass_component_table_resp'
+                                       },
                             '6874' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5514,34 +5510,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_resp'
                                       },
-                            '68956' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2077'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '11648'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '2082'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'comp_resp',
-                                                               'type' => '2082'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'comp_resp_code',
-                                                               'type' => '2082'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_pass_component_table_resp'
-                                       },
-                            '69155' => {
+                            '68815' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5586,7 +5555,7 @@
                                                       '8' => {
                                                                'name' => 'comp_ver_str',
                                                                'offset' => '16',
-                                                               'type' => '68946'
+                                                               'type' => '68606'
                                                              },
                                                       '9' => {
                                                                'name' => 'msg',
@@ -5597,7 +5566,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_pass_component_table_req'
                                        },
-                            '69565' => {
+                            '69225' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5628,7 +5597,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_update_resp'
                                        },
-                            '69712' => {
+                            '69372' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5663,7 +5632,7 @@
                                                       '7' => {
                                                                'name' => 'comp_img_set_ver_str',
                                                                'offset' => '8',
-                                                               'type' => '68946'
+                                                               'type' => '68606'
                                                              },
                                                       '8' => {
                                                                'name' => 'msg',
@@ -5679,6 +5648,36 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_update_req'
                                        },
+                            '69740' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'data',
+                                                               'type' => '6245'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'component_data',
+                                                               'type' => '69908'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'active_comp_ver_str',
+                                                               'type' => '6645'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'pending_comp_ver_str',
+                                                               'type' => '6645'
+                                                             }
+                                                    },
+                                         'Reg' => {
+                                                    '4' => 'r8'
+                                                  },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_get_firmware_parameters_resp_comp_entry'
+                                       },
                             '6984' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5720,37 +5719,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_req'
                                       },
-                            '70080' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'data',
-                                                               'type' => '6245'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'component_data',
-                                                               'type' => '70248'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'active_comp_ver_str',
-                                                               'type' => '6645'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'pending_comp_ver_str',
-                                                               'type' => '6645'
-                                                             }
-                                                    },
-                                         'Reg' => {
-                                                    '4' => 'r8'
-                                                  },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_get_firmware_parameters_resp_comp_entry'
-                                       },
-                            '70258' => {
+                            '69918' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5763,7 +5732,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'resp_data',
-                                                               'type' => '70478'
+                                                               'type' => '70138'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_image_set_ver_str',
@@ -5781,7 +5750,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp'
                                        },
-                            '70483' => {
+                            '70143' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5800,7 +5769,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_firmware_parameters_req'
                                        },
-                            '70623' => {
+                            '70283' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5825,7 +5794,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'descriptor_data',
-                                                               'type' => '70779'
+                                                               'type' => '70439'
                                                              }
                                                     },
                                          'Reg' => {
@@ -5836,7 +5805,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_query_device_identifiers_resp'
                                        },
-                            '70789' => {
+                            '70449' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5855,7 +5824,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_query_device_identifiers_req'
                                        },
-                            '70929' => {
+                            '70589' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5868,7 +5837,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_comp_image_info',
-                                                               'type' => '71076'
+                                                               'type' => '70736'
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_version_str',
@@ -5878,7 +5847,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pldm_comp_image_info'
                                        },
-                            '71081' => {
+                            '70741' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5905,7 +5874,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_vendor_defined_descriptor_value'
                                        },
-                            '71263' => {
+                            '70923' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5928,7 +5897,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_descriptor_type_length_value'
                                        },
-                            '71435' => {
+                            '71095' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5945,7 +5914,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'fw_device_id_record',
-                                                               'type' => '71692'
+                                                               'type' => '71352'
                                                              },
                                                       '4' => {
                                                                'name' => 'applicable_components',
@@ -5969,7 +5938,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_firmware_device_id_record'
                                        },
-                            '71697' => {
+                            '71357' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5982,7 +5951,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'package_header_info',
-                                                               'type' => '71844'
+                                                               'type' => '71504'
                                                              },
                                                       '3' => {
                                                                'name' => 'package_version_str',
@@ -6015,7 +5984,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_resp'
                                       },
-                            '74002' => {
+                            '73662' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6042,7 +6011,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_set_fru_record_table_resp'
                                        },
-                            '74242' => {
+                            '73902' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6073,7 +6042,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_set_fru_record_table_req'
                                        },
-                            '74409' => {
+                            '74069' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6109,7 +6078,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '74639' => {
+                            '74299' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6150,7 +6119,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '74887' => {
+                            '74547' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6177,7 +6146,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '75122' => {
+                            '74782' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6212,38 +6181,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_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'
-                                      },
-                            '75289' => {
+                            '74949' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6284,7 +6222,38 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_resp'
                                        },
-                            '75607' => {
+                            '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'
+                                      },
+                            '75267' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6329,7 +6298,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '75809' => {
+                            '75469' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6375,7 +6344,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_req'
                                        },
-                            '76106' => {
+                            '75766' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6411,7 +6380,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'get_fru_record_by_option_check'
                                        },
-                            '76529' => {
+                            '76189' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6447,36 +6416,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'get_fru_record_by_option'
                                        },
-                            '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'
-                                      },
-                            '76955' => {
+                            '76615' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6522,7 +6462,36 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
-                            '77203' => {
+                            '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'
+                                      },
+                            '76863' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6549,7 +6518,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_resp'
                                        },
-                            '77424' => {
+                            '77084' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6578,7 +6547,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '77528' => {
+                            '77188' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6629,43 +6598,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '7772' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'instance_id',
-                                                              'type' => '168'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'transfer_handle',
-                                                              'type' => '180'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'transfer_flag',
-                                                              'type' => '168'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'attribute_data',
-                                                              'type' => '6245'
-                                                            },
-                                                     '4' => {
-                                                              'name' => 'attribute_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '5' => {
-                                                              'name' => 'msg',
-                                                              'type' => '1632'
-                                                            },
-                                                     '6' => {
-                                                              'name' => 'payload_length',
-                                                              'offset' => '0',
-                                                              'type' => '123'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'encode_set_bios_attribute_current_value_req'
-                                      },
-                            '77831' => {
+                            '77491' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6720,7 +6653,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '78041' => {
+                            '77701' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6739,7 +6672,43 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_req'
                                        },
-                            '79684' => {
+                            '7772' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'instance_id',
+                                                              'type' => '168'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'transfer_handle',
+                                                              'type' => '180'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'transfer_flag',
+                                                              'type' => '168'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'attribute_data',
+                                                              'type' => '6245'
+                                                            },
+                                                     '4' => {
+                                                              'name' => 'attribute_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '5' => {
+                                                              'name' => 'msg',
+                                                              'type' => '1632'
+                                                            },
+                                                     '6' => {
+                                                              'name' => 'payload_length',
+                                                              'offset' => '0',
+                                                              'type' => '123'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'encode_set_bios_attribute_current_value_req'
+                                      },
+                            '79344' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6756,18 +6725,18 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'entities',
-                                                               'type' => '79997'
+                                                               'type' => '79657'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_extract'
                                        },
-                            '80017' => {
+                            '79677' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              }
                                                     },
                                          'Reg' => {
@@ -6776,45 +6745,45 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_empty_entity_assoc_tree'
                                        },
-                            '80071' => {
+                            '79731' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy_root'
                                        },
-                            '80134' => {
+                            '79794' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'org_tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              },
                                                       '1' => {
                                                                'name' => 'new_tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_copy_root'
                                        },
-                            '80350' => {
+                            '80010' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '80002'
+                                                               'type' => '79662'
                                                              }
                                                     },
-                                         'Return' => '79572',
+                                         'Return' => '79232',
                                          'ShortName' => 'pldm_entity_association_tree_find'
                                        },
                             '8072' => {
@@ -6853,23 +6822,23 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '81132' => {
+                            '80792' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_remote_pdrs'
                                        },
-                            '81386' => {
+                            '81046' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6879,39 +6848,39 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
-                            '81655' => {
+                            '81315' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '78713'
+                                                               'type' => '78373'
                                                              },
                                                       '2' => {
                                                                'name' => 'node',
-                                                               'type' => '80345'
+                                                               'type' => '80005'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_find_entity_ref_in_tree'
                                        },
-                            '82167' => {
+                            '81827' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79572'
+                                                               'type' => '79232'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '79997'
+                                                               'type' => '79657'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6929,20 +6898,20 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '82385' => {
+                            '82045' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79572'
+                                                               'type' => '79232'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '79997'
+                                                               'type' => '79657'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6960,16 +6929,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node'
                                        },
-                            '82721' => {
+                            '82381' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              },
                                                       '2' => {
                                                                'name' => 'is_remote',
@@ -7014,16 +6983,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '84193' => {
+                            '83853' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'parent',
-                                                               'type' => '79572'
+                                                               'type' => '79232'
                                                              },
                                                       '1' => {
                                                                'name' => 'node',
-                                                               'type' => '80002'
+                                                               'type' => '79662'
                                                              }
                                                     },
                                          'Reg' => {
@@ -7032,12 +7001,12 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '84282' => {
+                            '83942' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79572'
+                                                               'type' => '79232'
                                                              },
                                                       '1' => {
                                                                'name' => 'association_type',
@@ -7047,60 +7016,60 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '84497' => {
+                            '84157' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79572'
+                                                               'type' => '79232'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '84652' => {
+                            '84312' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79572'
+                                                               'type' => '79232'
                                                              }
                                                     },
-                                         'Return' => '78713',
+                                         'Return' => '78373',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '84807' => {
+                            '84467' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79572'
+                                                               'type' => '79232'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '84962' => {
+                            '84622' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
-                            '85141' => {
+                            '84801' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              },
                                                       '1' => {
                                                                'name' => 'entities',
-                                                               'type' => '79997'
+                                                               'type' => '79657'
                                                              },
                                                       '2' => {
                                                                'name' => 'size',
@@ -7145,16 +7114,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '86103' => {
+                            '85763' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80066'
+                                                               'type' => '79726'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '80002'
+                                                               'type' => '79662'
                                                              },
                                                       '2' => {
                                                                'name' => 'entity_instance_number',
@@ -7162,30 +7131,30 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'parent',
-                                                               'type' => '79572'
+                                                               'type' => '79232'
                                                              },
                                                       '4' => {
                                                                'name' => 'association_type',
                                                                'type' => '168'
                                                              }
                                                     },
-                                         'Return' => '79572',
+                                         'Return' => '79232',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
-                            '86536' => {
+                            '86196' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '80066',
+                                         'Return' => '79726',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
-                            '86770' => {
+                            '86430' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79572'
+                                                               'type' => '79232'
                                                              }
                                                     },
-                                         'Return' => '78713',
+                                         'Return' => '78373',
                                          'ShortName' => 'pldm_entity_extract'
                                        },
                             '8693' => {
@@ -7215,12 +7184,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '87565' => {
+                            '87225' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81127'
+                                                               'type' => '80787'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7242,12 +7211,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
-                            '87925' => {
+                            '87585' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81127'
+                                                               'type' => '80787'
                                                              },
                                                       '1' => {
                                                                'name' => 'fru_rsi',
@@ -7270,15 +7239,15 @@
                                                                'type' => '8521'
                                                              }
                                                     },
-                                         'Return' => '87910',
+                                         'Return' => '87570',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '88279' => {
+                            '87939' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7309,12 +7278,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '88617' => {
+                            '88277' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7344,32 +7313,54 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set'
                                        },
-                            '88970' => {
+                            '88630' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '87910'
+                                                               'type' => '87570'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '89125' => {
+                            '88785' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81127'
+                                                               'type' => '80787'
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '87910'
+                                                               'type' => '87570'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
+                            '89003' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80787'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_get_repo_size'
+                                       },
+                            '89134' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80787'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_get_record_count'
+                                       },
                             '8922' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7405,34 +7396,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '89343' => {
+                            '89265' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81127'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_get_repo_size'
-                                       },
-                            '89474' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '81127'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_get_record_count'
-                                       },
-                            '89605' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '81127'
+                                                               'type' => '80787'
                                                              },
                                                       '1' => {
                                                                'name' => 'pdr_type',
@@ -7440,11 +7409,11 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '87910'
+                                                               'type' => '87570'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
-                                                               'type' => '70779'
+                                                               'type' => '70439'
                                                              },
                                                       '4' => {
                                                                'name' => 'size',
@@ -7456,23 +7425,23 @@
                                                     '3' => 'rcx',
                                                     '4' => 'r8'
                                                   },
-                                         'Return' => '87910',
+                                         'Return' => '87570',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
-                            '89777' => {
+                            '89437' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81127'
+                                                               'type' => '80787'
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '87910'
+                                                               'type' => '87570'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '70779'
+                                                               'type' => '70439'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7483,15 +7452,15 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '87910',
+                                         'Return' => '87570',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '89944' => {
+                            '89604' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81127'
+                                                               'type' => '80787'
                                                              },
                                                       '1' => {
                                                                'name' => 'record_handle',
@@ -7499,7 +7468,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '70779'
+                                                               'type' => '70439'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7510,31 +7479,31 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '87910',
+                                         'Return' => '87570',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '90112' => {
+                            '89772' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '90267' => {
+                            '89927' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '81381',
+                                         'Return' => '81041',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '90339' => {
+                            '89999' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7560,12 +7529,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_check'
                                        },
-                            '90777' => {
+                            '90437' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81381'
+                                                               'type' => '81041'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7622,7 +7591,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '92276' => {
+                            '91936' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7633,7 +7602,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '92405' => {
+                            '92065' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7671,7 +7640,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '92806' => {
+                            '92466' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7693,7 +7662,7 @@
                                          'Return' => '12557',
                                          'ShortName' => 'ver2str'
                                        },
-                            '92934' => {
+                            '92594' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7708,44 +7677,66 @@
                                          'Return' => '168',
                                          'ShortName' => 'crc8'
                                        },
-                            '94192' => {
+                            '93852' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94415'
+                                                               'type' => '94075'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '93514'
+                                                               'type' => '93174'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '93526'
+                                                               'type' => '93186'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '94420' => {
+                            '94080' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94415'
+                                                               'type' => '94075'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '93514'
+                                                               'type' => '93174'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '94841'
+                                                               'type' => '94501'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
+                            '94506' => {
+                                         'Header' => 'instance-id.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'ctx',
+                                                               'type' => '94075'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_instance_db_destroy'
+                                       },
+                            '94591' => {
+                                         'Header' => 'instance-id.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'ctx',
+                                                               'type' => '94677'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_instance_db_init_default'
+                                       },
                             '9464' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7782,34 +7773,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '94846' => {
+                            '94682' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94415'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_instance_db_destroy'
-                                       },
-                            '94931' => {
-                                         'Header' => 'instance-id.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'ctx',
-                                                               'type' => '95017'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_instance_db_init_default'
-                                       },
-                            '95022' => {
-                                         'Header' => 'instance-id.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'ctx',
-                                                               'type' => '95017'
+                                                               'type' => '94677'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7819,12 +7788,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init'
                                        },
-                            '96195' => {
+                            '95855' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95533'
+                                                               'type' => '95193'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7839,15 +7808,15 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '95642',
+                                         'Return' => '95302',
                                          'ShortName' => 'pldm_send'
                                        },
-                            '96614' => {
+                            '96274' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95533'
+                                                               'type' => '95193'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7863,22 +7832,22 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '70779'
+                                                               'type' => '70439'
                                                              },
                                                       '5' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '95642',
+                                         'Return' => '95302',
                                          'ShortName' => 'pldm_send_recv'
                                        },
-                            '97097' => {
+                            '96757' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95533'
+                                                               'type' => '95193'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7890,22 +7859,22 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '70779'
+                                                               'type' => '70439'
                                                              },
                                                       '4' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '95642',
+                                         'Return' => '95302',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '97323' => {
+                            '96983' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95533'
+                                                               'type' => '95193'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7913,16 +7882,21 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '70779'
+                                                               'type' => '70439'
                                                              },
                                                       '3' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '95642',
+                                         'Return' => '95302',
                                          'ShortName' => 'pldm_recv_any'
                                        },
+                            '97428' => {
+                                         'Header' => 'pldm.h',
+                                         'Return' => '95302',
+                                         'ShortName' => 'pldm_open'
+                                       },
                             '9755' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7947,11 +7921,6 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_date_time_resp'
                                       },
-                            '97768' => {
-                                         'Header' => 'pldm.h',
-                                         'Return' => '95642',
-                                         'ShortName' => 'pldm_open'
-                                       },
                             '9827' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -8215,7 +8184,6 @@
                                                  'pldm_bios_table_attr_value_entry_encode_integer' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_integer_check' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_integer_length' => 1,
-                                                 'pldm_bios_table_attr_value_entry_encode_string' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_string_check' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_string_length' => 1,
                                                  'pldm_bios_table_attr_value_entry_enum_decode_handles' => 1,
@@ -9589,7 +9557,7 @@
                                      },
                           '47725' => {
                                        'Header' => undef,
-                                       'Line' => '971',
+                                       'Line' => '960',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'table_data',
@@ -9694,31 +9662,31 @@
                                     'Size' => '1',
                                     'Type' => 'Intrinsic'
                                   },
-                          '55626' => {
+                          '55286' => {
                                        'BaseType' => '46642',
                                        'Name' => 'uint64_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55903' => {
+                          '55563' => {
                                        'BaseType' => '47301',
                                        'Name' => 'struct pldm_bios_table_attr_entry_integer_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '56212' => {
+                          '55872' => {
                                        'BaseType' => '12552',
                                        'Name' => 'char const**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '57238' => {
+                          '56898' => {
                                        'BaseType' => '47193',
                                        'Name' => 'struct pldm_bios_table_attr_entry_string_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '58592' => {
+                          '58252' => {
                                        'BaseType' => '47059',
                                        'Name' => 'struct pldm_bios_table_attr_entry_enum_info const*',
                                        'Size' => '8',
@@ -9749,14 +9717,14 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '63859' => {
+                          '63519' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '329',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'uuid',
                                                             'offset' => '0',
-                                                            'type' => '63963'
+                                                            'type' => '63623'
                                                           },
                                                    '1' => {
                                                             'name' => 'package_header_format_version',
@@ -9793,13 +9761,13 @@
                                        'Size' => '36',
                                        'Type' => 'Struct'
                                      },
-                          '63963' => {
+                          '63623' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[16]',
                                        'Size' => '16',
                                        'Type' => 'Array'
                                      },
-                          '63995' => {
+                          '63655' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '343',
                                        'Memb' => {
@@ -9816,7 +9784,7 @@
                                                    '2' => {
                                                             'name' => 'device_update_option_flags',
                                                             'offset' => '3',
-                                                            'type' => '61362'
+                                                            'type' => '61022'
                                                           },
                                                    '3' => {
                                                             'name' => 'comp_image_set_version_string_type',
@@ -9838,7 +9806,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '64190' => {
+                          '63850' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '377',
                                        'Memb' => {
@@ -9860,12 +9828,12 @@
                                                    '3' => {
                                                             'name' => 'comp_options',
                                                             'offset' => '8',
-                                                            'type' => '60864'
+                                                            'type' => '60524'
                                                           },
                                                    '4' => {
                                                             'name' => 'requested_comp_activation_method',
                                                             'offset' => '16',
-                                                            'type' => '60864'
+                                                            'type' => '60524'
                                                           },
                                                    '5' => {
                                                             'name' => 'comp_location_offset',
@@ -9892,12 +9860,7 @@
                                        'Size' => '22',
                                        'Type' => 'Struct'
                                      },
-                          '6423' => {
-                                      'Name' => '_Bool',
-                                      'Size' => '1',
-                                      'Type' => 'Intrinsic'
-                                    },
-                          '64372' => {
+                          '64032' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '403',
                                        'Memb' => {
@@ -9909,7 +9872,7 @@
                                                    '1' => {
                                                             'name' => 'capabilities_during_update',
                                                             'offset' => '1',
-                                                            'type' => '61362'
+                                                            'type' => '61022'
                                                           },
                                                    '2' => {
                                                             'name' => 'comp_count',
@@ -9941,7 +9904,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '64476' => {
+                          '64136' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '417',
                                        'Memb' => {
@@ -9958,17 +9921,17 @@
                                                    '10' => {
                                                              'name' => 'pending_comp_release_date',
                                                              'offset' => '37',
-                                                             'type' => '64658'
+                                                             'type' => '64318'
                                                            },
                                                    '11' => {
                                                              'name' => 'comp_activation_methods',
                                                              'offset' => '51',
-                                                             'type' => '60864'
+                                                             'type' => '60524'
                                                            },
                                                    '12' => {
                                                              'name' => 'capabilities_during_update',
                                                              'offset' => '53',
-                                                             'type' => '61362'
+                                                             'type' => '61022'
                                                            },
                                                    '2' => {
                                                             'name' => 'comp_classification_index',
@@ -9993,7 +9956,7 @@
                                                    '6' => {
                                                             'name' => 'active_comp_release_date',
                                                             'offset' => '17',
-                                                            'type' => '64658'
+                                                            'type' => '64318'
                                                           },
                                                    '7' => {
                                                             'name' => 'pending_comp_comparison_stamp',
@@ -10015,19 +9978,24 @@
                                        'Size' => '39',
                                        'Type' => 'Struct'
                                      },
-                          '64658' => {
+                          '6423' => {
+                                      'Name' => '_Bool',
+                                      'Size' => '1',
+                                      'Type' => 'Intrinsic'
+                                    },
+                          '64318' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[8]',
                                        'Size' => '8',
                                        'Type' => 'Array'
                                      },
-                          '65518' => {
+                          '65178' => {
                                        'BaseType' => '6206',
                                        'Name' => 'struct variable_field const',
                                        'Size' => '16',
                                        'Type' => 'Const'
                                      },
-                          '65866' => {
+                          '65526' => {
                                        'BaseType' => '11999',
                                        'Name' => 'bool8_t*',
                                        'Size' => '8',
@@ -10044,36 +10012,42 @@
                                     'Size' => '2',
                                     'Type' => 'Intrinsic'
                                   },
-                          '68946' => {
-                                       'BaseType' => '65518',
+                          '68606' => {
+                                       'BaseType' => '65178',
                                        'Name' => 'struct variable_field const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70248' => {
-                                       'BaseType' => '64476',
+                          '69908' => {
+                                       'BaseType' => '64136',
                                        'Name' => 'struct pldm_component_parameter_entry*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70478' => {
-                                       'BaseType' => '64372',
+                          '70138' => {
+                                       'BaseType' => '64032',
                                        'Name' => 'struct pldm_get_firmware_parameters_resp*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70779' => {
+                          '70439' => {
                                        'BaseType' => '2082',
                                        'Name' => 'uint8_t**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '71076' => {
-                                       'BaseType' => '64190',
+                          '70736' => {
+                                       'BaseType' => '63850',
                                        'Name' => 'struct pldm_component_image_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
+                          '71352' => {
+                                       'BaseType' => '63655',
+                                       'Name' => 'struct pldm_firmware_device_id_record*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '714' => {
                                      'Header' => 'base.h',
                                      'Line' => '117',
@@ -10088,14 +10062,8 @@
                                      'Size' => '3',
                                      'Type' => 'Struct'
                                    },
-                          '71692' => {
-                                       'BaseType' => '63995',
-                                       'Name' => 'struct pldm_firmware_device_id_record*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
-                          '71844' => {
-                                       'BaseType' => '63859',
+                          '71504' => {
+                                       'BaseType' => '63519',
                                        'Name' => 'struct pldm_package_header_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10105,8 +10073,8 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '78478' => {
-                                       'BaseType' => '78495',
+                          '78138' => {
+                                       'BaseType' => '78155',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -10114,13 +10082,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '78490' => {
-                                       'BaseType' => '78478',
+                          '78150' => {
+                                       'BaseType' => '78138',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '78495' => {
+                          '78155' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -10137,12 +10105,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '79567'
+                                                            'type' => '79227'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '79567'
+                                                            'type' => '79227'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -10150,8 +10118,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '78555' => {
-                                       'BaseType' => '78572',
+                          '78215' => {
+                                       'BaseType' => '78232',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -10159,13 +10127,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '78567' => {
-                                       'BaseType' => '78555',
+                          '78227' => {
+                                       'BaseType' => '78215',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '78572' => {
+                          '78232' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -10187,7 +10155,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '79555'
+                                                            'type' => '79215'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -10205,7 +10173,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '78656' => {
+                          '78316' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -10229,16 +10197,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '78713' => {
-                                       'BaseType' => '78656',
+                          '78373' => {
+                                       'BaseType' => '78316',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '78757' => {
-                                       'BaseType' => '78769',
+                          '78417' => {
+                                       'BaseType' => '78429',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -10246,14 +10214,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '78769' => {
+                          '78429' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '79572'
+                                                            'type' => '79232'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -10266,8 +10234,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '78812' => {
-                                       'BaseType' => '78829',
+                          '78472' => {
+                                       'BaseType' => '78489',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -10275,19 +10243,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '78829' => {
+                          '78489' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '78713'
+                                                            'type' => '78373'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '78713'
+                                                            'type' => '78373'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -10297,12 +10265,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '79572'
+                                                            'type' => '79232'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '79572'
+                                                            'type' => '79232'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -10315,61 +10283,61 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '79555' => {
-                                       'BaseType' => '78572',
+                          '79215' => {
+                                       'BaseType' => '78232',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79567' => {
-                                       'BaseType' => '78555',
+                          '79227' => {
+                                       'BaseType' => '78215',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79572' => {
-                                       'BaseType' => '78812',
+                          '79232' => {
+                                       'BaseType' => '78472',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79997' => {
-                                       'BaseType' => '80002',
+                          '79657' => {
+                                       'BaseType' => '79662',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80002' => {
-                                       'BaseType' => '78713',
+                          '79662' => {
+                                       'BaseType' => '78373',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80066' => {
-                                       'BaseType' => '78757',
+                          '79726' => {
+                                       'BaseType' => '78417',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80345' => {
-                                       'BaseType' => '79572',
+                          '80005' => {
+                                       'BaseType' => '79232',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
+                          '80787' => {
+                                       'BaseType' => '78150',
+                                       'Name' => 'pldm_pdr const*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '81' => {
                                     'Name' => 'unsigned int',
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '81127' => {
-                                       'BaseType' => '78490',
-                                       'Name' => 'pldm_pdr const*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
-                          '81381' => {
-                                       'BaseType' => '78478',
+                          '81041' => {
+                                       'BaseType' => '78138',
                                        'Name' => 'pldm_pdr*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10417,8 +10385,8 @@
                                      'Size' => '1',
                                      'Type' => 'Array'
                                    },
-                          '87910' => {
-                                       'BaseType' => '78567',
+                          '87570' => {
+                                       'BaseType' => '78227',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10463,7 +10431,7 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '93514' => {
+                          '93174' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -10471,7 +10439,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93526' => {
+                          '93186' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -10479,14 +10447,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93906' => {
+                          '93566' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '93526'
+                                                            'type' => '93186'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -10499,14 +10467,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '93945' => {
+                          '93605' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '93987'
+                                                            'type' => '93647'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10519,31 +10487,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '93987' => {
-                                       'BaseType' => '93906',
+                          '93647' => {
+                                       'BaseType' => '93566',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '94415' => {
-                                       'BaseType' => '93945',
+                          '94075' => {
+                                       'BaseType' => '93605',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94841' => {
-                                       'BaseType' => '93526',
+                          '94501' => {
+                                       'BaseType' => '93186',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '95017' => {
-                                       'BaseType' => '94415',
+                          '94677' => {
+                                       'BaseType' => '94075',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '95533' => {
+                          '95193' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10551,7 +10519,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '95545' => {
+                          '95205' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10612,8 +10580,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '95642' => {
-                                       'BaseType' => '95545',
+                          '95302' => {
+                                       'BaseType' => '95205',
                                        '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 ce042ac..b8ba889 100644
--- a/include/libpldm/bios_table.h
+++ b/include/libpldm/bios_table.h
@@ -495,21 +495,6 @@
 size_t
 pldm_bios_table_attr_value_entry_encode_string_length(uint16_t string_length);
 
-/** @brief Create an attribute value entry(type: string)
- *  @param[out] entry - Pointer to bios attribute value entry
- *  @param[in] entry_length - Length of attribute value entry
- *  @param[in] attr_handle - This handle points to an attribute in the
- *  BIOS Attribute Vlaue Table.
- *  @param[in] attr_type - Type of this attribute in the BIOS Attribute Value
- * Table
- *  @param[in] string_length - Length of current string in bytes. 0 indicates
- * that the current string value is not set.
- *  @param[in] string - The current string itsel
- */
-void pldm_bios_table_attr_value_entry_encode_string(
-	void *entry, size_t entry_length, uint16_t attr_handle,
-	uint8_t attr_type, uint16_t str_length, const char *string);
-
 /** @brief Get length of the current string in bytes
  *  @param [in] entry - Pointer to bios attribute value table entry
  *  @return The length of the current string in bytes
diff --git a/src/bios_table.c b/src/bios_table.c
index 7b845bc..f7f09a4 100644
--- a/src/bios_table.c
+++ b/src/bios_table.c
@@ -726,17 +726,6 @@
 	       sizeof(string_length) + string_length;
 }
 
-LIBPLDM_ABI_DEPRECATED
-void pldm_bios_table_attr_value_entry_encode_string(
-	void *entry, size_t entry_length, uint16_t attr_handle,
-	uint8_t attr_type, uint16_t str_length, const char *str)
-{
-	int rc = pldm_bios_table_attr_value_entry_encode_string_check(
-		entry, entry_length, attr_handle, attr_type, str_length, str);
-	(void)rc;
-	assert(rc == PLDM_SUCCESS);
-}
-
 LIBPLDM_ABI_STABLE
 uint16_t pldm_bios_table_attr_value_entry_string_decode_length(
 	const struct pldm_bios_attr_val_table_entry *entry)
diff --git a/tests/libpldm_bios_table_test.cpp b/tests/libpldm_bios_table_test.cpp
index 5746bd8..974ed19 100644
--- a/tests/libpldm_bios_table_test.cpp
+++ b/tests/libpldm_bios_table_test.cpp
@@ -651,14 +651,14 @@
     auto length = pldm_bios_table_attr_value_entry_encode_string_length(3);
     EXPECT_EQ(length, stringEntry.size());
     std::vector<uint8_t> encodeEntry(length, 0);
-    pldm_bios_table_attr_value_entry_encode_string(
-        encodeEntry.data(), encodeEntry.size(), 0, 1, 3, "abc");
+    ASSERT_EQ(pldm_bios_table_attr_value_entry_encode_string_check(
+                  encodeEntry.data(), encodeEntry.size(), 0, 1, 3, "abc"),
+              PLDM_SUCCESS);
     EXPECT_EQ(encodeEntry, stringEntry);
 
-    EXPECT_DEATH(
-        pldm_bios_table_attr_value_entry_encode_string(
-            encodeEntry.data(), encodeEntry.size() - 1, 0, 1, 3, "abc"),
-        "rc == PLDM_SUCCESS");
+    EXPECT_NE(pldm_bios_table_attr_value_entry_encode_string_check(
+                  encodeEntry.data(), encodeEntry.size() - 1, 0, 1, 3, "abc"),
+              PLDM_SUCCESS);
 
     auto rc = pldm_bios_table_attr_value_entry_encode_string_check(
         encodeEntry.data(), encodeEntry.size(), 0, PLDM_BIOS_STRING, 3, "abc");