diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccd00df..716abd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,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()
+4. bios_table: Remove pldm_bios_table_attr_value_entry_encode_integer()
 
 ### Fixed
 
diff --git a/abi/aarch64/gcc.dump b/abi/aarch64/gcc.dump
index 09374a8..05b0b28 100644
--- a/abi/aarch64/gcc.dump
+++ b/abi/aarch64/gcc.dump
@@ -158,7 +158,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '108628' => {
+                            '108327' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -177,7 +177,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '108811' => {
+                            '108510' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -198,7 +198,7 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '54242'
+                                                                'type' => '53941'
                                                               },
                                                        '5' => {
                                                                 'name' => 'file_meta_data_1',
@@ -221,7 +221,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '109029' => {
+                            '108728' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -240,7 +240,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '109136' => {
+                            '108835' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -283,7 +283,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '109429' => {
+                            '109128' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -302,7 +302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '109607' => {
+                            '109306' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -346,22 +346,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_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'
-                                       },
-                            '109805' => {
+                            '109504' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -380,7 +365,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '109907' => {
+                            '109606' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -423,7 +408,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '110200' => {
+                            '10972' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '109899' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -442,7 +442,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '110307' => {
+                            '110006' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -469,7 +469,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '110525' => {
+                            '110224' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -488,7 +488,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '110698' => {
+                            '110397' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -515,7 +515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '110834' => {
+                            '110533' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -538,7 +538,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '110961' => {
+                            '110660' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -573,7 +573,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '111219' => {
+                            '110918' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -600,7 +600,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '111432' => {
+                            '111131' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -631,7 +631,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '111582' => {
+                            '111281' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -650,7 +650,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '111689' => {
+                            '111388' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -677,7 +677,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '111907' => {
+                            '111606' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -696,7 +696,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '112080' => {
+                            '111779' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -717,13 +717,13 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '54242'
+                                                                'type' => '53941'
                                                               }
                                                      },
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '112216' => {
+                            '111915' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -746,7 +746,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '112343' => {
+                            '112042' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -785,7 +785,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '112621' => {
+                            '112320' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -812,7 +812,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '112834' => {
+                            '112533' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -841,13 +841,13 @@
                                                               },
                                                        '6' => {
                                                                 'name' => 'address',
-                                                                'type' => '54242'
+                                                                'type' => '53941'
                                                               }
                                                      },
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '112998' => {
+                            '112697' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -870,7 +870,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '113196' => {
+                            '112895' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -893,7 +893,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '113318' => {
+                            '113017' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -920,7 +920,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '113536' => {
+                            '113235' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -951,7 +951,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '113685' => {
+                            '113384' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -974,7 +974,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '113883' => {
+                            '113582' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1001,7 +1001,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '114013' => {
+                            '113712' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1028,7 +1028,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '114231' => {
+                            '113930' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1055,7 +1055,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '114360' => {
+                            '114059' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1090,7 +1090,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '114526' => {
+                            '114225' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1117,7 +1117,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '114735' => {
+                            '114434' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1152,7 +1152,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '115018' => {
+                            '114717' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1179,7 +1179,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '115147' => {
+                            '114846' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1202,7 +1202,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '115268' => {
+                            '114967' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1237,7 +1237,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '115515' => {
+                            '115214' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1264,7 +1264,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '115719' => {
+                            '115418' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1289,13 +1289,13 @@
                                                               },
                                                        '5' => {
                                                                 'name' => 'address',
-                                                                'type' => '54242'
+                                                                'type' => '53941'
                                                               }
                                                      },
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '116665' => {
+                            '116364' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1326,7 +1326,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '116896' => {
+                            '116595' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1345,7 +1345,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '116984' => {
+                            '116683' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1372,7 +1372,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '117117' => {
+                            '116816' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1395,7 +1395,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '118156' => {
+                            '117855' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -3851,37 +3851,10 @@
                                        },
                             '51887' => {
                                          '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' => 'cv',
-                                                               'type' => '45555'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_bios_table_attr_value_entry_encode_integer'
-                                       },
-                            '52188' => {
-                                         'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_integer_length'
                                        },
-                            '52350' => {
+                            '52049' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -3912,7 +3885,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_string_check'
                                        },
-                            '52605' => {
+                            '52304' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -3927,7 +3900,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_string_decode_string'
                                        },
-                            '52700' => {
+                            '52399' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -3938,7 +3911,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_string_decode_length'
                                        },
-                            '52775' => {
+                            '52474' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -3949,7 +3922,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_string_length'
                                        },
-                            '52963' => {
+                            '52662' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -3980,7 +3953,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_check'
                                        },
-                            '53217' => {
+                            '52916' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -3999,7 +3972,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_enum_decode_handles'
                                        },
-                            '53391' => {
+                            '53090' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4010,7 +3983,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_enum_decode_number'
                                        },
-                            '53446' => {
+                            '53145' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4021,7 +3994,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_length'
                                        },
-                            '53501' => {
+                            '53200' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4032,7 +4005,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_type'
                                        },
-                            '53556' => {
+                            '53255' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4043,7 +4016,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_handle'
                                        },
-                            '54115' => {
+                            '53814' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4052,11 +4025,11 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'lower',
-                                                               'type' => '54242'
+                                                               'type' => '53941'
                                                              },
                                                       '2' => {
                                                                'name' => 'upper',
-                                                               'type' => '54242'
+                                                               'type' => '53941'
                                                              },
                                                       '3' => {
                                                                'name' => 'scalar',
@@ -4064,13 +4037,13 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'def',
-                                                               'type' => '54242'
+                                                               'type' => '53941'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_decode'
                                        },
-                            '54257' => {
+                            '53956' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4083,33 +4056,33 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '54519'
+                                                               'type' => '54218'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_check'
                                        },
-                            '54529' => {
+                            '54228' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '54519'
+                                                               'type' => '54218'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '54786'
+                                                               'type' => '54485'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_info_check'
                                        },
-                            '54791' => {
+                            '54490' => {
                                          'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_length'
                                        },
-                            '54953' => {
+                            '54652' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4128,7 +4101,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string'
                                        },
-                            '55149' => {
+                            '54848' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4139,7 +4112,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_min_length'
                                        },
-                            '55224' => {
+                            '54923' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4150,7 +4123,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_max_length'
                                        },
-                            '55299' => {
+                            '54998' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4161,7 +4134,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_string_type'
                                        },
-                            '55374' => {
+                            '55073' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4176,7 +4149,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string_length_check'
                                        },
-                            '55550' => {
+                            '55249' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4189,28 +4162,28 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '55836'
+                                                               'type' => '55535'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_check'
                                        },
-                            '55841' => {
+                            '55540' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '55836'
+                                                               'type' => '55535'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '54786'
+                                                               'type' => '54485'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_info_check'
                                        },
-                            '56110' => {
+                            '55809' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4221,7 +4194,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_length'
                                        },
-                            '56345' => {
+                            '56044' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4240,7 +4213,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_indices'
                                        },
-                            '56551' => {
+                            '56250' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4259,7 +4232,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_hdls_check'
                                        },
-                            '56709' => {
+                            '56408' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4274,7 +4247,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_num_check'
                                        },
-                            '56874' => {
+                            '56573' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4289,7 +4262,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_num_check'
                                        },
-                            '56940' => {
+                            '56639' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4302,13 +4275,13 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '57198'
+                                                               'type' => '56897'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_check'
                                        },
-                            '57203' => {
+                            '56902' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4323,7 +4296,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_length'
                                        },
-                            '57269' => {
+                            '56968' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4334,7 +4307,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_string_handle'
                                        },
-                            '57322' => {
+                            '57021' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4345,7 +4318,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_type'
                                        },
-                            '57375' => {
+                            '57074' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4356,7 +4329,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_handle'
                                        },
-                            '57997' => {
+                            '57696' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4375,7 +4348,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_check'
                                        },
-                            '58163' => {
+                            '57862' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4386,7 +4359,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_length'
                                        },
-                            '58216' => {
+                            '57915' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4397,7 +4370,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_handle'
                                        },
-                            '58269' => {
+                            '57968' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4420,7 +4393,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_encode_check'
                                        },
-                            '58538' => {
+                            '58237' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4537,7 +4510,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_req'
                                       },
-                            '64128' => {
+                            '63827' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -4548,7 +4521,7 @@
                                          'Return' => '6265',
                                          'ShortName' => 'is_transfer_flag_valid'
                                        },
-                            '64279' => {
+                            '63978' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4565,17 +4538,17 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'non_functioning_component_indication',
-                                                               'type' => '64463'
+                                                               'type' => '64162'
                                                              },
                                                       '4' => {
                                                                'name' => 'non_functioning_component_bitmap',
-                                                               'type' => '64468'
+                                                               'type' => '64167'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_resp'
                                        },
-                            '64478' => {
+                            '64177' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4594,7 +4567,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_req'
                                        },
-                            '64631' => {
+                            '64330' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4613,7 +4586,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_component_resp'
                                        },
-                            '64713' => {
+                            '64412' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4632,7 +4605,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_component_req'
                                        },
-                            '64866' => {
+                            '64565' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4673,7 +4646,7 @@
                                                              },
                                                       '9' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '65207'
+                                                               'type' => '64906'
                                                              }
                                                     },
                                          'Return' => '74',
@@ -4702,7 +4675,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_resp'
                                       },
-                            '65217' => {
+                            '64916' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4721,7 +4694,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_status_req'
                                        },
-                            '65370' => {
+                            '65069' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4744,7 +4717,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_activate_firmware_resp'
                                        },
-                            '65496' => {
+                            '65195' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4767,7 +4740,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_activate_firmware_req'
                                        },
-                            '65717' => {
+                            '65416' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4790,7 +4763,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_apply_complete_resp'
                                        },
-                            '65889' => {
+                            '65588' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4807,13 +4780,13 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_activation_methods_modification',
-                                                               'type' => '66011'
+                                                               'type' => '65710'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_apply_complete_req'
                                        },
-                            '66021' => {
+                            '65720' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4836,7 +4809,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_verify_complete_resp'
                                        },
-                            '66193' => {
+                            '65892' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4855,7 +4828,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_verify_complete_req'
                                        },
-                            '66275' => {
+                            '65974' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4878,7 +4851,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_transfer_complete_resp'
                                        },
-                            '66447' => {
+                            '66146' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4897,7 +4870,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_transfer_complete_req'
                                        },
-                            '66529' => {
+                            '66228' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4920,7 +4893,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_firmware_data_resp'
                                        },
-                            '66701' => {
+                            '66400' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4943,7 +4916,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_firmware_data_req'
                                        },
-                            '66833' => {
+                            '66532' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4968,7 +4941,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '65207'
+                                                               'type' => '64906'
                                                              },
                                                       '6' => {
                                                                'name' => 'time_before_req_fw_data',
@@ -4978,30 +4951,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_update_component_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'
-                                      },
-                            '67069' => {
+                            '66768' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5038,7 +4988,7 @@
                                                              },
                                                       '6' => {
                                                                'name' => 'update_option_flags',
-                                                               'type' => '59962'
+                                                               'type' => '59661'
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_ver_str_type',
@@ -5050,13 +5000,36 @@
                                                              },
                                                       '9' => {
                                                                'name' => 'comp_ver_str',
-                                                               'type' => '67473'
+                                                               'type' => '67172'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'encode_update_component_req'
                                        },
-                            '67483' => {
+                            '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'
+                                      },
+                            '67182' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5083,7 +5056,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pass_component_table_resp'
                                        },
-                            '67679' => {
+                            '67378' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5124,7 +5097,7 @@
                                                              },
                                                       '8' => {
                                                                'name' => 'comp_ver_str',
-                                                               'type' => '67473'
+                                                               'type' => '67172'
                                                              },
                                                       '9' => {
                                                                'name' => 'msg',
@@ -5134,6 +5107,80 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_pass_component_table_req'
                                        },
+                            '67791' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2029'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '2034'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'fd_meta_data_len',
+                                                               'type' => '8294'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'fd_will_send_pkg_data',
+                                                               'type' => '2034'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_request_update_resp'
+                                       },
+                            '67932' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'max_transfer_size',
+                                                               'type' => '180'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'num_of_comp',
+                                                               'type' => '4895'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'max_outstanding_transfer_req',
+                                                               'type' => '168'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'pkg_data_len',
+                                                               'type' => '4895'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'comp_image_set_ver_str_type',
+                                                               'type' => '168'
+                                                             },
+                                                      '6' => {
+                                                               'name' => 'comp_image_set_ver_str_len',
+                                                               'type' => '168'
+                                                             },
+                                                      '7' => {
+                                                               'name' => 'comp_img_set_ver_str',
+                                                               'type' => '67172'
+                                                             },
+                                                      '8' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             },
+                                                      '9' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_request_update_req'
+                                       },
                             '6809' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5173,81 +5220,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_req'
                                       },
-                            '68092' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2029'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '2034'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'fd_meta_data_len',
-                                                               'type' => '8294'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'fd_will_send_pkg_data',
-                                                               'type' => '2034'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_request_update_resp'
-                                       },
-                            '68233' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'max_transfer_size',
-                                                               'type' => '180'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'num_of_comp',
-                                                               'type' => '4895'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'max_outstanding_transfer_req',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'pkg_data_len',
-                                                               'type' => '4895'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'comp_image_set_ver_str_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '6' => {
-                                                               'name' => 'comp_image_set_ver_str_len',
-                                                               'type' => '168'
-                                                             },
-                                                      '7' => {
-                                                               'name' => 'comp_img_set_ver_str',
-                                                               'type' => '67473'
-                                                             },
-                                                      '8' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             },
-                                                      '9' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_request_update_req'
-                                       },
-                            '68598' => {
+                            '68297' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5260,7 +5233,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'component_data',
-                                                               'type' => '68754'
+                                                               'type' => '68453'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_ver_str',
@@ -5274,7 +5247,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp_comp_entry'
                                        },
-                            '68764' => {
+                            '68463' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5287,7 +5260,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'resp_data',
-                                                               'type' => '68984'
+                                                               'type' => '68683'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_image_set_ver_str',
@@ -5305,7 +5278,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp'
                                        },
-                            '68989' => {
+                            '68688' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5324,7 +5297,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_firmware_parameters_req'
                                        },
-                            '69126' => {
+                            '68825' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5349,13 +5322,13 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'descriptor_data',
-                                                               'type' => '69282'
+                                                               'type' => '68981'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_query_device_identifiers_resp'
                                        },
-                            '69292' => {
+                            '68991' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5374,7 +5347,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_query_device_identifiers_req'
                                        },
-                            '69429' => {
+                            '69128' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5387,7 +5360,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_comp_image_info',
-                                                               'type' => '69576'
+                                                               'type' => '69275'
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_version_str',
@@ -5397,7 +5370,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pldm_comp_image_info'
                                        },
-                            '69581' => {
+                            '69280' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5424,7 +5397,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_vendor_defined_descriptor_value'
                                        },
-                            '69760' => {
+                            '69459' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5447,7 +5420,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_descriptor_type_length_value'
                                        },
-                            '69932' => {
+                            '69631' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5464,7 +5437,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'fw_device_id_record',
-                                                               'type' => '70199'
+                                                               'type' => '69898'
                                                              },
                                                       '4' => {
                                                                'name' => 'applicable_components',
@@ -5486,7 +5459,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_firmware_device_id_record'
                                        },
-                            '70204' => {
+                            '69903' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5499,7 +5472,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'package_header_info',
-                                                               'type' => '70351'
+                                                               'type' => '70050'
                                                              },
                                                       '3' => {
                                                                'name' => 'package_version_str',
@@ -5532,7 +5505,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_resp'
                                       },
-                            '72542' => {
+                            '72241' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5559,7 +5532,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_set_fru_record_table_resp'
                                        },
-                            '72765' => {
+                            '72464' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5586,7 +5559,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_set_fru_record_table_req'
                                        },
-                            '72932' => {
+                            '72631' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5621,34 +5594,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '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' => {
+                            '72879' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5687,7 +5633,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '73438' => {
+                            '73137' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5714,7 +5660,34 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '73656' => {
+                            '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'
+                                      },
+                            '73355' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5745,7 +5718,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_resp'
                                        },
-                            '73817' => {
+                            '73516' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5784,7 +5757,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_resp'
                                        },
-                            '74126' => {
+                            '73825' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5823,7 +5796,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '74314' => {
+                            '74013' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5866,7 +5839,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_req'
                                        },
-                            '74607' => {
+                            '74306' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5924,7 +5897,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_attribute_current_value_resp'
                                       },
-                            '75033' => {
+                            '74732' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5959,7 +5932,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'get_fru_record_by_option'
                                        },
-                            '75470' => {
+                            '75169' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6002,7 +5975,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
-                            '75733' => {
+                            '75432' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6029,42 +6002,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_resp'
                                        },
-                            '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' => {
+                            '75636' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6087,7 +6025,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '76053' => {
+                            '75752' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6134,7 +6072,42 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '76357' => {
+                            '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'
+                                      },
+                            '76056' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6182,7 +6155,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '76564' => {
+                            '76263' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6201,7 +6174,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_req'
                                        },
-                            '78181' => {
+                            '77880' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6218,49 +6191,64 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'entities',
-                                                               'type' => '78494'
+                                                               'type' => '78193'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_extract'
                                        },
-                            '78514' => {
+                            '78213' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78569'
+                                                               'type' => '78268'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_is_empty_entity_assoc_tree'
                                        },
-                            '78574' => {
+                            '78273' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78569'
+                                                               'type' => '78268'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy_root'
                                        },
-                            '78637' => {
+                            '78336' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'org_tree',
-                                                               'type' => '78569'
+                                                               'type' => '78268'
                                                              },
                                                       '1' => {
                                                                'name' => 'new_tree',
-                                                               'type' => '78569'
+                                                               'type' => '78268'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_copy_root'
                                        },
+                            '78552' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '78268'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'entity',
+                                                               'type' => '78198'
+                                                             }
+                                                    },
+                                         'Return' => '77768',
+                                         'ShortName' => 'pldm_entity_association_tree_find'
+                                       },
                             '7865' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6296,38 +6284,23 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '78853' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '78569'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entity',
-                                                               'type' => '78499'
-                                                             }
-                                                    },
-                                         'Return' => '78069',
-                                         'ShortName' => 'pldm_entity_association_tree_find'
-                                       },
-                            '79598' => {
+                            '79297' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79847'
+                                                               'type' => '79546'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_remote_pdrs'
                                        },
-                            '79852' => {
+                            '79551' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79847'
+                                                               'type' => '79546'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6337,40 +6310,40 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
-                            '80121' => {
+                            '79820' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78569'
+                                                               'type' => '78268'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
                                                                'offset' => '-8',
-                                                               'type' => '77210'
+                                                               'type' => '76909'
                                                              },
                                                       '2' => {
                                                                'name' => 'node',
-                                                               'type' => '78848'
+                                                               'type' => '78547'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_find_entity_ref_in_tree'
                                        },
-                            '80638' => {
+                            '80337' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78069'
+                                                               'type' => '77768'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '79847'
+                                                               'type' => '79546'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '78494'
+                                                               'type' => '78193'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6388,20 +6361,20 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '80854' => {
+                            '80553' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78069'
+                                                               'type' => '77768'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '79847'
+                                                               'type' => '79546'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '78494'
+                                                               'type' => '78193'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6419,16 +6392,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node'
                                        },
-                            '81183' => {
+                            '80882' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78569'
+                                                               'type' => '78268'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '79847'
+                                                               'type' => '79546'
                                                              },
                                                       '2' => {
                                                                'name' => 'is_remote',
@@ -6469,27 +6442,27 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '82638' => {
+                            '82337' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'parent',
-                                                               'type' => '78069'
+                                                               'type' => '77768'
                                                              },
                                                       '1' => {
                                                                'name' => 'node',
-                                                               'type' => '78499'
+                                                               'type' => '78198'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '82727' => {
+                            '82426' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78069'
+                                                               'type' => '77768'
                                                              },
                                                       '1' => {
                                                                'name' => 'association_type',
@@ -6499,17 +6472,39 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '82942' => {
+                            '82641' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78069'
+                                                               'type' => '77768'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
+                            '82796' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '77768'
+                                                             }
+                                                    },
+                                         'Return' => '76909',
+                                         'ShortName' => 'pldm_entity_get_parent'
+                                       },
+                            '82951' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '77768'
+                                                             }
+                                                    },
+                                         'Return' => '6265',
+                                         'ShortName' => 'pldm_entity_is_node_parent'
+                                       },
                             '8304' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6541,49 +6536,27 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '83097' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '78069'
-                                                             }
-                                                    },
-                                         'Return' => '77210',
-                                         'ShortName' => 'pldm_entity_get_parent'
-                                       },
-                            '83252' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '78069'
-                                                             }
-                                                    },
-                                         'Return' => '6265',
-                                         'ShortName' => 'pldm_entity_is_node_parent'
-                                       },
-                            '83407' => {
+                            '83106' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78569'
+                                                               'type' => '78268'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
-                            '83586' => {
+                            '83285' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78569'
+                                                               'type' => '78268'
                                                              },
                                                       '1' => {
                                                                'name' => 'entities',
-                                                               'type' => '78494'
+                                                               'type' => '78193'
                                                              },
                                                       '2' => {
                                                                'name' => 'size',
@@ -6593,16 +6566,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_visit'
                                        },
-                            '84518' => {
+                            '84217' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '78569'
+                                                               'type' => '78268'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '78499'
+                                                               'type' => '78198'
                                                              },
                                                       '2' => {
                                                                'name' => 'entity_instance_number',
@@ -6610,14 +6583,14 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'parent',
-                                                               'type' => '78069'
+                                                               'type' => '77768'
                                                              },
                                                       '4' => {
                                                                'name' => 'association_type',
                                                                'type' => '168'
                                                              }
                                                     },
-                                         'Return' => '78069',
+                                         'Return' => '77768',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
                             '8460' => {
@@ -6647,28 +6620,28 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '84955' => {
+                            '84654' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '78569',
+                                         'Return' => '78268',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
-                            '85189' => {
+                            '84888' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78069'
+                                                               'type' => '77768'
                                                              }
                                                     },
-                                         'Return' => '77210',
+                                         'Return' => '76909',
                                          'ShortName' => 'pldm_entity_extract'
                                        },
-                            '85995' => {
+                            '85694' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79593'
+                                                               'type' => '79292'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6690,12 +6663,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
-                            '86335' => {
+                            '86034' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79593'
+                                                               'type' => '79292'
                                                              },
                                                       '1' => {
                                                                'name' => 'fru_rsi',
@@ -6718,15 +6691,15 @@
                                                                'type' => '8294'
                                                              }
                                                     },
-                                         'Return' => '86320',
+                                         'Return' => '86019',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '86666' => {
+                            '86365' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79847'
+                                                               'type' => '79546'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6756,6 +6729,41 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
+                            '86687' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79546'
+                                                             },
+                                                      '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' => '180'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_add_fru_record_set'
+                                       },
                             '8672' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6787,95 +6795,60 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '86988' => {
-                                         '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' => '180'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_add_fru_record_set'
-                                       },
-                            '87327' => {
+                            '87026' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '86320'
+                                                               'type' => '86019'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '87482' => {
+                            '87181' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79593'
+                                                               'type' => '79292'
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '86320'
+                                                               'type' => '86019'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
-                            '87700' => {
+                            '87399' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79593'
+                                                               'type' => '79292'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '87831' => {
+                            '87530' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79593'
+                                                               'type' => '79292'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '87962' => {
+                            '87661' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79593'
+                                                               'type' => '79292'
                                                              },
                                                       '1' => {
                                                                'name' => 'pdr_type',
@@ -6883,34 +6856,34 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '86320'
+                                                               'type' => '86019'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
-                                                               'type' => '69282'
+                                                               'type' => '68981'
                                                              },
                                                       '4' => {
                                                                'name' => 'size',
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '86320',
+                                         'Return' => '86019',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
-                            '88140' => {
+                            '87839' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79593'
+                                                               'type' => '79292'
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '86320'
+                                                               'type' => '86019'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '69282'
+                                                               'type' => '68981'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -6921,15 +6894,15 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '86320',
+                                         'Return' => '86019',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '88314' => {
+                            '88013' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79593'
+                                                               'type' => '79292'
                                                              },
                                                       '1' => {
                                                                'name' => 'record_handle',
@@ -6937,7 +6910,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '69282'
+                                                               'type' => '68981'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -6948,9 +6921,20 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '86320',
+                                         'Return' => '86019',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
+                            '88181' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79546'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_pdr_destroy'
+                                       },
                             '8832' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6978,28 +6962,17 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '88482' => {
+                            '88336' => {
                                          'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '79847'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_pdr_destroy'
-                                       },
-                            '88637' => {
-                                         'Header' => 'pdr.h',
-                                         'Return' => '79847',
+                                         'Return' => '79546',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '88709' => {
+                            '88408' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79847'
+                                                               'type' => '79546'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7025,12 +6998,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_check'
                                        },
-                            '89143' => {
+                            '88842' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79847'
+                                                               'type' => '79546'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7083,7 +7056,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '90649' => {
+                            '90348' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7094,7 +7067,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '90741' => {
+                            '90440' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7105,7 +7078,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
-                            '91151' => {
+                            '90850' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7124,7 +7097,7 @@
                                          'Return' => '12204',
                                          'ShortName' => 'ver2str'
                                        },
-                            '91279' => {
+                            '90978' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7174,72 +7147,72 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '92550' => {
+                            '92249' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92758'
+                                                               'type' => '92457'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '91875'
+                                                               'type' => '91574'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '91887'
+                                                               'type' => '91586'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '92763' => {
+                            '92462' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92758'
+                                                               'type' => '92457'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '91875'
+                                                               'type' => '91574'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '93164'
+                                                               'type' => '92863'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '93169' => {
+                            '92868' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92758'
+                                                               'type' => '92457'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '93254' => {
+                            '92953' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93340'
+                                                               'type' => '93039'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '93345' => {
+                            '93044' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93340'
+                                                               'type' => '93039'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7249,12 +7222,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init'
                                        },
-                            '94492' => {
+                            '94191' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93830'
+                                                               'type' => '93529'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7269,7 +7242,7 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '93939',
+                                         'Return' => '93638',
                                          'ShortName' => 'pldm_send'
                                        },
                             '9456' => {
@@ -7291,12 +7264,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_date_time_resp'
                                       },
-                            '94908' => {
+                            '94607' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93830'
+                                                               'type' => '93529'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7312,16 +7285,66 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '69282'
+                                                               'type' => '68981'
                                                              },
                                                       '5' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '93939',
+                                         'Return' => '93638',
                                          'ShortName' => 'pldm_send_recv'
                                        },
+                            '95083' => {
+                                         'Header' => 'pldm.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'eid',
+                                                               'type' => '93529'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'mctp_fd',
+                                                               'type' => '74'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'pldm_resp_msg',
+                                                               'type' => '68981'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'resp_msg_len',
+                                                               'type' => '8822'
+                                                             }
+                                                    },
+                                         'Return' => '93638',
+                                         'ShortName' => 'pldm_recv'
+                                       },
+                            '95306' => {
+                                         'Header' => 'pldm.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'eid',
+                                                               'type' => '93529'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'mctp_fd',
+                                                               'type' => '74'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'pldm_resp_msg',
+                                                               'type' => '68981'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'resp_msg_len',
+                                                               'type' => '8822'
+                                                             }
+                                                    },
+                                         'Return' => '93638',
+                                         'ShortName' => 'pldm_recv_any'
+                                       },
                             '9534' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7345,59 +7368,9 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_date_time_resp'
                                       },
-                            '95384' => {
+                            '95748' => {
                                          'Header' => 'pldm.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'eid',
-                                                               'type' => '93830'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'mctp_fd',
-                                                               'type' => '74'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'pldm_resp_msg',
-                                                               'type' => '69282'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'resp_msg_len',
-                                                               'type' => '8822'
-                                                             }
-                                                    },
-                                         'Return' => '93939',
-                                         'ShortName' => 'pldm_recv'
-                                       },
-                            '95607' => {
-                                         'Header' => 'pldm.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'eid',
-                                                               'type' => '93830'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'mctp_fd',
-                                                               'type' => '74'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'pldm_resp_msg',
-                                                               'type' => '69282'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'resp_msg_len',
-                                                               'type' => '8822'
-                                                             }
-                                                    },
-                                         'Return' => '93939',
-                                         'ShortName' => 'pldm_recv_any'
-                                       },
-                            '96049' => {
-                                         'Header' => 'pldm.h',
-                                         'Return' => '93939',
+                                         'Return' => '93638',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9723' => {
@@ -7676,7 +7649,6 @@
                                                  'pldm_bios_table_attr_value_entry_decode_handle' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_enum_check' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_enum_length' => 1,
-                                                 '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_check' => 1,
@@ -9064,7 +9036,7 @@
                                     },
                           '46638' => {
                                        'Header' => undef,
-                                       'Line' => '960',
+                                       'Line' => '947',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'table_data',
@@ -9157,31 +9129,31 @@
                                     'Size' => '1',
                                     'Type' => 'Intrinsic'
                                   },
-                          '54242' => {
+                          '53941' => {
                                        'BaseType' => '45555',
                                        'Name' => 'uint64_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '54519' => {
+                          '54218' => {
                                        'BaseType' => '46214',
                                        'Name' => 'struct pldm_bios_table_attr_entry_integer_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '54786' => {
+                          '54485' => {
                                        'BaseType' => '12199',
                                        'Name' => 'char const**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55836' => {
+                          '55535' => {
                                        'BaseType' => '46106',
                                        'Name' => 'struct pldm_bios_table_attr_entry_string_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '57198' => {
+                          '56897' => {
                                        'BaseType' => '45972',
                                        'Name' => 'struct pldm_bios_table_attr_entry_enum_info const*',
                                        'Size' => '8',
@@ -9212,14 +9184,14 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '62459' => {
+                          '62158' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '329',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'uuid',
                                                             'offset' => '0',
-                                                            'type' => '62563'
+                                                            'type' => '62262'
                                                           },
                                                    '1' => {
                                                             'name' => 'package_header_format_version',
@@ -9256,13 +9228,13 @@
                                        'Size' => '36',
                                        'Type' => 'Struct'
                                      },
-                          '62563' => {
+                          '62262' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[16]',
                                        'Size' => '16',
                                        'Type' => 'Array'
                                      },
-                          '62595' => {
+                          '62294' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '343',
                                        'Memb' => {
@@ -9279,7 +9251,7 @@
                                                    '2' => {
                                                             'name' => 'device_update_option_flags',
                                                             'offset' => '3',
-                                                            'type' => '59962'
+                                                            'type' => '59661'
                                                           },
                                                    '3' => {
                                                             'name' => 'comp_image_set_version_string_type',
@@ -9301,12 +9273,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '6265' => {
-                                      'Name' => '_Bool',
-                                      'Size' => '1',
-                                      'Type' => 'Intrinsic'
-                                    },
-                          '62790' => {
+                          '62489' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '377',
                                        'Memb' => {
@@ -9328,12 +9295,12 @@
                                                    '3' => {
                                                             'name' => 'comp_options',
                                                             'offset' => '8',
-                                                            'type' => '59464'
+                                                            'type' => '59163'
                                                           },
                                                    '4' => {
                                                             'name' => 'requested_comp_activation_method',
                                                             'offset' => '16',
-                                                            'type' => '59464'
+                                                            'type' => '59163'
                                                           },
                                                    '5' => {
                                                             'name' => 'comp_location_offset',
@@ -9360,7 +9327,12 @@
                                        'Size' => '22',
                                        'Type' => 'Struct'
                                      },
-                          '62972' => {
+                          '6265' => {
+                                      'Name' => '_Bool',
+                                      'Size' => '1',
+                                      'Type' => 'Intrinsic'
+                                    },
+                          '62671' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '403',
                                        'Memb' => {
@@ -9372,7 +9344,7 @@
                                                    '1' => {
                                                             'name' => 'capabilities_during_update',
                                                             'offset' => '1',
-                                                            'type' => '59962'
+                                                            'type' => '59661'
                                                           },
                                                    '2' => {
                                                             'name' => 'comp_count',
@@ -9404,7 +9376,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '63076' => {
+                          '62775' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '417',
                                        'Memb' => {
@@ -9421,17 +9393,17 @@
                                                    '10' => {
                                                              'name' => 'pending_comp_release_date',
                                                              'offset' => '37',
-                                                             'type' => '63258'
+                                                             'type' => '62957'
                                                            },
                                                    '11' => {
                                                              'name' => 'comp_activation_methods',
                                                              'offset' => '51',
-                                                             'type' => '59464'
+                                                             'type' => '59163'
                                                            },
                                                    '12' => {
                                                              'name' => 'capabilities_during_update',
                                                              'offset' => '53',
-                                                             'type' => '59962'
+                                                             'type' => '59661'
                                                            },
                                                    '2' => {
                                                             'name' => 'comp_classification_index',
@@ -9456,7 +9428,7 @@
                                                    '6' => {
                                                             'name' => 'active_comp_release_date',
                                                             'offset' => '17',
-                                                            'type' => '63258'
+                                                            'type' => '62957'
                                                           },
                                                    '7' => {
                                                             'name' => 'pending_comp_comparison_stamp',
@@ -9478,19 +9450,19 @@
                                        'Size' => '39',
                                        'Type' => 'Struct'
                                      },
-                          '63258' => {
+                          '62957' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[8]',
                                        'Size' => '8',
                                        'Type' => 'Array'
                                      },
-                          '64118' => {
+                          '63817' => {
                                        'BaseType' => '6048',
                                        'Name' => 'struct variable_field const',
                                        'Size' => '16',
                                        'Type' => 'Const'
                                      },
-                          '64463' => {
+                          '64162' => {
                                        'BaseType' => '11646',
                                        'Name' => 'bool8_t*',
                                        'Size' => '8',
@@ -9507,44 +9479,44 @@
                                     'Size' => '2',
                                     'Type' => 'Intrinsic'
                                   },
-                          '67473' => {
-                                       'BaseType' => '64118',
+                          '67172' => {
+                                       'BaseType' => '63817',
                                        'Name' => 'struct variable_field const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '68754' => {
-                                       'BaseType' => '63076',
+                          '68453' => {
+                                       'BaseType' => '62775',
                                        'Name' => 'struct pldm_component_parameter_entry*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '68984' => {
-                                       'BaseType' => '62972',
+                          '68683' => {
+                                       'BaseType' => '62671',
                                        'Name' => 'struct pldm_get_firmware_parameters_resp*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69282' => {
+                          '68981' => {
                                        'BaseType' => '2034',
                                        'Name' => 'uint8_t**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69576' => {
-                                       'BaseType' => '62790',
+                          '69275' => {
+                                       'BaseType' => '62489',
                                        'Name' => 'struct pldm_component_image_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70199' => {
-                                       'BaseType' => '62595',
+                          '69898' => {
+                                       'BaseType' => '62294',
                                        'Name' => 'struct pldm_firmware_device_id_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70351' => {
-                                       'BaseType' => '62459',
+                          '70050' => {
+                                       'BaseType' => '62158',
                                        'Name' => 'struct pldm_package_header_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9568,8 +9540,8 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '76975' => {
-                                       'BaseType' => '76992',
+                          '76674' => {
+                                       'BaseType' => '76691',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -9577,13 +9549,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '76987' => {
-                                       'BaseType' => '76975',
+                          '76686' => {
+                                       'BaseType' => '76674',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '76992' => {
+                          '76691' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -9600,12 +9572,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '78064'
+                                                            'type' => '77763'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '78064'
+                                                            'type' => '77763'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -9613,8 +9585,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '77052' => {
-                                       'BaseType' => '77069',
+                          '76751' => {
+                                       'BaseType' => '76768',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -9622,13 +9594,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '77064' => {
-                                       'BaseType' => '77052',
+                          '76763' => {
+                                       'BaseType' => '76751',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '77069' => {
+                          '76768' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -9650,7 +9622,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '78052'
+                                                            'type' => '77751'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -9668,7 +9640,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '77153' => {
+                          '76852' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -9692,16 +9664,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '77210' => {
-                                       'BaseType' => '77153',
+                          '76909' => {
+                                       'BaseType' => '76852',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '77254' => {
-                                       'BaseType' => '77266',
+                          '76953' => {
+                                       'BaseType' => '76965',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -9709,14 +9681,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '77266' => {
+                          '76965' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '78069'
+                                                            'type' => '77768'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -9729,8 +9701,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '77309' => {
-                                       'BaseType' => '77326',
+                          '77008' => {
+                                       'BaseType' => '77025',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -9738,19 +9710,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '77326' => {
+                          '77025' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '77210'
+                                                            'type' => '76909'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '77210'
+                                                            'type' => '76909'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -9760,12 +9732,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '78069'
+                                                            'type' => '77768'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '78069'
+                                                            'type' => '77768'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -9778,56 +9750,56 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '78052' => {
-                                       'BaseType' => '77069',
+                          '77751' => {
+                                       'BaseType' => '76768',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78064' => {
-                                       'BaseType' => '77052',
+                          '77763' => {
+                                       'BaseType' => '76751',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78069' => {
-                                       'BaseType' => '77309',
+                          '77768' => {
+                                       'BaseType' => '77008',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78494' => {
-                                       'BaseType' => '78499',
+                          '78193' => {
+                                       'BaseType' => '78198',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78499' => {
-                                       'BaseType' => '77210',
+                          '78198' => {
+                                       'BaseType' => '76909',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78569' => {
-                                       'BaseType' => '77254',
+                          '78268' => {
+                                       'BaseType' => '76953',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78848' => {
-                                       'BaseType' => '78069',
+                          '78547' => {
+                                       'BaseType' => '77768',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79593' => {
-                                       'BaseType' => '76987',
+                          '79292' => {
+                                       'BaseType' => '76686',
                                        'Name' => 'pldm_pdr const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79847' => {
-                                       'BaseType' => '76975',
+                          '79546' => {
+                                       'BaseType' => '76674',
                                        'Name' => 'pldm_pdr*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9868,8 +9840,8 @@
                                      'Size' => '4',
                                      'Type' => 'Struct'
                                    },
-                          '86320' => {
-                                       'BaseType' => '77064',
+                          '86019' => {
+                                       'BaseType' => '76763',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9926,7 +9898,7 @@
                                      'Size' => '8',
                                      'Type' => 'Struct'
                                    },
-                          '91875' => {
+                          '91574' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -9934,7 +9906,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '91887' => {
+                          '91586' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -9942,14 +9914,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92264' => {
+                          '91963' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '91887'
+                                                            'type' => '91586'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -9962,14 +9934,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '92303' => {
+                          '92002' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '92345'
+                                                            'type' => '92044'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -9982,31 +9954,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '92345' => {
-                                       'BaseType' => '92264',
+                          '92044' => {
+                                       'BaseType' => '91963',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '92758' => {
-                                       'BaseType' => '92303',
+                          '92457' => {
+                                       'BaseType' => '92002',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93164' => {
-                                       'BaseType' => '91887',
+                          '92863' => {
+                                       'BaseType' => '91586',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93340' => {
-                                       'BaseType' => '92758',
+                          '93039' => {
+                                       'BaseType' => '92457',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93830' => {
+                          '93529' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10014,7 +9986,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93842' => {
+                          '93541' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10075,8 +10047,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '93939' => {
-                                       'BaseType' => '93842',
+                          '93638' => {
+                                       'BaseType' => '93541',
                                        '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 04d4d3c..4759404 100644
--- a/abi/x86_64/gcc.dump
+++ b/abi/x86_64/gcc.dump
@@ -165,6 +165,75 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_date_time_resp'
                                        },
+                            '109905' => {
+                                          'Header' => 'file_io.h',
+                                          'Param' => {
+                                                       '0' => {
+                                                                'name' => 'instance_id',
+                                                                'type' => '168'
+                                                              },
+                                                       '1' => {
+                                                                'name' => 'completion_code',
+                                                                'type' => '168'
+                                                              },
+                                                       '2' => {
+                                                                'name' => 'msg',
+                                                                'type' => '1632'
+                                                              }
+                                                     },
+                                          'Return' => '74',
+                                          'ShortName' => 'encode_new_file_with_metadata_resp'
+                                        },
+                            '110105' => {
+                                          'Header' => 'file_io.h',
+                                          'Param' => {
+                                                       '0' => {
+                                                                'name' => 'msg',
+                                                                'type' => '2077'
+                                                              },
+                                                       '1' => {
+                                                                'name' => 'payload_length',
+                                                                'type' => '123'
+                                                              },
+                                                       '2' => {
+                                                                'name' => 'file_type',
+                                                                'type' => '8521'
+                                                              },
+                                                       '3' => {
+                                                                'name' => 'file_handle',
+                                                                'type' => '2087'
+                                                              },
+                                                       '4' => {
+                                                                'name' => 'length',
+                                                                'type' => '54978'
+                                                              },
+                                                       '5' => {
+                                                                'name' => 'file_meta_data_1',
+                                                                'type' => '2087'
+                                                              },
+                                                       '6' => {
+                                                                'name' => 'file_meta_data_2',
+                                                                'offset' => '0',
+                                                                'type' => '2087'
+                                                              },
+                                                       '7' => {
+                                                                'name' => 'file_meta_data_3',
+                                                                'offset' => '8',
+                                                                'type' => '2087'
+                                                              },
+                                                       '8' => {
+                                                                'name' => 'file_meta_data_4',
+                                                                'offset' => '16',
+                                                                'type' => '2087'
+                                                              }
+                                                     },
+                                          'Reg' => {
+                                                     '4' => 'r8',
+                                                     '5' => 'r9'
+                                                   },
+                                          'Return' => '74',
+                                          'ShortName' => 'decode_new_file_with_metadata_req'
+                                        },
                             '11016' => {
                                          'Header' => 'bios.h',
                                          'Param' => {
@@ -211,76 +280,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '110213' => {
-                                          'Header' => 'file_io.h',
-                                          'Param' => {
-                                                       '0' => {
-                                                                'name' => 'instance_id',
-                                                                'type' => '168'
-                                                              },
-                                                       '1' => {
-                                                                'name' => 'completion_code',
-                                                                'type' => '168'
-                                                              },
-                                                       '2' => {
-                                                                'name' => 'msg',
-                                                                'type' => '1632'
-                                                              }
-                                                     },
-                                          'Return' => '74',
-                                          'ShortName' => 'encode_new_file_with_metadata_resp'
-                                        },
-                            '110413' => {
-                                          'Header' => 'file_io.h',
-                                          'Param' => {
-                                                       '0' => {
-                                                                'name' => 'msg',
-                                                                'type' => '2077'
-                                                              },
-                                                       '1' => {
-                                                                'name' => 'payload_length',
-                                                                'type' => '123'
-                                                              },
-                                                       '2' => {
-                                                                'name' => 'file_type',
-                                                                'type' => '8521'
-                                                              },
-                                                       '3' => {
-                                                                'name' => 'file_handle',
-                                                                'type' => '2087'
-                                                              },
-                                                       '4' => {
-                                                                'name' => 'length',
-                                                                'type' => '55286'
-                                                              },
-                                                       '5' => {
-                                                                'name' => 'file_meta_data_1',
-                                                                'type' => '2087'
-                                                              },
-                                                       '6' => {
-                                                                'name' => 'file_meta_data_2',
-                                                                'offset' => '0',
-                                                                'type' => '2087'
-                                                              },
-                                                       '7' => {
-                                                                'name' => 'file_meta_data_3',
-                                                                'offset' => '8',
-                                                                'type' => '2087'
-                                                              },
-                                                       '8' => {
-                                                                'name' => 'file_meta_data_4',
-                                                                'offset' => '16',
-                                                                'type' => '2087'
-                                                              }
-                                                     },
-                                          'Reg' => {
-                                                     '4' => 'r8',
-                                                     '5' => 'r9'
-                                                   },
-                                          'Return' => '74',
-                                          'ShortName' => 'decode_new_file_with_metadata_req'
-                                        },
-                            '110645' => {
+                            '110337' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -304,7 +304,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '110746' => {
+                            '110438' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -350,7 +350,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '111043' => {
+                            '110735' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -369,7 +369,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '111238' => {
+                            '110930' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -419,7 +419,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '111450' => {
+                            '111142' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -443,7 +443,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '111546' => {
+                            '111238' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -489,7 +489,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '111843' => {
+                            '111535' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -513,7 +513,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '111944' => {
+                            '111636' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -540,7 +540,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '112179' => {
+                            '111871' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -559,7 +559,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '112369' => {
+                            '112061' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -590,7 +590,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '112511' => {
+                            '112203' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -619,7 +619,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '112626' => {
+                            '112318' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -655,7 +655,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '112896' => {
+                            '112588' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -682,22 +682,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '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' => {
+                            '112818' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -732,7 +717,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '113288' => {
+                            '112980' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -756,7 +741,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '113389' => {
+                            '11299' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '113081' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -783,7 +783,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '113624' => {
+                            '113316' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -802,7 +802,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '113814' => {
+                            '113506' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -823,7 +823,7 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '55286'
+                                                                'type' => '54978'
                                                               }
                                                      },
                                           'Reg' => {
@@ -833,7 +833,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '113956' => {
+                            '113648' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -862,7 +862,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '114071' => {
+                            '113763' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -903,7 +903,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '114356' => {
+                            '114048' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -930,7 +930,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '114586' => {
+                            '114278' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -960,7 +960,7 @@
                                                        '6' => {
                                                                 'name' => 'address',
                                                                 'offset' => '0',
-                                                                'type' => '55286'
+                                                                'type' => '54978'
                                                               }
                                                      },
                                           'Reg' => {
@@ -970,7 +970,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '114763' => {
+                            '114455' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -993,7 +993,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '114978' => {
+                            '114670' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1022,7 +1022,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '115088' => {
+                            '114780' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1049,7 +1049,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '115323' => {
+                            '115015' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1086,7 +1086,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '115478' => {
+                            '115170' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1109,7 +1109,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '115693' => {
+                            '115385' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1141,7 +1141,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '115829' => {
+                            '115521' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1168,7 +1168,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '116064' => {
+                            '115756' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1199,7 +1199,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '116199' => {
+                            '115891' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1239,7 +1239,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '116372' => {
+                            '116064' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1266,7 +1266,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '116598' => {
+                            '116290' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1302,7 +1302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '116895' => {
+                            '116587' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1333,7 +1333,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '117030' => {
+                            '116722' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1362,7 +1362,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '117139' => {
+                            '116831' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1398,7 +1398,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '117398' => {
+                            '117090' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1425,7 +1425,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '117619' => {
+                            '117311' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1450,7 +1450,7 @@
                                                               },
                                                        '5' => {
                                                                 'name' => 'address',
-                                                                'type' => '55286'
+                                                                'type' => '54978'
                                                               }
                                                      },
                                           'Reg' => {
@@ -1460,7 +1460,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '118586' => {
+                            '118278' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1491,7 +1491,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '118834' => {
+                            '118526' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1515,7 +1515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '118917' => {
+                            '118609' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1546,7 +1546,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '119056' => {
+                            '118748' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1569,7 +1569,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '120125' => {
+                            '119817' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -4153,37 +4153,10 @@
                                        },
                             '52963' => {
                                          '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' => 'cv',
-                                                               'type' => '46642'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_bios_table_attr_value_entry_encode_integer'
-                                       },
-                            '53271' => {
-                                         'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_integer_length'
                                        },
-                            '53433' => {
+                            '53125' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4214,7 +4187,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_string_check'
                                        },
-                            '53693' => {
+                            '53385' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4229,7 +4202,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_string_decode_string'
                                        },
-                            '53788' => {
+                            '53480' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4243,7 +4216,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_string_decode_length'
                                        },
-                            '53857' => {
+                            '53549' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4257,7 +4230,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_string_length'
                                        },
-                            '54039' => {
+                            '53731' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4288,7 +4261,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_check'
                                        },
-                            '54297' => {
+                            '53989' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4307,7 +4280,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_enum_decode_handles'
                                        },
-                            '54471' => {
+                            '54163' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4321,7 +4294,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_enum_decode_number'
                                        },
-                            '54520' => {
+                            '54212' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4335,7 +4308,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_length'
                                        },
-                            '54569' => {
+                            '54261' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4349,7 +4322,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_type'
                                        },
-                            '54618' => {
+                            '54310' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4363,7 +4336,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_handle'
                                        },
-                            '55165' => {
+                            '54857' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4372,11 +4345,11 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'lower',
-                                                               'type' => '55286'
+                                                               'type' => '54978'
                                                              },
                                                       '2' => {
                                                                'name' => 'upper',
-                                                               'type' => '55286'
+                                                               'type' => '54978'
                                                              },
                                                       '3' => {
                                                                'name' => 'scalar',
@@ -4384,7 +4357,7 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'def',
-                                                               'type' => '55286'
+                                                               'type' => '54978'
                                                              }
                                                     },
                                          'Reg' => {
@@ -4397,7 +4370,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_decode'
                                        },
-                            '55301' => {
+                            '54993' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4410,33 +4383,33 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '55563'
+                                                               'type' => '55255'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_check'
                                        },
-                            '55573' => {
+                            '55265' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '55563'
+                                                               'type' => '55255'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '55872'
+                                                               'type' => '55564'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_info_check'
                                        },
-                            '55877' => {
+                            '55569' => {
                                          'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_length'
                                        },
-                            '56039' => {
+                            '55731' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4455,7 +4428,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string'
                                        },
-                            '56235' => {
+                            '55927' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4469,7 +4442,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_min_length'
                                        },
-                            '56304' => {
+                            '55996' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4483,7 +4456,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_max_length'
                                        },
-                            '56373' => {
+                            '56065' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4497,7 +4470,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_string_type'
                                        },
-                            '56442' => {
+                            '56134' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4512,7 +4485,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string_length_check'
                                        },
-                            '56612' => {
+                            '56304' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4525,28 +4498,28 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '56898'
+                                                               'type' => '56590'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_check'
                                        },
-                            '56903' => {
+                            '56595' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '56898'
+                                                               'type' => '56590'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '55872'
+                                                               'type' => '55564'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_info_check'
                                        },
-                            '57172' => {
+                            '56864' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4560,7 +4533,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_length'
                                        },
-                            '57404' => {
+                            '57096' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4579,7 +4552,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_indices'
                                        },
-                            '57610' => {
+                            '57302' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4601,7 +4574,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_hdls_check'
                                        },
-                            '57775' => {
+                            '57467' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4616,7 +4589,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_num_check'
                                        },
-                            '57934' => {
+                            '57626' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4635,7 +4608,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_num_check'
                                        },
-                            '57994' => {
+                            '57686' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4648,13 +4621,13 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '58252'
+                                                               'type' => '57944'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_check'
                                        },
-                            '58257' => {
+                            '57949' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4673,7 +4646,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_length'
                                        },
-                            '58317' => {
+                            '58009' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4687,7 +4660,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_string_handle'
                                        },
-                            '58364' => {
+                            '58056' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4701,7 +4674,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_type'
                                        },
-                            '58411' => {
+                            '58103' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4715,7 +4688,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_handle'
                                        },
-                            '59044' => {
+                            '58736' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4734,7 +4707,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_check'
                                        },
-                            '59210' => {
+                            '58902' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4748,7 +4721,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_length'
                                        },
-                            '59257' => {
+                            '58949' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4762,7 +4735,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_handle'
                                        },
-                            '59304' => {
+                            '58996' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4785,7 +4758,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_encode_check'
                                        },
-                            '59595' => {
+                            '59287' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4915,7 +4888,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_req'
                                       },
-                            '65188' => {
+                            '64880' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -4926,7 +4899,7 @@
                                          'Return' => '6423',
                                          'ShortName' => 'is_transfer_flag_valid'
                                        },
-                            '65339' => {
+                            '65031' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4943,17 +4916,17 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'non_functioning_component_indication',
-                                                               'type' => '65526'
+                                                               'type' => '65218'
                                                              },
                                                       '4' => {
                                                                'name' => 'non_functioning_component_bitmap',
-                                                               'type' => '65531'
+                                                               'type' => '65223'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_resp'
                                        },
-                            '65541' => {
+                            '65233' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4972,7 +4945,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_req'
                                        },
-                            '65711' => {
+                            '65403' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4996,7 +4969,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_component_resp'
                                        },
-                            '65787' => {
+                            '65479' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5015,7 +4988,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_component_req'
                                        },
-                            '65957' => {
+                            '65649' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5060,13 +5033,13 @@
                                                       '9' => {
                                                                'name' => 'update_option_flags_enabled',
                                                                'offset' => '24',
-                                                               'type' => '66284'
+                                                               'type' => '65976'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_status_resp'
                                        },
-                            '66294' => {
+                            '65986' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5085,7 +5058,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_status_req'
                                        },
-                            '66464' => {
+                            '66156' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5113,6 +5086,52 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_activate_firmware_resp'
                                        },
+                            '66282' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'self_contained_activation_req',
+                                                               'type' => '11999'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_activate_firmware_req'
+                                       },
+                            '66524' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '168'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_apply_complete_resp'
+                                       },
                             '6655' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5136,53 +5155,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_resp'
                                       },
-                            '66590' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'self_contained_activation_req',
-                                                               'type' => '11999'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_activate_firmware_req'
-                                       },
-                            '66832' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '168'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_apply_complete_resp'
-                                       },
-                            '67021' => {
+                            '66713' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5199,7 +5172,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_activation_methods_modification',
-                                                               'type' => '67131'
+                                                               'type' => '66823'
                                                              }
                                                     },
                                          'Reg' => {
@@ -5211,7 +5184,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_apply_complete_req'
                                        },
-                            '67141' => {
+                            '66833' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5234,7 +5207,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_verify_complete_resp'
                                        },
-                            '67330' => {
+                            '67022' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5258,7 +5231,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_verify_complete_req'
                                        },
-                            '67406' => {
+                            '67098' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5281,7 +5254,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_transfer_complete_resp'
                                        },
-                            '67595' => {
+                            '67287' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5305,7 +5278,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_transfer_complete_req'
                                        },
-                            '67671' => {
+                            '67363' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5328,7 +5301,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_firmware_data_resp'
                                        },
-                            '67860' => {
+                            '67552' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5357,7 +5330,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_firmware_data_req'
                                        },
-                            '67980' => {
+                            '67672' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5382,7 +5355,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '66284'
+                                                               'type' => '65976'
                                                              },
                                                       '6' => {
                                                                'name' => 'time_before_req_fw_data',
@@ -5393,7 +5366,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_update_component_resp'
                                        },
-                            '68214' => {
+                            '67906' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5433,7 +5406,7 @@
                                                       '6' => {
                                                                'name' => 'update_option_flags',
                                                                'offset' => '0',
-                                                               'type' => '61022'
+                                                               'type' => '60714'
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_ver_str_type',
@@ -5448,13 +5421,13 @@
                                                       '9' => {
                                                                'name' => 'comp_ver_str',
                                                                'offset' => '24',
-                                                               'type' => '68606'
+                                                               'type' => '68298'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'encode_update_component_req'
                                        },
-                            '68616' => {
+                            '68308' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5481,36 +5454,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pass_component_table_resp'
                                        },
-                            '6874' => {
-                                        '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_table_resp'
-                                      },
-                            '68815' => {
+                            '68507' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5555,7 +5499,7 @@
                                                       '8' => {
                                                                'name' => 'comp_ver_str',
                                                                'offset' => '16',
-                                                               'type' => '68606'
+                                                               'type' => '68298'
                                                              },
                                                       '9' => {
                                                                'name' => 'msg',
@@ -5566,7 +5510,36 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_pass_component_table_req'
                                        },
-                            '69225' => {
+                            '6874' => {
+                                        '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_table_resp'
+                                      },
+                            '68917' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5597,7 +5570,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_update_resp'
                                        },
-                            '69372' => {
+                            '69064' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5632,7 +5605,7 @@
                                                       '7' => {
                                                                'name' => 'comp_img_set_ver_str',
                                                                'offset' => '8',
-                                                               'type' => '68606'
+                                                               'type' => '68298'
                                                              },
                                                       '8' => {
                                                                'name' => 'msg',
@@ -5648,7 +5621,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_update_req'
                                        },
-                            '69740' => {
+                            '69432' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5661,7 +5634,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'component_data',
-                                                               'type' => '69908'
+                                                               'type' => '69600'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_ver_str',
@@ -5678,6 +5651,56 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp_comp_entry'
                                        },
+                            '69610' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2077'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'resp_data',
+                                                               'type' => '69830'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'active_comp_image_set_ver_str',
+                                                               'type' => '6645'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'pending_comp_image_set_ver_str',
+                                                               'type' => '6645'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'comp_parameter_table',
+                                                               'type' => '6645'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_get_firmware_parameters_resp'
+                                       },
+                            '69835' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_firmware_parameters_req'
+                                       },
                             '6984' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5719,57 +5742,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_req'
                                       },
-                            '69918' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2077'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'resp_data',
-                                                               'type' => '70138'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'active_comp_image_set_ver_str',
-                                                               'type' => '6645'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'pending_comp_image_set_ver_str',
-                                                               'type' => '6645'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'comp_parameter_table',
-                                                               'type' => '6645'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_get_firmware_parameters_resp'
-                                       },
-                            '70143' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_firmware_parameters_req'
-                                       },
-                            '70283' => {
+                            '69975' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5794,7 +5767,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'descriptor_data',
-                                                               'type' => '70439'
+                                                               'type' => '70131'
                                                              }
                                                     },
                                          'Reg' => {
@@ -5805,7 +5778,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_query_device_identifiers_resp'
                                        },
-                            '70449' => {
+                            '70141' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5824,7 +5797,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_query_device_identifiers_req'
                                        },
-                            '70589' => {
+                            '70281' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5837,7 +5810,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_comp_image_info',
-                                                               'type' => '70736'
+                                                               'type' => '70428'
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_version_str',
@@ -5847,7 +5820,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pldm_comp_image_info'
                                        },
-                            '70741' => {
+                            '70433' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5874,7 +5847,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_vendor_defined_descriptor_value'
                                        },
-                            '70923' => {
+                            '70615' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5897,7 +5870,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_descriptor_type_length_value'
                                        },
-                            '71095' => {
+                            '70787' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5914,7 +5887,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'fw_device_id_record',
-                                                               'type' => '71352'
+                                                               'type' => '71044'
                                                              },
                                                       '4' => {
                                                                'name' => 'applicable_components',
@@ -5938,7 +5911,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_firmware_device_id_record'
                                        },
-                            '71357' => {
+                            '71049' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5951,7 +5924,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'package_header_info',
-                                                               'type' => '71504'
+                                                               'type' => '71196'
                                                              },
                                                       '3' => {
                                                                'name' => 'package_version_str',
@@ -5984,7 +5957,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_resp'
                                       },
-                            '73662' => {
+                            '73354' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6011,7 +5984,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_set_fru_record_table_resp'
                                        },
-                            '73902' => {
+                            '73594' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6042,7 +6015,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_set_fru_record_table_req'
                                        },
-                            '74069' => {
+                            '73761' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6078,7 +6051,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '74299' => {
+                            '73991' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6119,7 +6092,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '74547' => {
+                            '74239' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6146,7 +6119,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '74782' => {
+                            '74474' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6181,7 +6154,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_resp'
                                        },
-                            '74949' => {
+                            '74641' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6222,38 +6195,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_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'
-                                      },
-                            '75267' => {
+                            '74959' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6298,7 +6240,38 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '75469' => {
+                            '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'
+                                      },
+                            '75161' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6344,7 +6317,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_req'
                                        },
-                            '75766' => {
+                            '75458' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6380,7 +6353,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'get_fru_record_by_option_check'
                                        },
-                            '76189' => {
+                            '75881' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6416,7 +6389,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'get_fru_record_by_option'
                                        },
-                            '76615' => {
+                            '76307' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6462,6 +6435,33 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
+                            '76555' => {
+                                         'Header' => 'fru.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '168'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'next_data_transfer_handle',
+                                                               'type' => '180'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'transfer_flag',
+                                                               'type' => '168'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_fru_record_table_resp'
+                                       },
                             '7662' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6491,34 +6491,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_attribute_current_value_resp'
                                       },
-                            '76863' => {
-                                         'Header' => 'fru.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '168'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'next_data_transfer_handle',
-                                                               'type' => '180'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'transfer_flag',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_fru_record_table_resp'
-                                       },
-                            '77084' => {
+                            '76776' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6547,7 +6520,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '77188' => {
+                            '76880' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6598,7 +6571,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '77491' => {
+                            '77183' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6653,7 +6626,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '77701' => {
+                            '77393' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6708,7 +6681,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_req'
                                       },
-                            '79344' => {
+                            '79036' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6725,18 +6698,18 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'entities',
-                                                               'type' => '79657'
+                                                               'type' => '79349'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_extract'
                                        },
-                            '79677' => {
+                            '79369' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              }
                                                     },
                                          'Reg' => {
@@ -6745,47 +6718,58 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_empty_entity_assoc_tree'
                                        },
-                            '79731' => {
+                            '79423' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy_root'
                                        },
-                            '79794' => {
+                            '79486' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'org_tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              },
                                                       '1' => {
                                                                'name' => 'new_tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_copy_root'
                                        },
-                            '80010' => {
+                            '79702' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79662'
+                                                               'type' => '79354'
                                                              }
                                                     },
-                                         'Return' => '79232',
+                                         'Return' => '78924',
                                          'ShortName' => 'pldm_entity_association_tree_find'
                                        },
+                            '80484' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80733'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_pdr_remove_remote_pdrs'
+                                       },
                             '8072' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6822,23 +6806,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '80792' => {
+                            '80738' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81041'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_pdr_remove_remote_pdrs'
-                                       },
-                            '81046' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '81041'
+                                                               'type' => '80733'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6848,39 +6821,39 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
-                            '81315' => {
+                            '81007' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '78373'
+                                                               'type' => '78065'
                                                              },
                                                       '2' => {
                                                                'name' => 'node',
-                                                               'type' => '80005'
+                                                               'type' => '79697'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_find_entity_ref_in_tree'
                                        },
-                            '81827' => {
+                            '81519' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79232'
+                                                               'type' => '78924'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81041'
+                                                               'type' => '80733'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '79657'
+                                                               'type' => '79349'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6898,20 +6871,20 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '82045' => {
+                            '81737' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79232'
+                                                               'type' => '78924'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81041'
+                                                               'type' => '80733'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '79657'
+                                                               'type' => '79349'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6929,16 +6902,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node'
                                        },
-                            '82381' => {
+                            '82073' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81041'
+                                                               'type' => '80733'
                                                              },
                                                       '2' => {
                                                                'name' => 'is_remote',
@@ -6952,6 +6925,39 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add'
                                        },
+                            '83545' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'parent',
+                                                               'type' => '78924'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'node',
+                                                               'type' => '79354'
+                                                             }
+                                                    },
+                                         'Reg' => {
+                                                    '1' => 'rsi'
+                                                  },
+                                         'Return' => '6423',
+                                         'ShortName' => 'pldm_is_current_parent_child'
+                                       },
+                            '83634' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '78924'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'association_type',
+                                                               'type' => '168'
+                                                             }
+                                                    },
+                                         'Return' => '168',
+                                         'ShortName' => 'pldm_entity_get_num_children'
+                                       },
                             '8379' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6983,93 +6989,60 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '83853' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'parent',
-                                                               'type' => '79232'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'node',
-                                                               'type' => '79662'
-                                                             }
-                                                    },
-                                         'Reg' => {
-                                                    '1' => 'rsi'
-                                                  },
-                                         'Return' => '6423',
-                                         'ShortName' => 'pldm_is_current_parent_child'
-                                       },
-                            '83942' => {
+                            '83849' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79232'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'association_type',
-                                                               'type' => '168'
-                                                             }
-                                                    },
-                                         'Return' => '168',
-                                         'ShortName' => 'pldm_entity_get_num_children'
-                                       },
-                            '84157' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '79232'
+                                                               'type' => '78924'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '84312' => {
+                            '84004' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79232'
+                                                               'type' => '78924'
                                                              }
                                                     },
-                                         'Return' => '78373',
+                                         'Return' => '78065',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '84467' => {
+                            '84159' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79232'
+                                                               'type' => '78924'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '84622' => {
+                            '84314' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
-                            '84801' => {
+                            '84493' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              },
                                                       '1' => {
                                                                'name' => 'entities',
-                                                               'type' => '79657'
+                                                               'type' => '79349'
                                                              },
                                                       '2' => {
                                                                'name' => 'size',
@@ -7114,16 +7087,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '85763' => {
+                            '85455' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79726'
+                                                               'type' => '79418'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79662'
+                                                               'type' => '79354'
                                                              },
                                                       '2' => {
                                                                'name' => 'entity_instance_number',
@@ -7131,32 +7104,59 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'parent',
-                                                               'type' => '79232'
+                                                               'type' => '78924'
                                                              },
                                                       '4' => {
                                                                'name' => 'association_type',
                                                                'type' => '168'
                                                              }
                                                     },
-                                         'Return' => '79232',
+                                         'Return' => '78924',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
-                            '86196' => {
+                            '85888' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '79726',
+                                         'Return' => '79418',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
-                            '86430' => {
+                            '86122' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79232'
+                                                               'type' => '78924'
                                                              }
                                                     },
-                                         'Return' => '78373',
+                                         'Return' => '78065',
                                          'ShortName' => 'pldm_entity_extract'
                                        },
+                            '86917' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80479'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '5053'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'tid',
+                                                               'type' => '168'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'tl_eid',
+                                                               'type' => '168'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'valid_bit',
+                                                               'type' => '6423'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_pdr_update_TL_pdr'
+                                       },
                             '8693' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7184,39 +7184,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '87225' => {
+                            '87277' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80787'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '5053'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'tid',
-                                                               'type' => '168'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'tl_eid',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'valid_bit',
-                                                               'type' => '6423'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_pdr_update_TL_pdr'
-                                       },
-                            '87585' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80787'
+                                                               'type' => '80479'
                                                              },
                                                       '1' => {
                                                                'name' => 'fru_rsi',
@@ -7239,15 +7212,15 @@
                                                                'type' => '8521'
                                                              }
                                                     },
-                                         'Return' => '87570',
+                                         'Return' => '87262',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '87939' => {
+                            '87631' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81041'
+                                                               'type' => '80733'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7278,12 +7251,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '88277' => {
+                            '87969' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81041'
+                                                               'type' => '80733'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7313,54 +7286,113 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set'
                                        },
-                            '88630' => {
+                            '88322' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '87570'
+                                                               'type' => '87262'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '88785' => {
+                            '88477' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80787'
+                                                               'type' => '80479'
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '87570'
+                                                               'type' => '87262'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
-                            '89003' => {
+                            '88695' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80787'
+                                                               'type' => '80479'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '89134' => {
+                            '88826' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80787'
+                                                               'type' => '80479'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
+                            '88957' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80479'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'pdr_type',
+                                                               'type' => '168'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'curr_record',
+                                                               'type' => '87262'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'data',
+                                                               'type' => '70131'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'size',
+                                                               'type' => '2087'
+                                                             }
+                                                    },
+                                         'Reg' => {
+                                                    '0' => 'rdi',
+                                                    '3' => 'rcx',
+                                                    '4' => 'r8'
+                                                  },
+                                         'Return' => '87262',
+                                         'ShortName' => 'pldm_pdr_find_record_by_type'
+                                       },
+                            '89129' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80479'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'curr_record',
+                                                               'type' => '87262'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'data',
+                                                               'type' => '70131'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'size',
+                                                               'type' => '2087'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'next_record_handle',
+                                                               'type' => '2087'
+                                                             }
+                                                    },
+                                         'Return' => '87262',
+                                         'ShortName' => 'pldm_pdr_get_next_record'
+                                       },
                             '8922' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7396,71 +7428,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '89265' => {
+                            '89296' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80787'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'pdr_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'curr_record',
-                                                               'type' => '87570'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'data',
-                                                               'type' => '70439'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'size',
-                                                               'type' => '2087'
-                                                             }
-                                                    },
-                                         'Reg' => {
-                                                    '0' => 'rdi',
-                                                    '3' => 'rcx',
-                                                    '4' => 'r8'
-                                                  },
-                                         'Return' => '87570',
-                                         'ShortName' => 'pldm_pdr_find_record_by_type'
-                                       },
-                            '89437' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80787'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'curr_record',
-                                                               'type' => '87570'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'data',
-                                                               'type' => '70439'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'size',
-                                                               'type' => '2087'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'next_record_handle',
-                                                               'type' => '2087'
-                                                             }
-                                                    },
-                                         'Return' => '87570',
-                                         'ShortName' => 'pldm_pdr_get_next_record'
-                                       },
-                            '89604' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80787'
+                                                               'type' => '80479'
                                                              },
                                                       '1' => {
                                                                'name' => 'record_handle',
@@ -7468,7 +7441,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '70439'
+                                                               'type' => '70131'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7479,31 +7452,31 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '87570',
+                                         'Return' => '87262',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '89772' => {
+                            '89464' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81041'
+                                                               'type' => '80733'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '89927' => {
+                            '89619' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '81041',
+                                         'Return' => '80733',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '89999' => {
+                            '89691' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81041'
+                                                               'type' => '80733'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7529,12 +7502,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_check'
                                        },
-                            '90437' => {
+                            '90129' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81041'
+                                                               'type' => '80733'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7591,7 +7564,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '91936' => {
+                            '91628' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7602,7 +7575,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '92065' => {
+                            '91757' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7613,6 +7586,43 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
+                            '92158' => {
+                                         'Header' => 'utils.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'version',
+                                                               'type' => '3344'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'buffer',
+                                                               'type' => '11614'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'buffer_size',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Reg' => {
+                                                    '0' => 'rdi'
+                                                  },
+                                         'Return' => '12557',
+                                         'ShortName' => 'ver2str'
+                                       },
+                            '92286' => {
+                                         'Header' => 'utils.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'data',
+                                                               'type' => '1434'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'size',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '168',
+                                         'ShortName' => 'crc8'
+                                       },
                             '9241' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7640,103 +7650,81 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '92466' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'version',
-                                                               'type' => '3344'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'buffer',
-                                                               'type' => '11614'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'buffer_size',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Reg' => {
-                                                    '0' => 'rdi'
-                                                  },
-                                         'Return' => '12557',
-                                         'ShortName' => 'ver2str'
-                                       },
-                            '92594' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'data',
-                                                               'type' => '1434'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'size',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '168',
-                                         'ShortName' => 'crc8'
-                                       },
-                            '93852' => {
+                            '93544' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94075'
+                                                               'type' => '93767'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '93174'
+                                                               'type' => '92866'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '93186'
+                                                               'type' => '92878'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '94080' => {
+                            '93772' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94075'
+                                                               'type' => '93767'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '93174'
+                                                               'type' => '92866'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '94501'
+                                                               'type' => '94193'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '94506' => {
+                            '94198' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94075'
+                                                               'type' => '93767'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '94591' => {
+                            '94283' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94677'
+                                                               'type' => '94369'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
+                            '94374' => {
+                                         'Header' => 'instance-id.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'ctx',
+                                                               'type' => '94369'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'dbpath',
+                                                               'type' => '12552'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_instance_db_init'
+                                       },
                             '9464' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7773,27 +7761,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '94682' => {
-                                         'Header' => 'instance-id.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'ctx',
-                                                               'type' => '94677'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'dbpath',
-                                                               'type' => '12552'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_instance_db_init'
-                                       },
-                            '95855' => {
+                            '95547' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95193'
+                                                               'type' => '94885'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7808,15 +7781,15 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '95302',
+                                         'Return' => '94994',
                                          'ShortName' => 'pldm_send'
                                        },
-                            '96274' => {
+                            '95966' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95193'
+                                                               'type' => '94885'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7832,22 +7805,22 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '70439'
+                                                               'type' => '70131'
                                                              },
                                                       '5' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '95302',
+                                         'Return' => '94994',
                                          'ShortName' => 'pldm_send_recv'
                                        },
-                            '96757' => {
+                            '96449' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95193'
+                                                               'type' => '94885'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7859,22 +7832,22 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '70439'
+                                                               'type' => '70131'
                                                              },
                                                       '4' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '95302',
+                                         'Return' => '94994',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '96983' => {
+                            '96675' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95193'
+                                                               'type' => '94885'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7882,19 +7855,19 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '70439'
+                                                               'type' => '70131'
                                                              },
                                                       '3' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '95302',
+                                         'Return' => '94994',
                                          'ShortName' => 'pldm_recv_any'
                                        },
-                            '97428' => {
+                            '97120' => {
                                          'Header' => 'pldm.h',
-                                         'Return' => '95302',
+                                         'Return' => '94994',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9755' => {
@@ -8181,7 +8154,6 @@
                                                  'pldm_bios_table_attr_value_entry_decode_handle' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_enum_check' => 1,
                                                  'pldm_bios_table_attr_value_entry_encode_enum_length' => 1,
-                                                 '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_check' => 1,
@@ -9557,7 +9529,7 @@
                                      },
                           '47725' => {
                                        'Header' => undef,
-                                       'Line' => '960',
+                                       'Line' => '947',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'table_data',
@@ -9662,31 +9634,31 @@
                                     'Size' => '1',
                                     'Type' => 'Intrinsic'
                                   },
-                          '55286' => {
+                          '54978' => {
                                        'BaseType' => '46642',
                                        'Name' => 'uint64_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55563' => {
+                          '55255' => {
                                        'BaseType' => '47301',
                                        'Name' => 'struct pldm_bios_table_attr_entry_integer_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55872' => {
+                          '55564' => {
                                        'BaseType' => '12552',
                                        'Name' => 'char const**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '56898' => {
+                          '56590' => {
                                        'BaseType' => '47193',
                                        'Name' => 'struct pldm_bios_table_attr_entry_string_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '58252' => {
+                          '57944' => {
                                        'BaseType' => '47059',
                                        'Name' => 'struct pldm_bios_table_attr_entry_enum_info const*',
                                        'Size' => '8',
@@ -9717,14 +9689,14 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '63519' => {
+                          '63211' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '329',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'uuid',
                                                             'offset' => '0',
-                                                            'type' => '63623'
+                                                            'type' => '63315'
                                                           },
                                                    '1' => {
                                                             'name' => 'package_header_format_version',
@@ -9761,13 +9733,13 @@
                                        'Size' => '36',
                                        'Type' => 'Struct'
                                      },
-                          '63623' => {
+                          '63315' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[16]',
                                        'Size' => '16',
                                        'Type' => 'Array'
                                      },
-                          '63655' => {
+                          '63347' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '343',
                                        'Memb' => {
@@ -9784,7 +9756,7 @@
                                                    '2' => {
                                                             'name' => 'device_update_option_flags',
                                                             'offset' => '3',
-                                                            'type' => '61022'
+                                                            'type' => '60714'
                                                           },
                                                    '3' => {
                                                             'name' => 'comp_image_set_version_string_type',
@@ -9806,7 +9778,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '63850' => {
+                          '63542' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '377',
                                        'Memb' => {
@@ -9828,12 +9800,12 @@
                                                    '3' => {
                                                             'name' => 'comp_options',
                                                             'offset' => '8',
-                                                            'type' => '60524'
+                                                            'type' => '60216'
                                                           },
                                                    '4' => {
                                                             'name' => 'requested_comp_activation_method',
                                                             'offset' => '16',
-                                                            'type' => '60524'
+                                                            'type' => '60216'
                                                           },
                                                    '5' => {
                                                             'name' => 'comp_location_offset',
@@ -9860,7 +9832,7 @@
                                        'Size' => '22',
                                        'Type' => 'Struct'
                                      },
-                          '64032' => {
+                          '63724' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '403',
                                        'Memb' => {
@@ -9872,7 +9844,7 @@
                                                    '1' => {
                                                             'name' => 'capabilities_during_update',
                                                             'offset' => '1',
-                                                            'type' => '61022'
+                                                            'type' => '60714'
                                                           },
                                                    '2' => {
                                                             'name' => 'comp_count',
@@ -9904,7 +9876,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '64136' => {
+                          '63828' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '417',
                                        'Memb' => {
@@ -9921,17 +9893,17 @@
                                                    '10' => {
                                                              'name' => 'pending_comp_release_date',
                                                              'offset' => '37',
-                                                             'type' => '64318'
+                                                             'type' => '64010'
                                                            },
                                                    '11' => {
                                                              'name' => 'comp_activation_methods',
                                                              'offset' => '51',
-                                                             'type' => '60524'
+                                                             'type' => '60216'
                                                            },
                                                    '12' => {
                                                              'name' => 'capabilities_during_update',
                                                              'offset' => '53',
-                                                             'type' => '61022'
+                                                             'type' => '60714'
                                                            },
                                                    '2' => {
                                                             'name' => 'comp_classification_index',
@@ -9956,7 +9928,7 @@
                                                    '6' => {
                                                             'name' => 'active_comp_release_date',
                                                             'offset' => '17',
-                                                            'type' => '64318'
+                                                            'type' => '64010'
                                                           },
                                                    '7' => {
                                                             'name' => 'pending_comp_comparison_stamp',
@@ -9978,24 +9950,24 @@
                                        'Size' => '39',
                                        'Type' => 'Struct'
                                      },
-                          '6423' => {
-                                      'Name' => '_Bool',
-                                      'Size' => '1',
-                                      'Type' => 'Intrinsic'
-                                    },
-                          '64318' => {
+                          '64010' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[8]',
                                        'Size' => '8',
                                        'Type' => 'Array'
                                      },
-                          '65178' => {
+                          '6423' => {
+                                      'Name' => '_Bool',
+                                      'Size' => '1',
+                                      'Type' => 'Intrinsic'
+                                    },
+                          '64870' => {
                                        'BaseType' => '6206',
                                        'Name' => 'struct variable_field const',
                                        'Size' => '16',
                                        'Type' => 'Const'
                                      },
-                          '65526' => {
+                          '65218' => {
                                        'BaseType' => '11999',
                                        'Name' => 'bool8_t*',
                                        'Size' => '8',
@@ -10012,42 +9984,48 @@
                                     'Size' => '2',
                                     'Type' => 'Intrinsic'
                                   },
-                          '68606' => {
-                                       'BaseType' => '65178',
+                          '68298' => {
+                                       'BaseType' => '64870',
                                        'Name' => 'struct variable_field const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69908' => {
-                                       'BaseType' => '64136',
+                          '69600' => {
+                                       'BaseType' => '63828',
                                        'Name' => 'struct pldm_component_parameter_entry*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70138' => {
-                                       'BaseType' => '64032',
+                          '69830' => {
+                                       'BaseType' => '63724',
                                        'Name' => 'struct pldm_get_firmware_parameters_resp*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70439' => {
+                          '70131' => {
                                        'BaseType' => '2082',
                                        'Name' => 'uint8_t**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70736' => {
-                                       'BaseType' => '63850',
+                          '70428' => {
+                                       'BaseType' => '63542',
                                        'Name' => 'struct pldm_component_image_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '71352' => {
-                                       'BaseType' => '63655',
+                          '71044' => {
+                                       'BaseType' => '63347',
                                        'Name' => 'struct pldm_firmware_device_id_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
+                          '71196' => {
+                                       'BaseType' => '63211',
+                                       'Name' => 'struct pldm_package_header_information*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '714' => {
                                      'Header' => 'base.h',
                                      'Line' => '117',
@@ -10062,19 +10040,13 @@
                                      'Size' => '3',
                                      'Type' => 'Struct'
                                    },
-                          '71504' => {
-                                       'BaseType' => '63519',
-                                       'Name' => 'struct pldm_package_header_information*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
                           '74' => {
                                     'Name' => 'int',
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '78138' => {
-                                       'BaseType' => '78155',
+                          '77830' => {
+                                       'BaseType' => '77847',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -10082,13 +10054,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '78150' => {
-                                       'BaseType' => '78138',
+                          '77842' => {
+                                       'BaseType' => '77830',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '78155' => {
+                          '77847' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -10105,12 +10077,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '79227'
+                                                            'type' => '78919'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '79227'
+                                                            'type' => '78919'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -10118,8 +10090,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '78215' => {
-                                       'BaseType' => '78232',
+                          '77907' => {
+                                       'BaseType' => '77924',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -10127,13 +10099,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '78227' => {
-                                       'BaseType' => '78215',
+                          '77919' => {
+                                       'BaseType' => '77907',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '78232' => {
+                          '77924' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -10155,7 +10127,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '79215'
+                                                            'type' => '78907'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -10173,7 +10145,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '78316' => {
+                          '78008' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -10197,16 +10169,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '78373' => {
-                                       'BaseType' => '78316',
+                          '78065' => {
+                                       'BaseType' => '78008',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '78417' => {
-                                       'BaseType' => '78429',
+                          '78109' => {
+                                       'BaseType' => '78121',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -10214,14 +10186,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '78429' => {
+                          '78121' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '79232'
+                                                            'type' => '78924'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -10234,8 +10206,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '78472' => {
-                                       'BaseType' => '78489',
+                          '78164' => {
+                                       'BaseType' => '78181',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -10243,19 +10215,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '78489' => {
+                          '78181' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '78373'
+                                                            'type' => '78065'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '78373'
+                                                            'type' => '78065'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -10265,12 +10237,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '79232'
+                                                            'type' => '78924'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '79232'
+                                                            'type' => '78924'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -10283,65 +10255,65 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '79215' => {
-                                       'BaseType' => '78232',
+                          '78907' => {
+                                       'BaseType' => '77924',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79227' => {
-                                       'BaseType' => '78215',
+                          '78919' => {
+                                       'BaseType' => '77907',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79232' => {
-                                       'BaseType' => '78472',
+                          '78924' => {
+                                       'BaseType' => '78164',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79657' => {
-                                       'BaseType' => '79662',
+                          '79349' => {
+                                       'BaseType' => '79354',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79662' => {
-                                       'BaseType' => '78373',
+                          '79354' => {
+                                       'BaseType' => '78065',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79726' => {
-                                       'BaseType' => '78417',
+                          '79418' => {
+                                       'BaseType' => '78109',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80005' => {
-                                       'BaseType' => '79232',
+                          '79697' => {
+                                       'BaseType' => '78924',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80787' => {
-                                       'BaseType' => '78150',
+                          '80479' => {
+                                       'BaseType' => '77842',
                                        'Name' => 'pldm_pdr const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
+                          '80733' => {
+                                       'BaseType' => '77830',
+                                       'Name' => 'pldm_pdr*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '81' => {
                                     'Name' => 'unsigned int',
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '81041' => {
-                                       'BaseType' => '78138',
-                                       'Name' => 'pldm_pdr*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
                           '825' => {
                                      'BaseType' => '714',
                                      'Name' => 'struct pldm_msg_hdr const',
@@ -10379,18 +10351,18 @@
                                      'Size' => '4',
                                      'Type' => 'Const'
                                    },
+                          '87262' => {
+                                       'BaseType' => '77919',
+                                       'Name' => 'pldm_pdr_record const*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '874' => {
                                      'BaseType' => '168',
                                      'Name' => 'uint8_t[1]',
                                      'Size' => '1',
                                      'Type' => 'Array'
                                    },
-                          '87570' => {
-                                       'BaseType' => '78227',
-                                       'Name' => 'pldm_pdr_record const*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
                           '890' => {
                                      'Header' => 'base.h',
                                      'Line' => '160',
@@ -10431,7 +10403,7 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '93174' => {
+                          '92866' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -10439,7 +10411,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93186' => {
+                          '92878' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -10447,14 +10419,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93566' => {
+                          '93258' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '93186'
+                                                            'type' => '92878'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -10467,14 +10439,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '93605' => {
+                          '93297' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '93647'
+                                                            'type' => '93339'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10487,31 +10459,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '93647' => {
-                                       'BaseType' => '93566',
+                          '93339' => {
+                                       'BaseType' => '93258',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '94075' => {
-                                       'BaseType' => '93605',
+                          '93767' => {
+                                       'BaseType' => '93297',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94501' => {
-                                       'BaseType' => '93186',
+                          '94193' => {
+                                       'BaseType' => '92878',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94677' => {
-                                       'BaseType' => '94075',
+                          '94369' => {
+                                       'BaseType' => '93767',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '95193' => {
+                          '94885' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10519,7 +10491,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '95205' => {
+                          '94897' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10580,8 +10552,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '95302' => {
-                                       'BaseType' => '95205',
+                          '94994' => {
+                                       'BaseType' => '94897',
                                        '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 b8ba889..9689842 100644
--- a/include/libpldm/bios_table.h
+++ b/include/libpldm/bios_table.h
@@ -537,21 +537,6 @@
  */
 size_t pldm_bios_table_attr_value_entry_encode_integer_length(void);
 
-/** @brief Create an attribute value entry(type: integer)
- *  @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] cv - Current Value
- */
-void pldm_bios_table_attr_value_entry_encode_integer(void *entry,
-						     size_t entry_length,
-						     uint16_t attr_handle,
-						     uint8_t attr_type,
-						     uint64_t cv);
-
 /** @brief Get current values for the integer entry
  *  @param[in] entry - Pointer to bios attribute value table entry
  *  @return Current Value
diff --git a/src/bios_table.c b/src/bios_table.c
index f7f09a4..581ee6e 100644
--- a/src/bios_table.c
+++ b/src/bios_table.c
@@ -790,19 +790,6 @@
 	       sizeof(uint64_t);
 }
 
-LIBPLDM_ABI_DEPRECATED
-void pldm_bios_table_attr_value_entry_encode_integer(void *entry,
-						     size_t entry_length,
-						     uint16_t attr_handle,
-						     uint8_t attr_type,
-						     uint64_t cv)
-{
-	int rc = pldm_bios_table_attr_value_entry_encode_integer_check(
-		entry, entry_length, attr_handle, attr_type, cv);
-	(void)rc;
-	assert(rc == PLDM_SUCCESS);
-}
-
 LIBPLDM_ABI_STABLE
 int pldm_bios_table_attr_value_entry_encode_integer_check(void *entry,
 							  size_t entry_length,
diff --git a/tests/libpldm_bios_table_test.cpp b/tests/libpldm_bios_table_test.cpp
index 974ed19..902d024 100644
--- a/tests/libpldm_bios_table_test.cpp
+++ b/tests/libpldm_bios_table_test.cpp
@@ -721,14 +721,16 @@
     auto length = pldm_bios_table_attr_value_entry_encode_integer_length();
     EXPECT_EQ(length, integerEntry.size());
     std::vector<uint8_t> encodeEntry(length, 0);
-    pldm_bios_table_attr_value_entry_encode_integer(
-        encodeEntry.data(), encodeEntry.size(), 0, PLDM_BIOS_INTEGER, 10);
+    ASSERT_EQ(
+        pldm_bios_table_attr_value_entry_encode_integer_check(
+            encodeEntry.data(), encodeEntry.size(), 0, PLDM_BIOS_INTEGER, 10),
+        PLDM_SUCCESS);
     EXPECT_EQ(encodeEntry, integerEntry);
 
-    EXPECT_DEATH(pldm_bios_table_attr_value_entry_encode_integer(
-                     encodeEntry.data(), encodeEntry.size() - 1, 0,
-                     PLDM_BIOS_INTEGER, 10),
-                 "rc == PLDM_SUCCESS");
+    EXPECT_NE(pldm_bios_table_attr_value_entry_encode_integer_check(
+                  encodeEntry.data(), encodeEntry.size() - 1, 0,
+                  PLDM_BIOS_INTEGER, 10),
+              PLDM_SUCCESS);
 
     auto rc = pldm_bios_table_attr_value_entry_encode_integer_check(
         encodeEntry.data(), encodeEntry.size(), 0, PLDM_BIOS_INTEGER, 10);