diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75e35aa..1e7918a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 ### Removed
 
 1. bios_table: Remove pldm_bios_table_attr_entry_integer_encode_length()
+2. bios_table: Remove pldm_bios_table_attr_value_entry_encode_enum()
 
 ### Fixed
 
diff --git a/abi/aarch64/gcc.dump b/abi/aarch64/gcc.dump
index f805635..88630bb 100644
--- a/abi/aarch64/gcc.dump
+++ b/abi/aarch64/gcc.dump
@@ -158,7 +158,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '109286' => {
+                            '108957' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -177,7 +177,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '109469' => {
+                            '109140' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -198,7 +198,7 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '54900'
+                                                                'type' => '54571'
                                                               },
                                                        '5' => {
                                                                 'name' => 'file_meta_data_1',
@@ -221,7 +221,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '109687' => {
+                            '109358' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -240,22 +240,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '10972' => {
-                                         'Header' => 'bios.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_date_time_req'
-                                       },
-                            '109794' => {
+                            '109465' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -298,7 +283,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '110087' => {
+                            '10972' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '109758' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -317,7 +317,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '110265' => {
+                            '109936' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -361,7 +361,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '110463' => {
+                            '110134' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -380,7 +380,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '110565' => {
+                            '110236' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -423,7 +423,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '110858' => {
+                            '110529' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -442,7 +442,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '110965' => {
+                            '110636' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -469,7 +469,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '111183' => {
+                            '110854' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -488,7 +488,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '111356' => {
+                            '111027' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -515,7 +515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '111492' => {
+                            '111163' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -538,7 +538,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '111619' => {
+                            '111290' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -573,7 +573,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '111877' => {
+                            '111548' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -600,7 +600,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '112090' => {
+                            '111761' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -631,7 +631,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '112240' => {
+                            '111911' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -650,7 +650,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '112347' => {
+                            '112018' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -677,7 +677,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '112565' => {
+                            '112236' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -696,7 +696,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '112738' => {
+                            '112409' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -717,13 +717,13 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '54900'
+                                                                'type' => '54571'
                                                               }
                                                      },
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '112874' => {
+                            '112545' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -746,7 +746,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '113001' => {
+                            '112672' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -785,7 +785,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '113279' => {
+                            '112950' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -812,7 +812,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '113492' => {
+                            '113163' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -841,13 +841,13 @@
                                                               },
                                                        '6' => {
                                                                 'name' => 'address',
-                                                                'type' => '54900'
+                                                                'type' => '54571'
                                                               }
                                                      },
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '113656' => {
+                            '113327' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -870,7 +870,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '113854' => {
+                            '113525' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -893,7 +893,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '113976' => {
+                            '113647' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -920,7 +920,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '114194' => {
+                            '113865' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -951,7 +951,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '114343' => {
+                            '114014' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -974,7 +974,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '114541' => {
+                            '114212' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1001,7 +1001,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '114671' => {
+                            '114342' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1028,7 +1028,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '114889' => {
+                            '114560' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1055,7 +1055,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '115018' => {
+                            '114689' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1090,7 +1090,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '115184' => {
+                            '114855' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1117,7 +1117,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '115393' => {
+                            '115064' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1152,7 +1152,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '115676' => {
+                            '115347' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1179,7 +1179,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '115805' => {
+                            '115476' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1202,7 +1202,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '115926' => {
+                            '115597' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1237,7 +1237,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '116173' => {
+                            '115844' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1264,7 +1264,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '116377' => {
+                            '116048' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1289,13 +1289,13 @@
                                                               },
                                                        '5' => {
                                                                 'name' => 'address',
-                                                                'type' => '54900'
+                                                                'type' => '54571'
                                                               }
                                                      },
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '117323' => {
+                            '116994' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1326,7 +1326,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '117554' => {
+                            '117225' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1345,7 +1345,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '117642' => {
+                            '117313' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1372,7 +1372,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '117775' => {
+                            '117446' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1395,7 +1395,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '118814' => {
+                            '118485' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -4045,37 +4045,6 @@
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
-                                                               'name' => 'entry',
-                                                               'type' => '166'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entry_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'attr_handle',
-                                                               'type' => '4895'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'attr_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'count',
-                                                               'type' => '168'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'handles',
-                                                               'type' => '6087'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum'
-                                       },
-                            '54104' => {
-                                         'Header' => 'bios_table.h',
-                                         'Param' => {
-                                                      '0' => {
                                                                'name' => 'count',
                                                                'type' => '168'
                                                              }
@@ -4083,7 +4052,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_length'
                                        },
-                            '54159' => {
+                            '53830' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4094,7 +4063,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_type'
                                        },
-                            '54214' => {
+                            '53885' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4105,7 +4074,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_handle'
                                        },
-                            '54773' => {
+                            '54444' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4114,11 +4083,11 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'lower',
-                                                               'type' => '54900'
+                                                               'type' => '54571'
                                                              },
                                                       '2' => {
                                                                'name' => 'upper',
-                                                               'type' => '54900'
+                                                               'type' => '54571'
                                                              },
                                                       '3' => {
                                                                'name' => 'scalar',
@@ -4126,13 +4095,13 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'def',
-                                                               'type' => '54900'
+                                                               'type' => '54571'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_decode'
                                        },
-                            '54915' => {
+                            '54586' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4145,33 +4114,33 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '55177'
+                                                               'type' => '54848'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_check'
                                        },
-                            '55187' => {
+                            '54858' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '55177'
+                                                               'type' => '54848'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '55444'
+                                                               'type' => '55115'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_info_check'
                                        },
-                            '55449' => {
+                            '55120' => {
                                          'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_length'
                                        },
-                            '55611' => {
+                            '55282' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4190,7 +4159,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string'
                                        },
-                            '55807' => {
+                            '55478' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4201,7 +4170,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_min_length'
                                        },
-                            '55882' => {
+                            '55553' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4212,7 +4181,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_max_length'
                                        },
-                            '55957' => {
+                            '55628' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4223,7 +4192,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_string_type'
                                        },
-                            '56032' => {
+                            '55703' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4238,7 +4207,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string_length_check'
                                        },
-                            '56208' => {
+                            '55879' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4251,28 +4220,28 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '56494'
+                                                               'type' => '56165'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_check'
                                        },
-                            '56499' => {
+                            '56170' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '56494'
+                                                               'type' => '56165'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '55444'
+                                                               'type' => '55115'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_info_check'
                                        },
-                            '56768' => {
+                            '56439' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4283,7 +4252,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_length'
                                        },
-                            '57003' => {
+                            '56674' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4302,7 +4271,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_indices'
                                        },
-                            '57209' => {
+                            '56880' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4321,7 +4290,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_hdls_check'
                                        },
-                            '57367' => {
+                            '57038' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4336,7 +4305,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_num_check'
                                        },
-                            '57532' => {
+                            '57203' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4351,7 +4320,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_num_check'
                                        },
-                            '57598' => {
+                            '57269' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4364,13 +4333,13 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '57856'
+                                                               'type' => '57527'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_check'
                                        },
-                            '57861' => {
+                            '57532' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4385,7 +4354,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_length'
                                        },
-                            '57927' => {
+                            '57598' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4396,7 +4365,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_string_handle'
                                        },
-                            '57980' => {
+                            '57651' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4407,7 +4376,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_type'
                                        },
-                            '58033' => {
+                            '57704' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4418,7 +4387,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_handle'
                                        },
-                            '58655' => {
+                            '58326' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4437,7 +4406,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_check'
                                        },
-                            '58821' => {
+                            '58492' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4448,7 +4417,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_length'
                                        },
-                            '58874' => {
+                            '58545' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4459,7 +4428,7 @@
                                          'Return' => '4895',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_handle'
                                        },
-                            '58927' => {
+                            '58598' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4482,7 +4451,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_encode_check'
                                        },
-                            '59196' => {
+                            '58867' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4599,7 +4568,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_req'
                                       },
-                            '64786' => {
+                            '64457' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -4610,6 +4579,52 @@
                                          'Return' => '6265',
                                          'ShortName' => 'is_transfer_flag_valid'
                                        },
+                            '64608' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2029'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '2034'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'non_functioning_component_indication',
+                                                               'type' => '64792'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'non_functioning_component_bitmap',
+                                                               'type' => '64797'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_cancel_update_resp'
+                                       },
+                            '64807' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_cancel_update_req'
+                                       },
                             '6491' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -4633,53 +4648,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_resp'
                                       },
-                            '64937' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2029'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '2034'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'non_functioning_component_indication',
-                                                               'type' => '65121'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'non_functioning_component_bitmap',
-                                                               'type' => '65126'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_cancel_update_resp'
-                                       },
-                            '65136' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_cancel_update_req'
-                                       },
-                            '65289' => {
+                            '64960' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4698,7 +4667,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_component_resp'
                                        },
-                            '65371' => {
+                            '65042' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4717,7 +4686,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_component_req'
                                        },
-                            '65524' => {
+                            '65195' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4758,13 +4727,13 @@
                                                              },
                                                       '9' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '65865'
+                                                               'type' => '65536'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_status_resp'
                                        },
-                            '65875' => {
+                            '65546' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4783,7 +4752,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_status_req'
                                        },
-                            '66028' => {
+                            '65699' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4806,7 +4775,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_activate_firmware_resp'
                                        },
-                            '66154' => {
+                            '65825' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4829,7 +4798,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_activate_firmware_req'
                                        },
-                            '66375' => {
+                            '66046' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4852,7 +4821,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_apply_complete_resp'
                                        },
-                            '66547' => {
+                            '66218' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4869,13 +4838,13 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_activation_methods_modification',
-                                                               'type' => '66669'
+                                                               'type' => '66340'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_apply_complete_req'
                                        },
-                            '66679' => {
+                            '66350' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4898,7 +4867,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_verify_complete_resp'
                                        },
-                            '66851' => {
+                            '66522' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -4917,6 +4886,71 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_verify_complete_req'
                                        },
+                            '66604' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '168'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_transfer_complete_resp'
+                                       },
+                            '66776' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2029'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'transfer_result',
+                                                               'type' => '2034'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_transfer_complete_req'
+                                       },
+                            '66858' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '168'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_request_firmware_data_resp'
+                                       },
                             '6693' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -4940,72 +4974,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_resp'
                                       },
-                            '66933' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '168'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_transfer_complete_resp'
-                                       },
-                            '67105' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2029'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'transfer_result',
-                                                               'type' => '2034'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_transfer_complete_req'
-                                       },
-                            '67187' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '168'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_request_firmware_data_resp'
-                                       },
-                            '67359' => {
+                            '67030' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5028,7 +4997,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_firmware_data_req'
                                        },
-                            '67491' => {
+                            '67162' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5053,7 +5022,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '65865'
+                                                               'type' => '65536'
                                                              },
                                                       '6' => {
                                                                'name' => 'time_before_req_fw_data',
@@ -5063,7 +5032,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_update_component_resp'
                                        },
-                            '67727' => {
+                            '67398' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5100,7 +5069,7 @@
                                                              },
                                                       '6' => {
                                                                'name' => 'update_option_flags',
-                                                               'type' => '60620'
+                                                               'type' => '60291'
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_ver_str_type',
@@ -5112,12 +5081,90 @@
                                                              },
                                                       '9' => {
                                                                'name' => 'comp_ver_str',
-                                                               'type' => '68131'
+                                                               'type' => '67802'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'encode_update_component_req'
                                        },
+                            '67812' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2029'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '11295'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '2034'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'comp_resp',
+                                                               'type' => '2034'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'comp_resp_code',
+                                                               'type' => '2034'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_pass_component_table_resp'
+                                       },
+                            '68008' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'transfer_flag',
+                                                               'type' => '168'
+                                                             },
+                                                      '10' => {
+                                                                'name' => 'payload_length',
+                                                                'type' => '123'
+                                                              },
+                                                      '2' => {
+                                                               'name' => 'comp_classification',
+                                                               'type' => '4895'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'comp_identifier',
+                                                               'type' => '4895'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'comp_classification_index',
+                                                               'type' => '168'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'comp_comparison_stamp',
+                                                               'type' => '180'
+                                                             },
+                                                      '6' => {
+                                                               'name' => 'comp_ver_str_type',
+                                                               'type' => '168'
+                                                             },
+                                                      '7' => {
+                                                               'name' => 'comp_ver_str_len',
+                                                               'type' => '168'
+                                                             },
+                                                      '8' => {
+                                                               'name' => 'comp_ver_str',
+                                                               'type' => '67802'
+                                                             },
+                                                      '9' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_pass_component_table_req'
+                                       },
                             '6809' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5157,85 +5204,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_req'
                                       },
-                            '68141' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2029'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '11295'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '2034'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'comp_resp',
-                                                               'type' => '2034'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'comp_resp_code',
-                                                               'type' => '2034'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_pass_component_table_resp'
-                                       },
-                            '68337' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'transfer_flag',
-                                                               'type' => '168'
-                                                             },
-                                                      '10' => {
-                                                                'name' => 'payload_length',
-                                                                'type' => '123'
-                                                              },
-                                                      '2' => {
-                                                               'name' => 'comp_classification',
-                                                               'type' => '4895'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'comp_identifier',
-                                                               'type' => '4895'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'comp_classification_index',
-                                                               'type' => '168'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'comp_comparison_stamp',
-                                                               'type' => '180'
-                                                             },
-                                                      '6' => {
-                                                               'name' => 'comp_ver_str_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '7' => {
-                                                               'name' => 'comp_ver_str_len',
-                                                               'type' => '168'
-                                                             },
-                                                      '8' => {
-                                                               'name' => 'comp_ver_str',
-                                                               'type' => '68131'
-                                                             },
-                                                      '9' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_pass_component_table_req'
-                                       },
-                            '68750' => {
+                            '68421' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5262,7 +5231,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_update_resp'
                                        },
-                            '68891' => {
+                            '68562' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5295,7 +5264,7 @@
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_img_set_ver_str',
-                                                               'type' => '68131'
+                                                               'type' => '67802'
                                                              },
                                                       '8' => {
                                                                'name' => 'msg',
@@ -5309,7 +5278,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_update_req'
                                        },
-                            '69256' => {
+                            '68927' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5322,7 +5291,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'component_data',
-                                                               'type' => '69412'
+                                                               'type' => '69083'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_ver_str',
@@ -5336,7 +5305,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp_comp_entry'
                                        },
-                            '69422' => {
+                            '69093' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5349,7 +5318,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'resp_data',
-                                                               'type' => '69642'
+                                                               'type' => '69313'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_image_set_ver_str',
@@ -5367,7 +5336,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp'
                                        },
-                            '69647' => {
+                            '69318' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5386,7 +5355,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_firmware_parameters_req'
                                        },
-                            '69784' => {
+                            '69455' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5411,13 +5380,13 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'descriptor_data',
-                                                               'type' => '69940'
+                                                               'type' => '69611'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_query_device_identifiers_resp'
                                        },
-                            '69950' => {
+                            '69621' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5436,7 +5405,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_query_device_identifiers_req'
                                        },
-                            '70087' => {
+                            '69758' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5449,7 +5418,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_comp_image_info',
-                                                               'type' => '70234'
+                                                               'type' => '69905'
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_version_str',
@@ -5459,7 +5428,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pldm_comp_image_info'
                                        },
-                            '70239' => {
+                            '69910' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5486,7 +5455,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_vendor_defined_descriptor_value'
                                        },
-                            '70418' => {
+                            '70089' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5509,7 +5478,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_descriptor_type_length_value'
                                        },
-                            '70590' => {
+                            '70261' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5526,7 +5495,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'fw_device_id_record',
-                                                               'type' => '70857'
+                                                               'type' => '70528'
                                                              },
                                                       '4' => {
                                                                'name' => 'applicable_components',
@@ -5548,7 +5517,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_firmware_device_id_record'
                                        },
-                            '70862' => {
+                            '70533' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5561,7 +5530,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'package_header_info',
-                                                               'type' => '71009'
+                                                               'type' => '70680'
                                                              },
                                                       '3' => {
                                                                'name' => 'package_version_str',
@@ -5594,6 +5563,60 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_resp'
                                       },
+                            '72871' => {
+                                         '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' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_set_fru_record_table_resp'
+                                       },
+                            '73094' => {
+                                         'Header' => 'fru.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2029'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'data_transfer_handle',
+                                                               'type' => '2039'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'transfer_flag',
+                                                               'type' => '2034'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'fru_table_data',
+                                                               'type' => '6481'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_set_fru_record_table_req'
+                                       },
                             '7314' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5621,61 +5644,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_attribute_current_value_req'
                                       },
-                            '73200' => {
-                                         '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' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_set_fru_record_table_resp'
-                                       },
-                            '73423' => {
-                                         'Header' => 'fru.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2029'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'data_transfer_handle',
-                                                               'type' => '2039'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'transfer_flag',
-                                                               'type' => '2034'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'fru_table_data',
-                                                               'type' => '6481'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_set_fru_record_table_req'
-                                       },
-                            '73590' => {
+                            '73261' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5710,7 +5679,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '73838' => {
+                            '73509' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5749,7 +5718,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '74096' => {
+                            '73767' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5776,7 +5745,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '74314' => {
+                            '73985' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5807,7 +5776,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_resp'
                                        },
-                            '74475' => {
+                            '74146' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5846,30 +5815,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_resp'
                                        },
-                            '7461' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'msg',
-                                                              'type' => '2029'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'completion_code',
-                                                              'type' => '2034'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'next_transfer_handle',
-                                                              'type' => '2039'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
-                                      },
-                            '74784' => {
+                            '74455' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5908,7 +5854,30 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '74972' => {
+                            '7461' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'msg',
+                                                              'type' => '2029'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'completion_code',
+                                                              'type' => '2034'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'next_transfer_handle',
+                                                              'type' => '2039'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
+                                      },
+                            '74643' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5951,7 +5920,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_req'
                                        },
-                            '75265' => {
+                            '74936' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5986,7 +5955,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'get_fru_record_by_option_check'
                                        },
-                            '75691' => {
+                            '75362' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6056,7 +6025,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_req'
                                       },
-                            '76128' => {
+                            '75799' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6099,7 +6068,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
-                            '76391' => {
+                            '76062' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6126,7 +6095,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_resp'
                                        },
-                            '76595' => {
+                            '76266' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6149,7 +6118,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '76711' => {
+                            '76382' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6196,7 +6165,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '77015' => {
+                            '76686' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6244,7 +6213,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '77222' => {
+                            '76893' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6263,6 +6232,29 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_req'
                                        },
+                            '78510' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'pdr',
+                                                               'type' => '6087'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'pdr_len',
+                                                               'type' => '4895'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'num_entities',
+                                                               'type' => '8822'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'entities',
+                                                               'type' => '78823'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_pdr_extract'
+                                       },
                             '7865' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6298,98 +6290,75 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '78839' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'pdr',
-                                                               'type' => '6087'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'pdr_len',
-                                                               'type' => '4895'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'num_entities',
-                                                               'type' => '8822'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'entities',
-                                                               'type' => '79152'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_pdr_extract'
-                                       },
-                            '79172' => {
+                            '78843' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79227'
+                                                               'type' => '78898'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_is_empty_entity_assoc_tree'
                                        },
-                            '79232' => {
+                            '78903' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79227'
+                                                               'type' => '78898'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy_root'
                                        },
-                            '79295' => {
+                            '78966' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'org_tree',
-                                                               'type' => '79227'
+                                                               'type' => '78898'
                                                              },
                                                       '1' => {
                                                                'name' => 'new_tree',
-                                                               'type' => '79227'
+                                                               'type' => '78898'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_copy_root'
                                        },
-                            '79511' => {
+                            '79182' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79227'
+                                                               'type' => '78898'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79157'
+                                                               'type' => '78828'
                                                              }
                                                     },
-                                         'Return' => '78727',
+                                         'Return' => '78398',
                                          'ShortName' => 'pldm_entity_association_tree_find'
                                        },
-                            '80256' => {
+                            '79927' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80505'
+                                                               'type' => '80176'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_remote_pdrs'
                                        },
-                            '80510' => {
+                            '80181' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80505'
+                                                               'type' => '80176'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6399,40 +6368,40 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
-                            '80779' => {
+                            '80450' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79227'
+                                                               'type' => '78898'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
                                                                'offset' => '-8',
-                                                               'type' => '77868'
+                                                               'type' => '77539'
                                                              },
                                                       '2' => {
                                                                'name' => 'node',
-                                                               'type' => '79506'
+                                                               'type' => '79177'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_find_entity_ref_in_tree'
                                        },
-                            '81296' => {
+                            '80967' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78727'
+                                                               'type' => '78398'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80505'
+                                                               'type' => '80176'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '79152'
+                                                               'type' => '78823'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6450,20 +6419,20 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '81512' => {
+                            '81183' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78727'
+                                                               'type' => '78398'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80505'
+                                                               'type' => '80176'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '79152'
+                                                               'type' => '78823'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6481,6 +6450,29 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node'
                                        },
+                            '81512' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '78898'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80176'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'is_remote',
+                                                               'type' => '6265'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '4895'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_pdr_add'
+                                       },
                             '8158' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6508,28 +6500,20 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '81841' => {
+                            '82967' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '79227'
+                                                               'name' => 'parent',
+                                                               'type' => '78398'
                                                              },
                                                       '1' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80505'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6265'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '4895'
+                                                               'name' => 'node',
+                                                               'type' => '78828'
                                                              }
                                                     },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_pdr_add'
+                                         'Return' => '6265',
+                                         'ShortName' => 'pldm_is_current_parent_child'
                                        },
                             '8304' => {
                                         'Header' => 'bios.h',
@@ -6562,27 +6546,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '83296' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'parent',
-                                                               'type' => '78727'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'node',
-                                                               'type' => '79157'
-                                                             }
-                                                    },
-                                         'Return' => '6265',
-                                         'ShortName' => 'pldm_is_current_parent_child'
-                                       },
-                            '83385' => {
+                            '83056' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78727'
+                                                               'type' => '78398'
                                                              },
                                                       '1' => {
                                                                'name' => 'association_type',
@@ -6592,60 +6561,60 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '83600' => {
+                            '83271' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78727'
+                                                               'type' => '78398'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '83755' => {
+                            '83426' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78727'
+                                                               'type' => '78398'
                                                              }
                                                     },
-                                         'Return' => '77868',
+                                         'Return' => '77539',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '83910' => {
+                            '83581' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78727'
+                                                               'type' => '78398'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '84065' => {
+                            '83736' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79227'
+                                                               'type' => '78898'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
-                            '84244' => {
+                            '83915' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79227'
+                                                               'type' => '78898'
                                                              },
                                                       '1' => {
                                                                'name' => 'entities',
-                                                               'type' => '79152'
+                                                               'type' => '78823'
                                                              },
                                                       '2' => {
                                                                'name' => 'size',
@@ -6682,16 +6651,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '85176' => {
+                            '84847' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79227'
+                                                               'type' => '78898'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79157'
+                                                               'type' => '78828'
                                                              },
                                                       '2' => {
                                                                'name' => 'entity_instance_number',
@@ -6699,38 +6668,38 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'parent',
-                                                               'type' => '78727'
+                                                               'type' => '78398'
                                                              },
                                                       '4' => {
                                                                'name' => 'association_type',
                                                                'type' => '168'
                                                              }
                                                     },
-                                         'Return' => '78727',
+                                         'Return' => '78398',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
-                            '85613' => {
+                            '85284' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '79227',
+                                         'Return' => '78898',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
-                            '85847' => {
+                            '85518' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78727'
+                                                               'type' => '78398'
                                                              }
                                                     },
-                                         'Return' => '77868',
+                                         'Return' => '77539',
                                          'ShortName' => 'pldm_entity_extract'
                                        },
-                            '86653' => {
+                            '86324' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80251'
+                                                               'type' => '79922'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6752,6 +6721,37 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
+                            '86664' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79922'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'fru_rsi',
+                                                               'type' => '4895'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '8294'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'entity_type',
+                                                               'type' => '8294'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'entity_instance_num',
+                                                               'type' => '8294'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'container_id',
+                                                               'type' => '8294'
+                                                             }
+                                                    },
+                                         'Return' => '86649',
+                                         'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
+                                       },
                             '8672' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6783,43 +6783,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '86993' => {
+                            '86995' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80251'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'fru_rsi',
-                                                               'type' => '4895'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '8294'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'entity_type',
-                                                               'type' => '8294'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'entity_instance_num',
-                                                               'type' => '8294'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'container_id',
-                                                               'type' => '8294'
-                                                             }
-                                                    },
-                                         'Return' => '86978',
-                                         'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
-                                       },
-                            '87324' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80505'
+                                                               'type' => '80176'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6849,12 +6818,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '87646' => {
+                            '87317' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80505'
+                                                               'type' => '80176'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6884,32 +6853,81 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set'
                                        },
-                            '87985' => {
+                            '87656' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '86978'
+                                                               'type' => '86649'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '88140' => {
+                            '87811' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80251'
+                                                               'type' => '79922'
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '86978'
+                                                               'type' => '86649'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
+                            '88029' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79922'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_get_repo_size'
+                                       },
+                            '88160' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79922'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_get_record_count'
+                                       },
+                            '88291' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79922'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'pdr_type',
+                                                               'type' => '168'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'curr_record',
+                                                               'type' => '86649'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'data',
+                                                               'type' => '69611'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'size',
+                                                               'type' => '2039'
+                                                             }
+                                                    },
+                                         'Return' => '86649',
+                                         'ShortName' => 'pldm_pdr_find_record_by_type'
+                                       },
                             '8832' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6937,69 +6955,20 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '88358' => {
+                            '88469' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80251'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_get_repo_size'
-                                       },
-                            '88489' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80251'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_get_record_count'
-                                       },
-                            '88620' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80251'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'pdr_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'curr_record',
-                                                               'type' => '86978'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'data',
-                                                               'type' => '69940'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'size',
-                                                               'type' => '2039'
-                                                             }
-                                                    },
-                                         'Return' => '86978',
-                                         'ShortName' => 'pldm_pdr_find_record_by_type'
-                                       },
-                            '88798' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80251'
+                                                               'type' => '79922'
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '86978'
+                                                               'type' => '86649'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '69940'
+                                                               'type' => '69611'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7010,15 +6979,15 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '86978',
+                                         'Return' => '86649',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '88972' => {
+                            '88643' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80251'
+                                                               'type' => '79922'
                                                              },
                                                       '1' => {
                                                                'name' => 'record_handle',
@@ -7026,7 +6995,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '69940'
+                                                               'type' => '69611'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7037,31 +7006,31 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '86978',
+                                         'Return' => '86649',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '89140' => {
+                            '88811' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80505'
+                                                               'type' => '80176'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '89295' => {
+                            '88966' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '80505',
+                                         'Return' => '80176',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '89367' => {
+                            '89038' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80505'
+                                                               'type' => '80176'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7087,6 +7056,37 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_check'
                                        },
+                            '89472' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80176'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'data',
+                                                               'type' => '6087'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'size',
+                                                               'type' => '180'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'record_handle',
+                                                               'type' => '180'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'is_remote',
+                                                               'type' => '6265'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '4895'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_add'
+                                       },
                             '8973' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7114,38 +7114,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '89801' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80505'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'data',
-                                                               'type' => '6087'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'size',
-                                                               'type' => '180'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'record_handle',
-                                                               'type' => '180'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6265'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '4895'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_add'
-                                       },
-                            '91307' => {
+                            '90978' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7156,7 +7125,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '91399' => {
+                            '91070' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7167,6 +7136,40 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
+                            '91480' => {
+                                         'Header' => 'utils.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'version',
+                                                               'type' => '3250'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'buffer',
+                                                               'type' => '11261'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'buffer_size',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '12204',
+                                         'ShortName' => 'ver2str'
+                                       },
+                            '91608' => {
+                                         'Header' => 'utils.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'data',
+                                                               'type' => '1434'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'size',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '168',
+                                         'ShortName' => 'crc8'
+                                       },
                             '9179' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7202,106 +7205,72 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '91809' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'version',
-                                                               'type' => '3250'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'buffer',
-                                                               'type' => '11261'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'buffer_size',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '12204',
-                                         'ShortName' => 'ver2str'
-                                       },
-                            '91937' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'data',
-                                                               'type' => '1434'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'size',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '168',
-                                         'ShortName' => 'crc8'
-                                       },
-                            '93208' => {
+                            '92879' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93416'
+                                                               'type' => '93087'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '92533'
+                                                               'type' => '92204'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '92545'
+                                                               'type' => '92216'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '93421' => {
+                            '93092' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93416'
+                                                               'type' => '93087'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '92533'
+                                                               'type' => '92204'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '93822'
+                                                               'type' => '93493'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '93827' => {
+                            '93498' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93416'
+                                                               'type' => '93087'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '93912' => {
+                            '93583' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93998'
+                                                               'type' => '93669'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '94003' => {
+                            '93674' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93998'
+                                                               'type' => '93669'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7330,12 +7299,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_date_time_resp'
                                       },
-                            '95150' => {
+                            '94821' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94488'
+                                                               'type' => '94159'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7350,9 +7319,40 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '94597',
+                                         'Return' => '94268',
                                          'ShortName' => 'pldm_send'
                                        },
+                            '95237' => {
+                                         'Header' => 'pldm.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'eid',
+                                                               'type' => '94159'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'mctp_fd',
+                                                               'type' => '74'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'pldm_req_msg',
+                                                               'type' => '6087'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'req_msg_len',
+                                                               'type' => '123'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'pldm_resp_msg',
+                                                               'type' => '69611'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'resp_msg_len',
+                                                               'type' => '8822'
+                                                             }
+                                                    },
+                                         'Return' => '94268',
+                                         'ShortName' => 'pldm_send_recv'
+                                       },
                             '9534' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7376,43 +7376,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_date_time_resp'
                                       },
-                            '95566' => {
+                            '95713' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94488'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'mctp_fd',
-                                                               'type' => '74'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'pldm_req_msg',
-                                                               'type' => '6087'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'req_msg_len',
-                                                               'type' => '123'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'pldm_resp_msg',
-                                                               'type' => '69940'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'resp_msg_len',
-                                                               'type' => '8822'
-                                                             }
-                                                    },
-                                         'Return' => '94597',
-                                         'ShortName' => 'pldm_send_recv'
-                                       },
-                            '96042' => {
-                                         'Header' => 'pldm.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'eid',
-                                                               'type' => '94488'
+                                                               'type' => '94159'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7424,22 +7393,22 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '69940'
+                                                               'type' => '69611'
                                                              },
                                                       '4' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '94597',
+                                         'Return' => '94268',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '96265' => {
+                            '95936' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94488'
+                                                               'type' => '94159'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7447,19 +7416,19 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '69940'
+                                                               'type' => '69611'
                                                              },
                                                       '3' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '94597',
+                                         'Return' => '94268',
                                          'ShortName' => 'pldm_recv_any'
                                        },
-                            '96707' => {
+                            '96378' => {
                                          'Header' => 'pldm.h',
-                                         'Return' => '94597',
+                                         'Return' => '94268',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9723' => {
@@ -7736,7 +7705,6 @@
                                                  'pldm_bios_table_attr_value_entry_decode_attribute_handle' => 1,
                                                  'pldm_bios_table_attr_value_entry_decode_attribute_type' => 1,
                                                  'pldm_bios_table_attr_value_entry_decode_handle' => 1,
-                                                 'pldm_bios_table_attr_value_entry_encode_enum' => 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,
@@ -9128,7 +9096,7 @@
                                     },
                           '46638' => {
                                        'Header' => undef,
-                                       'Line' => '982',
+                                       'Line' => '971',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'table_data',
@@ -9221,31 +9189,31 @@
                                     'Size' => '1',
                                     'Type' => 'Intrinsic'
                                   },
-                          '54900' => {
+                          '54571' => {
                                        'BaseType' => '45555',
                                        'Name' => 'uint64_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55177' => {
+                          '54848' => {
                                        'BaseType' => '46214',
                                        'Name' => 'struct pldm_bios_table_attr_entry_integer_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55444' => {
+                          '55115' => {
                                        'BaseType' => '12199',
                                        'Name' => 'char const**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '56494' => {
+                          '56165' => {
                                        'BaseType' => '46106',
                                        'Name' => 'struct pldm_bios_table_attr_entry_string_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '57856' => {
+                          '57527' => {
                                        'BaseType' => '45972',
                                        'Name' => 'struct pldm_bios_table_attr_entry_enum_info const*',
                                        'Size' => '8',
@@ -9281,14 +9249,14 @@
                                       'Size' => '1',
                                       'Type' => 'Intrinsic'
                                     },
-                          '63117' => {
+                          '62788' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '329',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'uuid',
                                                             'offset' => '0',
-                                                            'type' => '63221'
+                                                            'type' => '62892'
                                                           },
                                                    '1' => {
                                                             'name' => 'package_header_format_version',
@@ -9325,13 +9293,13 @@
                                        'Size' => '36',
                                        'Type' => 'Struct'
                                      },
-                          '63221' => {
+                          '62892' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[16]',
                                        'Size' => '16',
                                        'Type' => 'Array'
                                      },
-                          '63253' => {
+                          '62924' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '343',
                                        'Memb' => {
@@ -9348,7 +9316,7 @@
                                                    '2' => {
                                                             'name' => 'device_update_option_flags',
                                                             'offset' => '3',
-                                                            'type' => '60620'
+                                                            'type' => '60291'
                                                           },
                                                    '3' => {
                                                             'name' => 'comp_image_set_version_string_type',
@@ -9370,7 +9338,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '63448' => {
+                          '63119' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '377',
                                        'Memb' => {
@@ -9392,12 +9360,12 @@
                                                    '3' => {
                                                             'name' => 'comp_options',
                                                             'offset' => '8',
-                                                            'type' => '60122'
+                                                            'type' => '59793'
                                                           },
                                                    '4' => {
                                                             'name' => 'requested_comp_activation_method',
                                                             'offset' => '16',
-                                                            'type' => '60122'
+                                                            'type' => '59793'
                                                           },
                                                    '5' => {
                                                             'name' => 'comp_location_offset',
@@ -9424,7 +9392,7 @@
                                        'Size' => '22',
                                        'Type' => 'Struct'
                                      },
-                          '63630' => {
+                          '63301' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '403',
                                        'Memb' => {
@@ -9436,7 +9404,7 @@
                                                    '1' => {
                                                             'name' => 'capabilities_during_update',
                                                             'offset' => '1',
-                                                            'type' => '60620'
+                                                            'type' => '60291'
                                                           },
                                                    '2' => {
                                                             'name' => 'comp_count',
@@ -9468,7 +9436,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '63734' => {
+                          '63405' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '417',
                                        'Memb' => {
@@ -9485,17 +9453,17 @@
                                                    '10' => {
                                                              'name' => 'pending_comp_release_date',
                                                              'offset' => '37',
-                                                             'type' => '63916'
+                                                             'type' => '63587'
                                                            },
                                                    '11' => {
                                                              'name' => 'comp_activation_methods',
                                                              'offset' => '51',
-                                                             'type' => '60122'
+                                                             'type' => '59793'
                                                            },
                                                    '12' => {
                                                              'name' => 'capabilities_during_update',
                                                              'offset' => '53',
-                                                             'type' => '60620'
+                                                             'type' => '60291'
                                                            },
                                                    '2' => {
                                                             'name' => 'comp_classification_index',
@@ -9520,7 +9488,7 @@
                                                    '6' => {
                                                             'name' => 'active_comp_release_date',
                                                             'offset' => '17',
-                                                            'type' => '63916'
+                                                            'type' => '63587'
                                                           },
                                                    '7' => {
                                                             'name' => 'pending_comp_comparison_stamp',
@@ -9542,73 +9510,73 @@
                                        'Size' => '39',
                                        'Type' => 'Struct'
                                      },
-                          '63916' => {
+                          '63587' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[8]',
                                        'Size' => '8',
                                        'Type' => 'Array'
                                      },
-                          '64776' => {
+                          '64447' => {
                                        'BaseType' => '6048',
                                        'Name' => 'struct variable_field const',
                                        'Size' => '16',
                                        'Type' => 'Const'
                                      },
+                          '64792' => {
+                                       'BaseType' => '11646',
+                                       'Name' => 'bool8_t*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '6481' => {
                                       'BaseType' => '6048',
                                       'Name' => 'struct variable_field*',
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '65121' => {
-                                       'BaseType' => '11646',
-                                       'Name' => 'bool8_t*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
                           '67' => {
                                     'Name' => 'unsigned short',
                                     'Size' => '2',
                                     'Type' => 'Intrinsic'
                                   },
-                          '68131' => {
-                                       'BaseType' => '64776',
+                          '67802' => {
+                                       'BaseType' => '64447',
                                        'Name' => 'struct variable_field const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69412' => {
-                                       'BaseType' => '63734',
+                          '69083' => {
+                                       'BaseType' => '63405',
                                        'Name' => 'struct pldm_component_parameter_entry*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69642' => {
-                                       'BaseType' => '63630',
+                          '69313' => {
+                                       'BaseType' => '63301',
                                        'Name' => 'struct pldm_get_firmware_parameters_resp*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '69940' => {
+                          '69611' => {
                                        'BaseType' => '2034',
                                        'Name' => 'uint8_t**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70234' => {
-                                       'BaseType' => '63448',
+                          '69905' => {
+                                       'BaseType' => '63119',
                                        'Name' => 'struct pldm_component_image_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70857' => {
-                                       'BaseType' => '63253',
+                          '70528' => {
+                                       'BaseType' => '62924',
                                        'Name' => 'struct pldm_firmware_device_id_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '71009' => {
-                                       'BaseType' => '63117',
+                          '70680' => {
+                                       'BaseType' => '62788',
                                        'Name' => 'struct pldm_package_header_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9632,8 +9600,8 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '77633' => {
-                                       'BaseType' => '77650',
+                          '77304' => {
+                                       'BaseType' => '77321',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -9641,13 +9609,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '77645' => {
-                                       'BaseType' => '77633',
+                          '77316' => {
+                                       'BaseType' => '77304',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '77650' => {
+                          '77321' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -9664,12 +9632,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '78722'
+                                                            'type' => '78393'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '78722'
+                                                            'type' => '78393'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -9677,8 +9645,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '77710' => {
-                                       'BaseType' => '77727',
+                          '77381' => {
+                                       'BaseType' => '77398',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -9686,13 +9654,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '77722' => {
-                                       'BaseType' => '77710',
+                          '77393' => {
+                                       'BaseType' => '77381',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '77727' => {
+                          '77398' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -9714,7 +9682,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '78710'
+                                                            'type' => '78381'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -9732,7 +9700,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '77811' => {
+                          '77482' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -9756,16 +9724,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '77868' => {
-                                       'BaseType' => '77811',
+                          '77539' => {
+                                       'BaseType' => '77482',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '77912' => {
-                                       'BaseType' => '77924',
+                          '77583' => {
+                                       'BaseType' => '77595',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -9773,14 +9741,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '77924' => {
+                          '77595' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '78727'
+                                                            'type' => '78398'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -9793,8 +9761,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '77967' => {
-                                       'BaseType' => '77984',
+                          '77638' => {
+                                       'BaseType' => '77655',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -9802,19 +9770,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '77984' => {
+                          '77655' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '77868'
+                                                            'type' => '77539'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '77868'
+                                                            'type' => '77539'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -9824,12 +9792,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '78727'
+                                                            'type' => '78398'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '78727'
+                                                            'type' => '78398'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -9842,56 +9810,56 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '78710' => {
-                                       'BaseType' => '77727',
+                          '78381' => {
+                                       'BaseType' => '77398',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78722' => {
-                                       'BaseType' => '77710',
+                          '78393' => {
+                                       'BaseType' => '77381',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78727' => {
-                                       'BaseType' => '77967',
+                          '78398' => {
+                                       'BaseType' => '77638',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79152' => {
-                                       'BaseType' => '79157',
+                          '78823' => {
+                                       'BaseType' => '78828',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79157' => {
-                                       'BaseType' => '77868',
+                          '78828' => {
+                                       'BaseType' => '77539',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79227' => {
-                                       'BaseType' => '77912',
+                          '78898' => {
+                                       'BaseType' => '77583',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79506' => {
-                                       'BaseType' => '78727',
+                          '79177' => {
+                                       'BaseType' => '78398',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80251' => {
-                                       'BaseType' => '77645',
+                          '79922' => {
+                                       'BaseType' => '77316',
                                        'Name' => 'pldm_pdr const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80505' => {
-                                       'BaseType' => '77633',
+                          '80176' => {
+                                       'BaseType' => '77304',
                                        'Name' => 'pldm_pdr*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9932,18 +9900,18 @@
                                      'Size' => '4',
                                      'Type' => 'Struct'
                                    },
+                          '86649' => {
+                                       'BaseType' => '77393',
+                                       'Name' => 'pldm_pdr_record const*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '869' => {
                                      'BaseType' => '830',
                                      'Name' => 'struct pldm_msg const',
                                      'Size' => '4',
                                      'Type' => 'Const'
                                    },
-                          '86978' => {
-                                       'BaseType' => '77722',
-                                       'Name' => 'pldm_pdr_record const*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
                           '874' => {
                                      'BaseType' => '168',
                                      'Name' => 'uint8_t[1]',
@@ -9990,7 +9958,7 @@
                                      'Size' => '8',
                                      'Type' => 'Struct'
                                    },
-                          '92533' => {
+                          '92204' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -9998,7 +9966,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92545' => {
+                          '92216' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -10006,14 +9974,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92922' => {
+                          '92593' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '92545'
+                                                            'type' => '92216'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -10026,14 +9994,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '92961' => {
+                          '92632' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '93003'
+                                                            'type' => '92674'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10046,31 +10014,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '93003' => {
-                                       'BaseType' => '92922',
+                          '92674' => {
+                                       'BaseType' => '92593',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '93416' => {
-                                       'BaseType' => '92961',
+                          '93087' => {
+                                       'BaseType' => '92632',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93822' => {
-                                       'BaseType' => '92545',
+                          '93493' => {
+                                       'BaseType' => '92216',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93998' => {
-                                       'BaseType' => '93416',
+                          '93669' => {
+                                       'BaseType' => '93087',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94488' => {
+                          '94159' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10078,7 +10046,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '94500' => {
+                          '94171' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10139,8 +10107,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '94597' => {
-                                       'BaseType' => '94500',
+                          '94268' => {
+                                       'BaseType' => '94171',
                                        '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 857bb4f..fc61933 100644
--- a/abi/x86_64/gcc.dump
+++ b/abi/x86_64/gcc.dump
@@ -211,7 +211,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '110892' => {
+                            '110553' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -230,7 +230,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '111092' => {
+                            '110753' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -251,7 +251,7 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '55965'
+                                                                'type' => '55626'
                                                               },
                                                        '5' => {
                                                                 'name' => 'file_meta_data_1',
@@ -280,7 +280,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '111324' => {
+                            '110985' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -304,7 +304,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '111425' => {
+                            '111086' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -350,7 +350,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '111722' => {
+                            '111383' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -369,7 +369,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '111917' => {
+                            '111578' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -419,7 +419,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '112129' => {
+                            '111790' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -443,7 +443,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '112225' => {
+                            '111886' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -489,7 +489,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '112522' => {
+                            '112183' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -513,7 +513,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '112623' => {
+                            '112284' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -540,7 +540,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '112858' => {
+                            '112519' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -559,22 +559,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_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'
-                                       },
-                            '113048' => {
+                            '112709' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -605,7 +590,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '113190' => {
+                            '112851' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -634,7 +619,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '113305' => {
+                            '112966' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -670,7 +655,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '113575' => {
+                            '11299' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '113236' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -697,7 +697,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '113805' => {
+                            '113466' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -732,7 +732,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '113967' => {
+                            '113628' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -756,7 +756,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '114068' => {
+                            '113729' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -783,7 +783,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '114303' => {
+                            '113964' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -802,7 +802,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '114493' => {
+                            '114154' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -823,7 +823,7 @@
                                                               },
                                                        '4' => {
                                                                 'name' => 'length',
-                                                                'type' => '55965'
+                                                                'type' => '55626'
                                                               }
                                                      },
                                           'Reg' => {
@@ -833,7 +833,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '114635' => {
+                            '114296' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -862,7 +862,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '114750' => {
+                            '114411' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -903,7 +903,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '115035' => {
+                            '114696' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -930,7 +930,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '115265' => {
+                            '114926' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -960,7 +960,7 @@
                                                        '6' => {
                                                                 'name' => 'address',
                                                                 'offset' => '0',
-                                                                'type' => '55965'
+                                                                'type' => '55626'
                                                               }
                                                      },
                                           'Reg' => {
@@ -970,7 +970,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '115442' => {
+                            '115103' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -993,7 +993,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '115657' => {
+                            '115318' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1022,7 +1022,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '115767' => {
+                            '115428' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1049,7 +1049,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '116002' => {
+                            '115663' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1086,7 +1086,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '116157' => {
+                            '115818' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1109,7 +1109,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '116372' => {
+                            '116033' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1141,7 +1141,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '116508' => {
+                            '116169' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1168,7 +1168,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '116743' => {
+                            '116404' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1199,7 +1199,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '116878' => {
+                            '116539' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1239,7 +1239,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '117051' => {
+                            '116712' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1266,7 +1266,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '117277' => {
+                            '116938' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1302,7 +1302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '117574' => {
+                            '117235' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1333,7 +1333,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '117709' => {
+                            '117370' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1362,7 +1362,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '117818' => {
+                            '117479' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1398,7 +1398,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '118077' => {
+                            '117738' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1425,7 +1425,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '118298' => {
+                            '117959' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1450,7 +1450,7 @@
                                                               },
                                                        '5' => {
                                                                 'name' => 'address',
-                                                                'type' => '55965'
+                                                                'type' => '55626'
                                                               }
                                                      },
                                           'Reg' => {
@@ -1460,7 +1460,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '119265' => {
+                            '118926' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1491,7 +1491,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '119513' => {
+                            '119174' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1515,7 +1515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '119596' => {
+                            '119257' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1546,7 +1546,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '119735' => {
+                            '119396' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1569,7 +1569,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '120804' => {
+                            '120465' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -4356,37 +4356,6 @@
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
-                                                               'name' => 'entry',
-                                                               'type' => '166'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entry_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'attr_handle',
-                                                               'type' => '5053'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'attr_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'count',
-                                                               'type' => '168'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'handles',
-                                                               'type' => '6245'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum'
-                                       },
-                            '55199' => {
-                                         'Header' => 'bios_table.h',
-                                         'Param' => {
-                                                      '0' => {
                                                                'name' => 'count',
                                                                'type' => '168'
                                                              }
@@ -4397,7 +4366,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_encode_enum_length'
                                        },
-                            '55248' => {
+                            '54909' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4411,7 +4380,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_type'
                                        },
-                            '55297' => {
+                            '54958' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4425,7 +4394,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_value_entry_decode_attribute_handle'
                                        },
-                            '55844' => {
+                            '55505' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4434,11 +4403,11 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'lower',
-                                                               'type' => '55965'
+                                                               'type' => '55626'
                                                              },
                                                       '2' => {
                                                                'name' => 'upper',
-                                                               'type' => '55965'
+                                                               'type' => '55626'
                                                              },
                                                       '3' => {
                                                                'name' => 'scalar',
@@ -4446,7 +4415,7 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'def',
-                                                               'type' => '55965'
+                                                               'type' => '55626'
                                                              }
                                                     },
                                          'Reg' => {
@@ -4459,7 +4428,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_decode'
                                        },
-                            '55980' => {
+                            '55641' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4472,33 +4441,33 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '56242'
+                                                               'type' => '55903'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_check'
                                        },
-                            '56252' => {
+                            '55913' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '56242'
+                                                               'type' => '55903'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '56551'
+                                                               'type' => '56212'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_info_check'
                                        },
-                            '56556' => {
+                            '56217' => {
                                          'Header' => 'bios_table.h',
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_integer_encode_length'
                                        },
-                            '56718' => {
+                            '56379' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4517,7 +4486,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string'
                                        },
-                            '56914' => {
+                            '56575' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4531,7 +4500,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_min_length'
                                        },
-                            '56983' => {
+                            '56644' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4545,7 +4514,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_max_length'
                                        },
-                            '57052' => {
+                            '56713' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4559,7 +4528,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_string_type'
                                        },
-                            '57121' => {
+                            '56782' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4574,7 +4543,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_decode_def_string_length_check'
                                        },
-                            '57291' => {
+                            '56952' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4587,28 +4556,28 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '57577'
+                                                               'type' => '57238'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_check'
                                        },
-                            '57582' => {
+                            '57243' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'info',
-                                                               'type' => '57577'
+                                                               'type' => '57238'
                                                              },
                                                       '1' => {
                                                                'name' => 'errmsg',
-                                                               'type' => '56551'
+                                                               'type' => '56212'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_info_check'
                                        },
-                            '57851' => {
+                            '57512' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4622,7 +4591,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_string_encode_length'
                                        },
-                            '58083' => {
+                            '57744' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4641,7 +4610,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_indices'
                                        },
-                            '58289' => {
+                            '57950' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4663,7 +4632,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_hdls_check'
                                        },
-                            '58454' => {
+                            '58115' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4678,7 +4647,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_def_num_check'
                                        },
-                            '58613' => {
+                            '58274' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4697,7 +4666,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_decode_pv_num_check'
                                        },
-                            '58673' => {
+                            '58334' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4710,13 +4679,13 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'info',
-                                                               'type' => '58931'
+                                                               'type' => '58592'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_check'
                                        },
-                            '58936' => {
+                            '58597' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4735,7 +4704,7 @@
                                          'Return' => '123',
                                          'ShortName' => 'pldm_bios_table_attr_entry_enum_encode_length'
                                        },
-                            '58996' => {
+                            '58657' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4749,7 +4718,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_string_handle'
                                        },
-                            '59043' => {
+                            '58704' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4763,7 +4732,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_type'
                                        },
-                            '59090' => {
+                            '58751' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4777,7 +4746,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_attr_entry_decode_attribute_handle'
                                        },
-                            '59723' => {
+                            '59384' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4796,7 +4765,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_check'
                                        },
-                            '59889' => {
+                            '59550' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4810,7 +4779,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_string_length'
                                        },
-                            '59936' => {
+                            '59597' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4824,7 +4793,7 @@
                                          'Return' => '5053',
                                          'ShortName' => 'pldm_bios_table_string_entry_decode_handle'
                                        },
-                            '59983' => {
+                            '59644' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4847,7 +4816,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_bios_table_string_entry_encode_check'
                                        },
-                            '60274' => {
+                            '59935' => {
                                          'Header' => 'bios_table.h',
                                          'Param' => {
                                                       '0' => {
@@ -4977,7 +4946,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_table_req'
                                       },
-                            '65867' => {
+                            '65528' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -4988,7 +4957,7 @@
                                          'Return' => '6423',
                                          'ShortName' => 'is_transfer_flag_valid'
                                        },
-                            '66018' => {
+                            '65679' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5005,17 +4974,17 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'non_functioning_component_indication',
-                                                               'type' => '66205'
+                                                               'type' => '65866'
                                                              },
                                                       '4' => {
                                                                'name' => 'non_functioning_component_bitmap',
-                                                               'type' => '66210'
+                                                               'type' => '65871'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_resp'
                                        },
-                            '66220' => {
+                            '65881' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5034,7 +5003,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_req'
                                        },
-                            '66390' => {
+                            '66051' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5058,7 +5027,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_cancel_update_component_resp'
                                        },
-                            '66466' => {
+                            '66127' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5077,30 +5046,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_cancel_update_component_req'
                                        },
-                            '6655' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'instance_id',
-                                                              'type' => '168'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'completion_code',
-                                                              'type' => '168'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'next_transfer_handle',
-                                                              'type' => '180'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'msg',
-                                                              'type' => '1632'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'encode_set_bios_table_resp'
-                                      },
-                            '66636' => {
+                            '66297' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5145,13 +5091,36 @@
                                                       '9' => {
                                                                'name' => 'update_option_flags_enabled',
                                                                'offset' => '24',
-                                                               'type' => '66963'
+                                                               'type' => '66624'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_status_resp'
                                        },
-                            '66973' => {
+                            '6655' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'instance_id',
+                                                              'type' => '168'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'completion_code',
+                                                              'type' => '168'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'next_transfer_handle',
+                                                              'type' => '180'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'msg',
+                                                              'type' => '1632'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'encode_set_bios_table_resp'
+                                      },
+                            '66634' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5170,7 +5139,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_status_req'
                                        },
-                            '67143' => {
+                            '66804' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5198,7 +5167,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_activate_firmware_resp'
                                        },
-                            '67269' => {
+                            '66930' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5221,7 +5190,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_activate_firmware_req'
                                        },
-                            '67511' => {
+                            '67172' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5244,7 +5213,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_apply_complete_resp'
                                        },
-                            '67700' => {
+                            '67361' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5261,7 +5230,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_activation_methods_modification',
-                                                               'type' => '67810'
+                                                               'type' => '67471'
                                                              }
                                                     },
                                          'Reg' => {
@@ -5273,7 +5242,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_apply_complete_req'
                                        },
-                            '67820' => {
+                            '67481' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5296,7 +5265,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_verify_complete_resp'
                                        },
-                            '68009' => {
+                            '67670' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5320,7 +5289,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_verify_complete_req'
                                        },
-                            '68085' => {
+                            '67746' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5343,7 +5312,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_transfer_complete_resp'
                                        },
-                            '68274' => {
+                            '67935' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5367,7 +5336,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_transfer_complete_req'
                                        },
-                            '68350' => {
+                            '68011' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5390,7 +5359,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_request_firmware_data_resp'
                                        },
-                            '68539' => {
+                            '68200' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5419,7 +5388,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_request_firmware_data_req'
                                        },
-                            '68659' => {
+                            '68320' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5444,7 +5413,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'update_option_flags_enabled',
-                                                               'type' => '66963'
+                                                               'type' => '66624'
                                                              },
                                                       '6' => {
                                                                'name' => 'time_before_req_fw_data',
@@ -5455,36 +5424,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_update_component_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'
-                                      },
-                            '68893' => {
+                            '68554' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5524,7 +5464,7 @@
                                                       '6' => {
                                                                'name' => 'update_option_flags',
                                                                'offset' => '0',
-                                                               'type' => '61701'
+                                                               'type' => '61362'
                                                              },
                                                       '7' => {
                                                                'name' => 'comp_ver_str_type',
@@ -5539,13 +5479,42 @@
                                                       '9' => {
                                                                'name' => 'comp_ver_str',
                                                                'offset' => '24',
-                                                               'type' => '69285'
+                                                               'type' => '68946'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'encode_update_component_req'
                                        },
-                            '69295' => {
+                            '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'
+                                      },
+                            '68956' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5572,7 +5541,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pass_component_table_resp'
                                        },
-                            '69494' => {
+                            '69155' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5617,7 +5586,7 @@
                                                       '8' => {
                                                                'name' => 'comp_ver_str',
                                                                'offset' => '16',
-                                                               'type' => '69285'
+                                                               'type' => '68946'
                                                              },
                                                       '9' => {
                                                                'name' => 'msg',
@@ -5628,6 +5597,88 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_pass_component_table_req'
                                        },
+                            '69565' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'msg',
+                                                               'type' => '2077'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'payload_length',
+                                                               'type' => '123'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'completion_code',
+                                                               'type' => '2082'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'fd_meta_data_len',
+                                                               'type' => '8521'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'fd_will_send_pkg_data',
+                                                               'type' => '2082'
+                                                             }
+                                                    },
+                                         'Reg' => {
+                                                    '3' => 'rcx',
+                                                    '4' => 'r8'
+                                                  },
+                                         'Return' => '74',
+                                         'ShortName' => 'decode_request_update_resp'
+                                       },
+                            '69712' => {
+                                         'Header' => 'firmware_update.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'max_transfer_size',
+                                                               'type' => '180'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'num_of_comp',
+                                                               'type' => '5053'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'max_outstanding_transfer_req',
+                                                               'type' => '168'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'pkg_data_len',
+                                                               'type' => '5053'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'comp_image_set_ver_str_type',
+                                                               'type' => '168'
+                                                             },
+                                                      '6' => {
+                                                               'name' => 'comp_image_set_ver_str_len',
+                                                               'offset' => '0',
+                                                               'type' => '168'
+                                                             },
+                                                      '7' => {
+                                                               'name' => 'comp_img_set_ver_str',
+                                                               'offset' => '8',
+                                                               'type' => '68946'
+                                                             },
+                                                      '8' => {
+                                                               'name' => 'msg',
+                                                               'offset' => '16',
+                                                               'type' => '1632'
+                                                             },
+                                                      '9' => {
+                                                               'name' => 'payload_length',
+                                                               'offset' => '24',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_request_update_req'
+                                       },
                             '6984' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -5669,89 +5720,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_table_req'
                                       },
-                            '69904' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'msg',
-                                                               'type' => '2077'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'payload_length',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'completion_code',
-                                                               'type' => '2082'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'fd_meta_data_len',
-                                                               'type' => '8521'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'fd_will_send_pkg_data',
-                                                               'type' => '2082'
-                                                             }
-                                                    },
-                                         'Reg' => {
-                                                    '3' => 'rcx',
-                                                    '4' => 'r8'
-                                                  },
-                                         'Return' => '74',
-                                         'ShortName' => 'decode_request_update_resp'
-                                       },
-                            '70051' => {
-                                         'Header' => 'firmware_update.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'max_transfer_size',
-                                                               'type' => '180'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'num_of_comp',
-                                                               'type' => '5053'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'max_outstanding_transfer_req',
-                                                               'type' => '168'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'pkg_data_len',
-                                                               'type' => '5053'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'comp_image_set_ver_str_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '6' => {
-                                                               'name' => 'comp_image_set_ver_str_len',
-                                                               'offset' => '0',
-                                                               'type' => '168'
-                                                             },
-                                                      '7' => {
-                                                               'name' => 'comp_img_set_ver_str',
-                                                               'offset' => '8',
-                                                               'type' => '69285'
-                                                             },
-                                                      '8' => {
-                                                               'name' => 'msg',
-                                                               'offset' => '16',
-                                                               'type' => '1632'
-                                                             },
-                                                      '9' => {
-                                                               'name' => 'payload_length',
-                                                               'offset' => '24',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_request_update_req'
-                                       },
-                            '70419' => {
+                            '70080' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5764,7 +5733,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'component_data',
-                                                               'type' => '70587'
+                                                               'type' => '70248'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_ver_str',
@@ -5781,7 +5750,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp_comp_entry'
                                        },
-                            '70597' => {
+                            '70258' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5794,7 +5763,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'resp_data',
-                                                               'type' => '70817'
+                                                               'type' => '70478'
                                                              },
                                                       '3' => {
                                                                'name' => 'active_comp_image_set_ver_str',
@@ -5812,7 +5781,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_firmware_parameters_resp'
                                        },
-                            '70822' => {
+                            '70483' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5831,7 +5800,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_firmware_parameters_req'
                                        },
-                            '70962' => {
+                            '70623' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5856,7 +5825,7 @@
                                                              },
                                                       '5' => {
                                                                'name' => 'descriptor_data',
-                                                               'type' => '71118'
+                                                               'type' => '70779'
                                                              }
                                                     },
                                          'Reg' => {
@@ -5867,7 +5836,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_query_device_identifiers_resp'
                                        },
-                            '71128' => {
+                            '70789' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5886,7 +5855,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_query_device_identifiers_req'
                                        },
-                            '71268' => {
+                            '70929' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5899,7 +5868,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'pldm_comp_image_info',
-                                                               'type' => '71415'
+                                                               'type' => '71076'
                                                              },
                                                       '3' => {
                                                                'name' => 'comp_version_str',
@@ -5909,7 +5878,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_pldm_comp_image_info'
                                        },
-                            '71420' => {
+                            '71081' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5936,7 +5905,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_vendor_defined_descriptor_value'
                                        },
-                            '71602' => {
+                            '71263' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5959,7 +5928,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_descriptor_type_length_value'
                                        },
-                            '71774' => {
+                            '71435' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -5976,7 +5945,7 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'fw_device_id_record',
-                                                               'type' => '72031'
+                                                               'type' => '71692'
                                                              },
                                                       '4' => {
                                                                'name' => 'applicable_components',
@@ -6000,7 +5969,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_firmware_device_id_record'
                                        },
-                            '72036' => {
+                            '71697' => {
                                          'Header' => 'firmware_update.h',
                                          'Param' => {
                                                       '0' => {
@@ -6013,7 +5982,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'package_header_info',
-                                                               'type' => '72183'
+                                                               'type' => '71844'
                                                              },
                                                       '3' => {
                                                                'name' => 'package_version_str',
@@ -6046,7 +6015,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_resp'
                                       },
-                            '74341' => {
+                            '74002' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6073,7 +6042,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_set_fru_record_table_resp'
                                        },
-                            '74581' => {
+                            '74242' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6104,7 +6073,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_set_fru_record_table_req'
                                        },
-                            '74748' => {
+                            '74409' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6140,7 +6109,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '74978' => {
+                            '74639' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6181,38 +6150,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '7515' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'msg',
-                                                              'type' => '2077'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'transfer_handle',
-                                                              'type' => '2087'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'transfer_flag',
-                                                              'type' => '2082'
-                                                            },
-                                                     '4' => {
-                                                              'name' => 'attribute',
-                                                              'type' => '6645'
-                                                            }
-                                                   },
-                                        'Reg' => {
-                                                   '3' => 'rcx',
-                                                   '4' => 'r8'
-                                                 },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_set_bios_attribute_current_value_req'
-                                      },
-                            '75226' => {
+                            '74887' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6239,7 +6177,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '75461' => {
+                            '75122' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6274,7 +6212,38 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_resp'
                                        },
-                            '75628' => {
+                            '7515' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'msg',
+                                                              'type' => '2077'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'transfer_handle',
+                                                              'type' => '2087'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'transfer_flag',
+                                                              'type' => '2082'
+                                                            },
+                                                     '4' => {
+                                                              'name' => 'attribute',
+                                                              'type' => '6645'
+                                                            }
+                                                   },
+                                        'Reg' => {
+                                                   '3' => 'rcx',
+                                                   '4' => 'r8'
+                                                 },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_set_bios_attribute_current_value_req'
+                                      },
+                            '75289' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6315,7 +6284,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_resp'
                                        },
-                            '75946' => {
+                            '75607' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6360,7 +6329,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '76148' => {
+                            '75809' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6406,7 +6375,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_req'
                                        },
-                            '76445' => {
+                            '76106' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6442,36 +6411,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'get_fru_record_by_option_check'
                                        },
-                            '7662' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'msg',
-                                                              'type' => '2077'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'completion_code',
-                                                              'type' => '2082'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'next_transfer_handle',
-                                                              'type' => '2087'
-                                                            }
-                                                   },
-                                        'Reg' => {
-                                                   '0' => 'rdi',
-                                                   '1' => 'rsi',
-                                                   '2' => 'rdx',
-                                                   '3' => 'rcx'
-                                                 },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
-                                      },
-                            '76868' => {
+                            '76529' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6507,7 +6447,36 @@
                                          'Return' => '1',
                                          'ShortName' => 'get_fru_record_by_option'
                                        },
-                            '77294' => {
+                            '7662' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'msg',
+                                                              'type' => '2077'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'completion_code',
+                                                              'type' => '2082'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'next_transfer_handle',
+                                                              'type' => '2087'
+                                                            }
+                                                   },
+                                        'Reg' => {
+                                                   '0' => 'rdi',
+                                                   '1' => 'rsi',
+                                                   '2' => 'rdx',
+                                                   '3' => 'rcx'
+                                                 },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
+                                      },
+                            '76955' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6553,7 +6522,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
-                            '77542' => {
+                            '77203' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6580,43 +6549,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_resp'
                                        },
-                            '7772' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'instance_id',
-                                                              'type' => '168'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'transfer_handle',
-                                                              'type' => '180'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'transfer_flag',
-                                                              'type' => '168'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'attribute_data',
-                                                              'type' => '6245'
-                                                            },
-                                                     '4' => {
-                                                              'name' => 'attribute_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '5' => {
-                                                              'name' => 'msg',
-                                                              'type' => '1632'
-                                                            },
-                                                     '6' => {
-                                                              'name' => 'payload_length',
-                                                              'offset' => '0',
-                                                              'type' => '123'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'encode_set_bios_attribute_current_value_req'
-                                      },
-                            '77763' => {
+                            '77424' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6645,7 +6578,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '77867' => {
+                            '77528' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6696,7 +6629,43 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '78170' => {
+                            '7772' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'instance_id',
+                                                              'type' => '168'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'transfer_handle',
+                                                              'type' => '180'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'transfer_flag',
+                                                              'type' => '168'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'attribute_data',
+                                                              'type' => '6245'
+                                                            },
+                                                     '4' => {
+                                                              'name' => 'attribute_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '5' => {
+                                                              'name' => 'msg',
+                                                              'type' => '1632'
+                                                            },
+                                                     '6' => {
+                                                              'name' => 'payload_length',
+                                                              'offset' => '0',
+                                                              'type' => '123'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'encode_set_bios_attribute_current_value_req'
+                                      },
+                            '77831' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6751,7 +6720,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '78380' => {
+                            '78041' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6770,7 +6739,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_req'
                                        },
-                            '80023' => {
+                            '79684' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6787,18 +6756,18 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'entities',
-                                                               'type' => '80336'
+                                                               'type' => '79997'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_extract'
                                        },
-                            '80356' => {
+                            '80017' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80405'
+                                                               'type' => '80066'
                                                              }
                                                     },
                                          'Reg' => {
@@ -6807,45 +6776,45 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_empty_entity_assoc_tree'
                                        },
-                            '80410' => {
+                            '80071' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80405'
+                                                               'type' => '80066'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy_root'
                                        },
-                            '80473' => {
+                            '80134' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'org_tree',
-                                                               'type' => '80405'
+                                                               'type' => '80066'
                                                              },
                                                       '1' => {
                                                                'name' => 'new_tree',
-                                                               'type' => '80405'
+                                                               'type' => '80066'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_copy_root'
                                        },
-                            '80689' => {
+                            '80350' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80405'
+                                                               'type' => '80066'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '80341'
+                                                               'type' => '80002'
                                                              }
                                                     },
-                                         'Return' => '79911',
+                                         'Return' => '79572',
                                          'ShortName' => 'pldm_entity_association_tree_find'
                                        },
                             '8072' => {
@@ -6884,23 +6853,23 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '81471' => {
+                            '81132' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81720'
+                                                               'type' => '81381'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_remote_pdrs'
                                        },
-                            '81725' => {
+                            '81386' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81720'
+                                                               'type' => '81381'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6910,39 +6879,39 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
-                            '81994' => {
+                            '81655' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80405'
+                                                               'type' => '80066'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79052'
+                                                               'type' => '78713'
                                                              },
                                                       '2' => {
                                                                'name' => 'node',
-                                                               'type' => '80684'
+                                                               'type' => '80345'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_find_entity_ref_in_tree'
                                        },
-                            '82506' => {
+                            '82167' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79911'
+                                                               'type' => '79572'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81720'
+                                                               'type' => '81381'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '80336'
+                                                               'type' => '79997'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6960,20 +6929,20 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '82724' => {
+                            '82385' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79911'
+                                                               'type' => '79572'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81720'
+                                                               'type' => '81381'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '80336'
+                                                               'type' => '79997'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6991,16 +6960,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node'
                                        },
-                            '83060' => {
+                            '82721' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80405'
+                                                               'type' => '80066'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '81720'
+                                                               'type' => '81381'
                                                              },
                                                       '2' => {
                                                                'name' => 'is_remote',
@@ -7045,16 +7014,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '84532' => {
+                            '84193' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'parent',
-                                                               'type' => '79911'
+                                                               'type' => '79572'
                                                              },
                                                       '1' => {
                                                                'name' => 'node',
-                                                               'type' => '80341'
+                                                               'type' => '80002'
                                                              }
                                                     },
                                          'Reg' => {
@@ -7063,12 +7032,12 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '84621' => {
+                            '84282' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79911'
+                                                               'type' => '79572'
                                                              },
                                                       '1' => {
                                                                'name' => 'association_type',
@@ -7078,50 +7047,69 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '84836' => {
+                            '84497' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79911'
+                                                               'type' => '79572'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '84991' => {
+                            '84652' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79911'
+                                                               'type' => '79572'
                                                              }
                                                     },
-                                         'Return' => '79052',
+                                         'Return' => '78713',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '85146' => {
+                            '84807' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '79911'
+                                                               'type' => '79572'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '85301' => {
+                            '84962' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80405'
+                                                               'type' => '80066'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
+                            '85141' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '80066'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'entities',
+                                                               'type' => '79997'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'size',
+                                                               'type' => '9084'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_tree_visit'
+                                       },
                             '8531' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7157,35 +7145,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '85480' => {
+                            '86103' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '80405'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entities',
-                                                               'type' => '80336'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'size',
-                                                               'type' => '9084'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_tree_visit'
-                                       },
-                            '86442' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '80405'
+                                                               'type' => '80066'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '80341'
+                                                               'type' => '80002'
                                                              },
                                                       '2' => {
                                                                'name' => 'entity_instance_number',
@@ -7193,21 +7162,32 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'parent',
-                                                               'type' => '79911'
+                                                               'type' => '79572'
                                                              },
                                                       '4' => {
                                                                'name' => 'association_type',
                                                                'type' => '168'
                                                              }
                                                     },
-                                         'Return' => '79911',
+                                         'Return' => '79572',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
-                            '86875' => {
+                            '86536' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '80405',
+                                         'Return' => '80066',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
+                            '86770' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '79572'
+                                                             }
+                                                    },
+                                         'Return' => '78713',
+                                         'ShortName' => 'pldm_entity_extract'
+                                       },
                             '8693' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7235,23 +7215,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '87109' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '79911'
-                                                             }
-                                                    },
-                                         'Return' => '79052',
-                                         'ShortName' => 'pldm_entity_extract'
-                                       },
-                            '87904' => {
+                            '87565' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81466'
+                                                               'type' => '81127'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7273,12 +7242,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
-                            '88264' => {
+                            '87925' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81466'
+                                                               'type' => '81127'
                                                              },
                                                       '1' => {
                                                                'name' => 'fru_rsi',
@@ -7301,15 +7270,15 @@
                                                                'type' => '8521'
                                                              }
                                                     },
-                                         'Return' => '88249',
+                                         'Return' => '87910',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '88618' => {
+                            '88279' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81720'
+                                                               'type' => '81381'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7340,12 +7309,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '88956' => {
+                            '88617' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81720'
+                                                               'type' => '81381'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7375,6 +7344,32 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set'
                                        },
+                            '88970' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'record',
+                                                               'type' => '87910'
+                                                             }
+                                                    },
+                                         'Return' => '6423',
+                                         'ShortName' => 'pldm_pdr_record_is_remote'
+                                       },
+                            '89125' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '81127'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'record',
+                                                               'type' => '87910'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_get_record_handle'
+                                       },
                             '8922' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7410,60 +7405,34 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '89309' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'record',
-                                                               'type' => '88249'
-                                                             }
-                                                    },
-                                         'Return' => '6423',
-                                         'ShortName' => 'pldm_pdr_record_is_remote'
-                                       },
-                            '89464' => {
+                            '89343' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81466'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'record',
-                                                               'type' => '88249'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_get_record_handle'
-                                       },
-                            '89682' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '81466'
+                                                               'type' => '81127'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '89813' => {
+                            '89474' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81466'
+                                                               'type' => '81127'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '89944' => {
+                            '89605' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81466'
+                                                               'type' => '81127'
                                                              },
                                                       '1' => {
                                                                'name' => 'pdr_type',
@@ -7471,11 +7440,11 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '88249'
+                                                               'type' => '87910'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
-                                                               'type' => '71118'
+                                                               'type' => '70779'
                                                              },
                                                       '4' => {
                                                                'name' => 'size',
@@ -7487,23 +7456,23 @@
                                                     '3' => 'rcx',
                                                     '4' => 'r8'
                                                   },
-                                         'Return' => '88249',
+                                         'Return' => '87910',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
-                            '90116' => {
+                            '89777' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81466'
+                                                               'type' => '81127'
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '88249'
+                                                               'type' => '87910'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '71118'
+                                                               'type' => '70779'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7514,15 +7483,15 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '88249',
+                                         'Return' => '87910',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '90283' => {
+                            '89944' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81466'
+                                                               'type' => '81127'
                                                              },
                                                       '1' => {
                                                                'name' => 'record_handle',
@@ -7530,7 +7499,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
-                                                               'type' => '71118'
+                                                               'type' => '70779'
                                                              },
                                                       '3' => {
                                                                'name' => 'size',
@@ -7541,31 +7510,31 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '88249',
+                                         'Return' => '87910',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '90451' => {
+                            '90112' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81720'
+                                                               'type' => '81381'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '90606' => {
+                            '90267' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '81720',
+                                         'Return' => '81381',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '90678' => {
+                            '90339' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '81720'
+                                                               'type' => '81381'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7591,6 +7560,37 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_check'
                                        },
+                            '90777' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '81381'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'data',
+                                                               'type' => '6245'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'size',
+                                                               'type' => '180'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'record_handle',
+                                                               'type' => '180'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'is_remote',
+                                                               'type' => '6423'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '5053'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_add'
+                                       },
                             '9094' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7622,36 +7622,27 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '91116' => {
-                                         'Header' => 'pdr.h',
+                            '92276' => {
+                                         'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '81720'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'data',
-                                                               'type' => '6245'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'size',
+                                                               'name' => 'dec',
                                                                'type' => '180'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'record_handle',
-                                                               'type' => '180'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6423'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '5053'
                                                              }
                                                     },
                                          'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_add'
+                                         'ShortName' => 'dec2bcd32'
+                                       },
+                            '92405' => {
+                                         'Header' => 'utils.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'bcd',
+                                                               'type' => '180'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'bcd2dec32'
                                        },
                             '9241' => {
                                         'Header' => 'bios.h',
@@ -7680,29 +7671,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '92615' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'dec',
-                                                               'type' => '180'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'dec2bcd32'
-                                       },
-                            '92744' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'bcd',
-                                                               'type' => '180'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'bcd2dec32'
-                                       },
-                            '93145' => {
+                            '92806' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7724,7 +7693,7 @@
                                          'Return' => '12557',
                                          'ShortName' => 'ver2str'
                                        },
-                            '93273' => {
+                            '92934' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7739,25 +7708,44 @@
                                          'Return' => '168',
                                          'ShortName' => 'crc8'
                                        },
-                            '94531' => {
+                            '94192' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94754'
+                                                               'type' => '94415'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '93853'
+                                                               'type' => '93514'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '93865'
+                                                               'type' => '93526'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
+                            '94420' => {
+                                         'Header' => 'instance-id.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'ctx',
+                                                               'type' => '94415'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'tid',
+                                                               'type' => '93514'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'iid',
+                                                               'type' => '94841'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_instance_id_alloc'
+                                       },
                             '9464' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7794,53 +7782,34 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '94759' => {
+                            '94846' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94754'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'tid',
-                                                               'type' => '93853'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'iid',
-                                                               'type' => '95180'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_instance_id_alloc'
-                                       },
-                            '95185' => {
-                                         'Header' => 'instance-id.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'ctx',
-                                                               'type' => '94754'
+                                                               'type' => '94415'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '95270' => {
+                            '94931' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '95356'
+                                                               'type' => '95017'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '95361' => {
+                            '95022' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '95356'
+                                                               'type' => '95017'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7850,12 +7819,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init'
                                        },
-                            '96534' => {
+                            '96195' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95872'
+                                                               'type' => '95533'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7870,15 +7839,15 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '95981',
+                                         'Return' => '95642',
                                          'ShortName' => 'pldm_send'
                                        },
-                            '96953' => {
+                            '96614' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95872'
+                                                               'type' => '95533'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7894,22 +7863,22 @@
                                                              },
                                                       '4' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '71118'
+                                                               'type' => '70779'
                                                              },
                                                       '5' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '95981',
+                                         'Return' => '95642',
                                          'ShortName' => 'pldm_send_recv'
                                        },
-                            '97436' => {
+                            '97097' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '95872'
+                                                               'type' => '95533'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7921,16 +7890,39 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'pldm_resp_msg',
-                                                               'type' => '71118'
+                                                               'type' => '70779'
                                                              },
                                                       '4' => {
                                                                'name' => 'resp_msg_len',
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '95981',
+                                         'Return' => '95642',
                                          'ShortName' => 'pldm_recv'
                                        },
+                            '97323' => {
+                                         'Header' => 'pldm.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'eid',
+                                                               'type' => '95533'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'mctp_fd',
+                                                               'type' => '74'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'pldm_resp_msg',
+                                                               'type' => '70779'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'resp_msg_len',
+                                                               'type' => '9084'
+                                                             }
+                                                    },
+                                         'Return' => '95642',
+                                         'ShortName' => 'pldm_recv_any'
+                                       },
                             '9755' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7955,32 +7947,9 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_date_time_resp'
                                       },
-                            '97662' => {
+                            '97768' => {
                                          'Header' => 'pldm.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'eid',
-                                                               'type' => '95872'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'mctp_fd',
-                                                               'type' => '74'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'pldm_resp_msg',
-                                                               'type' => '71118'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'resp_msg_len',
-                                                               'type' => '9084'
-                                                             }
-                                                    },
-                                         'Return' => '95981',
-                                         'ShortName' => 'pldm_recv_any'
-                                       },
-                            '98107' => {
-                                         'Header' => 'pldm.h',
-                                         'Return' => '95981',
+                                         'Return' => '95642',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9827' => {
@@ -8241,7 +8210,6 @@
                                                  'pldm_bios_table_attr_value_entry_decode_attribute_handle' => 1,
                                                  'pldm_bios_table_attr_value_entry_decode_attribute_type' => 1,
                                                  'pldm_bios_table_attr_value_entry_decode_handle' => 1,
-                                                 'pldm_bios_table_attr_value_entry_encode_enum' => 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,
@@ -9621,7 +9589,7 @@
                                      },
                           '47725' => {
                                        'Header' => undef,
-                                       'Line' => '982',
+                                       'Line' => '971',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'table_data',
@@ -9726,31 +9694,31 @@
                                     'Size' => '1',
                                     'Type' => 'Intrinsic'
                                   },
-                          '55965' => {
+                          '55626' => {
                                        'BaseType' => '46642',
                                        'Name' => 'uint64_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '56242' => {
+                          '55903' => {
                                        'BaseType' => '47301',
                                        'Name' => 'struct pldm_bios_table_attr_entry_integer_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '56551' => {
+                          '56212' => {
                                        'BaseType' => '12552',
                                        'Name' => 'char const**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '57577' => {
+                          '57238' => {
                                        'BaseType' => '47193',
                                        'Name' => 'struct pldm_bios_table_attr_entry_string_info const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '58931' => {
+                          '58592' => {
                                        'BaseType' => '47059',
                                        'Name' => 'struct pldm_bios_table_attr_entry_enum_info const*',
                                        'Size' => '8',
@@ -9781,14 +9749,14 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '64198' => {
+                          '63859' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '329',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'uuid',
                                                             'offset' => '0',
-                                                            'type' => '64302'
+                                                            'type' => '63963'
                                                           },
                                                    '1' => {
                                                             'name' => 'package_header_format_version',
@@ -9825,18 +9793,13 @@
                                        'Size' => '36',
                                        'Type' => 'Struct'
                                      },
-                          '6423' => {
-                                      'Name' => '_Bool',
-                                      'Size' => '1',
-                                      'Type' => 'Intrinsic'
-                                    },
-                          '64302' => {
+                          '63963' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[16]',
                                        'Size' => '16',
                                        'Type' => 'Array'
                                      },
-                          '64334' => {
+                          '63995' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '343',
                                        'Memb' => {
@@ -9853,7 +9816,7 @@
                                                    '2' => {
                                                             'name' => 'device_update_option_flags',
                                                             'offset' => '3',
-                                                            'type' => '61701'
+                                                            'type' => '61362'
                                                           },
                                                    '3' => {
                                                             'name' => 'comp_image_set_version_string_type',
@@ -9875,7 +9838,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '64529' => {
+                          '64190' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '377',
                                        'Memb' => {
@@ -9897,12 +9860,12 @@
                                                    '3' => {
                                                             'name' => 'comp_options',
                                                             'offset' => '8',
-                                                            'type' => '61203'
+                                                            'type' => '60864'
                                                           },
                                                    '4' => {
                                                             'name' => 'requested_comp_activation_method',
                                                             'offset' => '16',
-                                                            'type' => '61203'
+                                                            'type' => '60864'
                                                           },
                                                    '5' => {
                                                             'name' => 'comp_location_offset',
@@ -9929,7 +9892,12 @@
                                        'Size' => '22',
                                        'Type' => 'Struct'
                                      },
-                          '64711' => {
+                          '6423' => {
+                                      'Name' => '_Bool',
+                                      'Size' => '1',
+                                      'Type' => 'Intrinsic'
+                                    },
+                          '64372' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '403',
                                        'Memb' => {
@@ -9941,7 +9909,7 @@
                                                    '1' => {
                                                             'name' => 'capabilities_during_update',
                                                             'offset' => '1',
-                                                            'type' => '61701'
+                                                            'type' => '61362'
                                                           },
                                                    '2' => {
                                                             'name' => 'comp_count',
@@ -9973,7 +9941,7 @@
                                        'Size' => '11',
                                        'Type' => 'Struct'
                                      },
-                          '64815' => {
+                          '64476' => {
                                        'Header' => 'firmware_update.h',
                                        'Line' => '417',
                                        'Memb' => {
@@ -9990,17 +9958,17 @@
                                                    '10' => {
                                                              'name' => 'pending_comp_release_date',
                                                              'offset' => '37',
-                                                             'type' => '64997'
+                                                             'type' => '64658'
                                                            },
                                                    '11' => {
                                                              'name' => 'comp_activation_methods',
                                                              'offset' => '51',
-                                                             'type' => '61203'
+                                                             'type' => '60864'
                                                            },
                                                    '12' => {
                                                              'name' => 'capabilities_during_update',
                                                              'offset' => '53',
-                                                             'type' => '61701'
+                                                             'type' => '61362'
                                                            },
                                                    '2' => {
                                                             'name' => 'comp_classification_index',
@@ -10025,7 +9993,7 @@
                                                    '6' => {
                                                             'name' => 'active_comp_release_date',
                                                             'offset' => '17',
-                                                            'type' => '64997'
+                                                            'type' => '64658'
                                                           },
                                                    '7' => {
                                                             'name' => 'pending_comp_comparison_stamp',
@@ -10047,19 +10015,19 @@
                                        'Size' => '39',
                                        'Type' => 'Struct'
                                      },
-                          '64997' => {
+                          '64658' => {
                                        'BaseType' => '168',
                                        'Name' => 'uint8_t[8]',
                                        'Size' => '8',
                                        'Type' => 'Array'
                                      },
-                          '65857' => {
+                          '65518' => {
                                        'BaseType' => '6206',
                                        'Name' => 'struct variable_field const',
                                        'Size' => '16',
                                        'Type' => 'Const'
                                      },
-                          '66205' => {
+                          '65866' => {
                                        'BaseType' => '11999',
                                        'Name' => 'bool8_t*',
                                        'Size' => '8',
@@ -10076,30 +10044,36 @@
                                     'Size' => '2',
                                     'Type' => 'Intrinsic'
                                   },
-                          '69285' => {
-                                       'BaseType' => '65857',
+                          '68946' => {
+                                       'BaseType' => '65518',
                                        'Name' => 'struct variable_field const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70587' => {
-                                       'BaseType' => '64815',
+                          '70248' => {
+                                       'BaseType' => '64476',
                                        'Name' => 'struct pldm_component_parameter_entry*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '70817' => {
-                                       'BaseType' => '64711',
+                          '70478' => {
+                                       'BaseType' => '64372',
                                        'Name' => 'struct pldm_get_firmware_parameters_resp*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '71118' => {
+                          '70779' => {
                                        'BaseType' => '2082',
                                        'Name' => 'uint8_t**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
+                          '71076' => {
+                                       'BaseType' => '64190',
+                                       'Name' => 'struct pldm_component_image_information*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '714' => {
                                      'Header' => 'base.h',
                                      'Line' => '117',
@@ -10114,20 +10088,14 @@
                                      'Size' => '3',
                                      'Type' => 'Struct'
                                    },
-                          '71415' => {
-                                       'BaseType' => '64529',
-                                       'Name' => 'struct pldm_component_image_information*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
-                          '72031' => {
-                                       'BaseType' => '64334',
+                          '71692' => {
+                                       'BaseType' => '63995',
                                        'Name' => 'struct pldm_firmware_device_id_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '72183' => {
-                                       'BaseType' => '64198',
+                          '71844' => {
+                                       'BaseType' => '63859',
                                        'Name' => 'struct pldm_package_header_information*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10137,8 +10105,8 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '78817' => {
-                                       'BaseType' => '78834',
+                          '78478' => {
+                                       'BaseType' => '78495',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -10146,13 +10114,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '78829' => {
-                                       'BaseType' => '78817',
+                          '78490' => {
+                                       'BaseType' => '78478',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '78834' => {
+                          '78495' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -10169,12 +10137,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '79906'
+                                                            'type' => '79567'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '79906'
+                                                            'type' => '79567'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -10182,8 +10150,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '78894' => {
-                                       'BaseType' => '78911',
+                          '78555' => {
+                                       'BaseType' => '78572',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -10191,13 +10159,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '78906' => {
-                                       'BaseType' => '78894',
+                          '78567' => {
+                                       'BaseType' => '78555',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '78911' => {
+                          '78572' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -10219,7 +10187,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '79894'
+                                                            'type' => '79555'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -10237,7 +10205,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '78995' => {
+                          '78656' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -10261,16 +10229,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '79052' => {
-                                       'BaseType' => '78995',
+                          '78713' => {
+                                       'BaseType' => '78656',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '79096' => {
-                                       'BaseType' => '79108',
+                          '78757' => {
+                                       'BaseType' => '78769',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -10278,14 +10246,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '79108' => {
+                          '78769' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '79911'
+                                                            'type' => '79572'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -10298,8 +10266,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '79151' => {
-                                       'BaseType' => '79168',
+                          '78812' => {
+                                       'BaseType' => '78829',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -10307,19 +10275,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '79168' => {
+                          '78829' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '79052'
+                                                            'type' => '78713'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '79052'
+                                                            'type' => '78713'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -10329,12 +10297,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '79911'
+                                                            'type' => '79572'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '79911'
+                                                            'type' => '79572'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -10347,44 +10315,44 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '79894' => {
-                                       'BaseType' => '78911',
+                          '79555' => {
+                                       'BaseType' => '78572',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79906' => {
-                                       'BaseType' => '78894',
+                          '79567' => {
+                                       'BaseType' => '78555',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79911' => {
-                                       'BaseType' => '79151',
+                          '79572' => {
+                                       'BaseType' => '78812',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80336' => {
-                                       'BaseType' => '80341',
+                          '79997' => {
+                                       'BaseType' => '80002',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80341' => {
-                                       'BaseType' => '79052',
+                          '80002' => {
+                                       'BaseType' => '78713',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80405' => {
-                                       'BaseType' => '79096',
+                          '80066' => {
+                                       'BaseType' => '78757',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80684' => {
-                                       'BaseType' => '79911',
+                          '80345' => {
+                                       'BaseType' => '79572',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10394,14 +10362,14 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '81466' => {
-                                       'BaseType' => '78829',
+                          '81127' => {
+                                       'BaseType' => '78490',
                                        'Name' => 'pldm_pdr const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '81720' => {
-                                       'BaseType' => '78817',
+                          '81381' => {
+                                       'BaseType' => '78478',
                                        'Name' => 'pldm_pdr*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10449,8 +10417,8 @@
                                      'Size' => '1',
                                      'Type' => 'Array'
                                    },
-                          '88249' => {
-                                       'BaseType' => '78906',
+                          '87910' => {
+                                       'BaseType' => '78567',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10495,7 +10463,7 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '93853' => {
+                          '93514' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -10503,7 +10471,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93865' => {
+                          '93526' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -10511,14 +10479,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '94245' => {
+                          '93906' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '93865'
+                                                            'type' => '93526'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -10531,14 +10499,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '94284' => {
+                          '93945' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '94326'
+                                                            'type' => '93987'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10551,31 +10519,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '94326' => {
-                                       'BaseType' => '94245',
+                          '93987' => {
+                                       'BaseType' => '93906',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '94754' => {
-                                       'BaseType' => '94284',
+                          '94415' => {
+                                       'BaseType' => '93945',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '95180' => {
-                                       'BaseType' => '93865',
+                          '94841' => {
+                                       'BaseType' => '93526',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '95356' => {
-                                       'BaseType' => '94754',
+                          '95017' => {
+                                       'BaseType' => '94415',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '95872' => {
+                          '95533' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10583,7 +10551,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '95884' => {
+                          '95545' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10644,8 +10612,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '95981' => {
-                                       'BaseType' => '95884',
+                          '95642' => {
+                                       'BaseType' => '95545',
                                        '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 b492f2d..ce042ac 100644
--- a/include/libpldm/bios_table.h
+++ b/include/libpldm/bios_table.h
@@ -450,21 +450,6 @@
  */
 size_t pldm_bios_table_attr_value_entry_encode_enum_length(uint8_t count);
 
-/** @brief Create an attribute value entry(type: enum)
- *  @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] count - Total number of current values for this enum attribute
- *  @param[in] handle_indexes - Index into the array(provided in the BIOS
- * Attribute Table) of the possible values of string handles for this attribute.
- */
-void pldm_bios_table_attr_value_entry_encode_enum(
-	void *entry, size_t entry_length, uint16_t attr_handle,
-	uint8_t attr_type, uint8_t count, const uint8_t *handles);
-
 /** @brief Get number of current values for the enum entry
  *  @param[in] entry - Pointer to bios attribute value table entry
  *  @return Total number of current values for this enumeration
diff --git a/src/bios_table.c b/src/bios_table.c
index 347cbb0..7b845bc 100644
--- a/src/bios_table.c
+++ b/src/bios_table.c
@@ -662,17 +662,6 @@
 	       sizeof(count) + count;
 }
 
-LIBPLDM_ABI_DEPRECATED
-void pldm_bios_table_attr_value_entry_encode_enum(
-	void *entry, size_t entry_length, uint16_t attr_handle,
-	uint8_t attr_type, uint8_t count, const uint8_t *handles)
-{
-	int rc = pldm_bios_table_attr_value_entry_encode_enum_check(
-		entry, entry_length, attr_handle, attr_type, count, handles);
-	(void)rc;
-	assert(rc == PLDM_SUCCESS);
-}
-
 LIBPLDM_ABI_STABLE
 uint8_t pldm_bios_table_attr_value_entry_enum_decode_number(
 	const struct pldm_bios_attr_val_table_entry *entry)
diff --git a/tests/libpldm_bios_table_test.cpp b/tests/libpldm_bios_table_test.cpp
index 76cc9d4..5746bd8 100644
--- a/tests/libpldm_bios_table_test.cpp
+++ b/tests/libpldm_bios_table_test.cpp
@@ -584,14 +584,14 @@
     EXPECT_EQ(length, enumEntry.size());
     std::vector<uint8_t> encodeEntry(length, 0);
     uint8_t handles[] = {0, 1};
-    pldm_bios_table_attr_value_entry_encode_enum(
-        encodeEntry.data(), encodeEntry.size(), 0, 0, 2, handles);
+    ASSERT_EQ(pldm_bios_table_attr_value_entry_encode_enum_check(
+                  encodeEntry.data(), encodeEntry.size(), 0, 0, 2, handles),
+              PLDM_SUCCESS);
     EXPECT_EQ(encodeEntry, enumEntry);
 
-    EXPECT_DEATH(
-        pldm_bios_table_attr_value_entry_encode_enum(
-            encodeEntry.data(), encodeEntry.size() - 1, 0, 0, 2, handles),
-        "rc == PLDM_SUCCESS");
+    EXPECT_NE(pldm_bios_table_attr_value_entry_encode_enum_check(
+                  encodeEntry.data(), encodeEntry.size() - 1, 0, 0, 2, handles),
+              PLDM_SUCCESS);
 
     auto rc = pldm_bios_table_attr_value_entry_encode_enum_check(
         encodeEntry.data(), encodeEntry.size(), 0, PLDM_BIOS_ENUMERATION, 2,