diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ff1aaa..9903510 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,10 @@
 
 ## [Unreleased]
 
+### Removed
+
+1. pdr: Remove pldm_entity_association_pdr_add()
+
 ## [0.5.0] - 2023-08-09
 
 ### Added
diff --git a/abi/aarch64/gcc.dump b/abi/aarch64/gcc.dump
index 344d8c8..af7e50a 100644
--- a/abi/aarch64/gcc.dump
+++ b/abi/aarch64/gcc.dump
@@ -158,7 +158,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '109458' => {
+                            '109183' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -177,7 +177,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '109641' => {
+                            '109366' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -221,22 +221,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '10972' => {
-                                         'Header' => 'bios.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_date_time_req'
-                                       },
-                            '109859' => {
+                            '109584' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -255,7 +240,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '109966' => {
+                            '109691' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -298,7 +283,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '110259' => {
+                            '10972' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '109984' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -317,7 +317,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '110437' => {
+                            '110162' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -361,7 +361,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '110635' => {
+                            '110360' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -380,7 +380,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '110737' => {
+                            '110462' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -423,7 +423,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '111030' => {
+                            '110755' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -442,7 +442,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '111137' => {
+                            '110862' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -469,7 +469,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '111355' => {
+                            '111080' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -488,7 +488,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '111528' => {
+                            '111253' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -515,7 +515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '111664' => {
+                            '111389' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -538,7 +538,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '111791' => {
+                            '111516' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -573,7 +573,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '112049' => {
+                            '111774' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -600,7 +600,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '112262' => {
+                            '111987' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -631,7 +631,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '112412' => {
+                            '112137' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -650,7 +650,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '112519' => {
+                            '112244' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -677,7 +677,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '112737' => {
+                            '112462' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -696,7 +696,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '112910' => {
+                            '112635' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -723,7 +723,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '113046' => {
+                            '112771' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -746,7 +746,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '113173' => {
+                            '112898' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -785,7 +785,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '113451' => {
+                            '113176' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -812,7 +812,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '113664' => {
+                            '113389' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -847,7 +847,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '113828' => {
+                            '113553' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -870,7 +870,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '114026' => {
+                            '113751' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -893,7 +893,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '114148' => {
+                            '113873' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -920,7 +920,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '114366' => {
+                            '114091' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -951,7 +951,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '114515' => {
+                            '114240' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -974,7 +974,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '114713' => {
+                            '114438' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1001,7 +1001,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '114843' => {
+                            '114568' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1028,7 +1028,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '115061' => {
+                            '114786' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1055,7 +1055,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '115190' => {
+                            '114915' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1090,7 +1090,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '115356' => {
+                            '115081' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1117,7 +1117,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '115565' => {
+                            '115290' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1152,7 +1152,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '115848' => {
+                            '115573' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1179,7 +1179,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '115977' => {
+                            '115702' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1202,7 +1202,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '116098' => {
+                            '115823' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1237,7 +1237,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '116345' => {
+                            '116070' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1264,7 +1264,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '116549' => {
+                            '116274' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1295,7 +1295,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '117495' => {
+                            '117220' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1326,7 +1326,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '117726' => {
+                            '117451' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1345,7 +1345,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '117814' => {
+                            '117539' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1372,7 +1372,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '117947' => {
+                            '117672' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1395,7 +1395,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '118986' => {
+                            '118711' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -6349,28 +6349,35 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_check'
                                        },
-                            '80117' => {
+                            '81456' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '77663'
+                                                               'name' => 'parent',
+                                                               'type' => '77163'
                                                              },
                                                       '1' => {
-                                                               'name' => 'repo',
-                                                               'type' => '78949'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6265'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '4895'
+                                                               'name' => 'node',
+                                                               'type' => '77593'
                                                              }
                                                     },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_pdr_add'
+                                         'Return' => '6265',
+                                         'ShortName' => 'pldm_is_current_parent_child'
+                                       },
+                            '81545' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '77163'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'association_type',
+                                                               'type' => '168'
+                                                             }
+                                                    },
+                                         'Return' => '168',
+                                         'ShortName' => 'pldm_entity_get_num_children'
                                        },
                             '8158' => {
                                         'Header' => 'bios.h',
@@ -6399,37 +6406,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '81731' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'parent',
-                                                               'type' => '77163'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'node',
-                                                               'type' => '77593'
-                                                             }
-                                                    },
-                                         'Return' => '6265',
-                                         'ShortName' => 'pldm_is_current_parent_child'
-                                       },
-                            '81820' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '77163'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'association_type',
-                                                               'type' => '168'
-                                                             }
-                                                    },
-                                         'Return' => '168',
-                                         'ShortName' => 'pldm_entity_get_num_children'
-                                       },
-                            '82035' => {
+                            '81760' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6440,7 +6417,7 @@
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '82190' => {
+                            '81915' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6451,7 +6428,7 @@
                                          'Return' => '76279',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '82345' => {
+                            '82070' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6462,7 +6439,7 @@
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '82500' => {
+                            '82225' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6473,7 +6450,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
-                            '82679' => {
+                            '82404' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6492,38 +6469,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_visit'
                                        },
-                            '8304' => {
-                                        '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'
-                                                            },
-                                                     '4' => {
-                                                              'name' => 'transfer_flag',
-                                                              'type' => '2034'
-                                                            },
-                                                     '5' => {
-                                                              'name' => 'attribute_data',
-                                                              'type' => '6481'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
-                                      },
-                            '83121' => {
+                            '82846' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6562,7 +6508,38 @@
                                          'Return' => '77163',
                                          'ShortName' => 'pldm_entity_association_tree_add_entity'
                                        },
-                            '83611' => {
+                            '8304' => {
+                                        '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'
+                                                            },
+                                                     '4' => {
+                                                              'name' => 'transfer_flag',
+                                                              'type' => '2034'
+                                                            },
+                                                     '5' => {
+                                                              'name' => 'attribute_data',
+                                                              'type' => '6481'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
+                                      },
+                            '83336' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6589,12 +6566,12 @@
                                          'Return' => '77163',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
-                            '84048' => {
+                            '83773' => {
                                          'Header' => 'pdr.h',
                                          'Return' => '77663',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
-                            '84282' => {
+                            '84007' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6632,7 +6609,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '85088' => {
+                            '84813' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6659,7 +6636,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
-                            '85428' => {
+                            '85153' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6687,10 +6664,10 @@
                                                                'type' => '8294'
                                                              }
                                                     },
-                                         'Return' => '85413',
+                                         'Return' => '85138',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '85759' => {
+                            '85484' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6725,18 +6702,18 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '86087' => {
+                            '85812' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '85413'
+                                                               'type' => '85138'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '86242' => {
+                            '85967' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6745,13 +6722,13 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '85413'
+                                                               'type' => '85138'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
-                            '86455' => {
+                            '86180' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6762,7 +6739,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '86586' => {
+                            '86311' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6773,7 +6750,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '86717' => {
+                            '86442' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6786,7 +6763,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '85413'
+                                                               'type' => '85138'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
@@ -6797,9 +6774,36 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '85413',
+                                         'Return' => '85138',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
+                            '86619' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '78695'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'curr_record',
+                                                               'type' => '85138'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'data',
+                                                               'type' => '68742'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'size',
+                                                               'type' => '2039'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'next_record_handle',
+                                                               'type' => '2039'
+                                                             }
+                                                    },
+                                         'Return' => '85138',
+                                         'ShortName' => 'pldm_pdr_get_next_record'
+                                       },
                             '8672' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6831,34 +6835,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '86894' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '78695'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'curr_record',
-                                                               'type' => '85413'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'data',
-                                                               'type' => '68742'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'size',
-                                                               'type' => '2039'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'next_record_handle',
-                                                               'type' => '2039'
-                                                             }
-                                                    },
-                                         'Return' => '85413',
-                                         'ShortName' => 'pldm_pdr_get_next_record'
-                                       },
-                            '87068' => {
+                            '86793' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6882,10 +6859,10 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '85413',
+                                         'Return' => '85138',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '87236' => {
+                            '86961' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6896,12 +6873,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '87391' => {
+                            '87116' => {
                                          'Header' => 'pdr.h',
                                          'Return' => '78949',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '87463' => {
+                            '87188' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6959,7 +6936,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '88883' => {
+                            '88608' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -6970,7 +6947,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '88975' => {
+                            '88700' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -6981,7 +6958,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
-                            '89385' => {
+                            '89110' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7000,7 +6977,7 @@
                                          'Return' => '12204',
                                          'ShortName' => 'ver2str'
                                        },
-                            '89513' => {
+                            '89238' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7042,72 +7019,72 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '90784' => {
+                            '90509' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '90992'
+                                                               'type' => '90717'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '90109'
+                                                               'type' => '89834'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '90121'
+                                                               'type' => '89846'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '90997' => {
+                            '90722' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '90992'
+                                                               'type' => '90717'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '90109'
+                                                               'type' => '89834'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '91398'
+                                                               'type' => '91123'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '91403' => {
+                            '91128' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '90992'
+                                                               'type' => '90717'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '91488' => {
+                            '91213' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '91574'
+                                                               'type' => '91299'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '91579' => {
+                            '91304' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '91574'
+                                                               'type' => '91299'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7152,12 +7129,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '92732' => {
+                            '92457' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '92064'
+                                                               'type' => '91789'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7172,15 +7149,15 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '92179',
+                                         'Return' => '91904',
                                          'ShortName' => 'pldm_send'
                                        },
-                            '93148' => {
+                            '92873' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '92064'
+                                                               'type' => '91789'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7203,15 +7180,15 @@
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '92179',
+                                         'Return' => '91904',
                                          'ShortName' => 'pldm_send_recv'
                                        },
-                            '93624' => {
+                            '93349' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '92064'
+                                                               'type' => '91789'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7230,15 +7207,15 @@
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '92179',
+                                         'Return' => '91904',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '93847' => {
+                            '93572' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '92064'
+                                                               'type' => '91789'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7253,12 +7230,12 @@
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '92179',
+                                         'Return' => '91904',
                                          'ShortName' => 'pldm_recv_any'
                                        },
-                            '94289' => {
+                            '94014' => {
                                          'Header' => 'pldm.h',
-                                         'Return' => '92179',
+                                         'Return' => '91904',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9456' => {
@@ -7599,7 +7576,6 @@
                                                  'pldm_bios_table_string_entry_encode_length' => 1,
                                                  'pldm_bios_table_string_find_by_handle' => 1,
                                                  'pldm_bios_table_string_find_by_string' => 1,
-                                                 'pldm_entity_association_pdr_add' => 1,
                                                  'pldm_entity_association_pdr_add_check' => 1,
                                                  'pldm_entity_association_pdr_add_from_node_check' => 1,
                                                  'pldm_entity_association_pdr_extract' => 1,
@@ -9784,7 +9760,7 @@
                                      'Size' => '4',
                                      'Type' => 'Struct'
                                    },
-                          '85413' => {
+                          '85138' => {
                                        'BaseType' => '76133',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
@@ -9842,7 +9818,7 @@
                                      'Size' => '8',
                                      'Type' => 'Struct'
                                    },
-                          '90109' => {
+                          '89834' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -9850,7 +9826,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '90121' => {
+                          '89846' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -9858,14 +9834,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '90498' => {
+                          '90223' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '90121'
+                                                            'type' => '89846'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -9878,14 +9854,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '90537' => {
+                          '90262' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '90579'
+                                                            'type' => '90304'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -9898,31 +9874,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '90579' => {
-                                       'BaseType' => '90498',
+                          '90304' => {
+                                       'BaseType' => '90223',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '90992' => {
-                                       'BaseType' => '90537',
+                          '90717' => {
+                                       'BaseType' => '90262',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '91398' => {
-                                       'BaseType' => '90121',
+                          '91123' => {
+                                       'BaseType' => '89846',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '91574' => {
-                                       'BaseType' => '90992',
+                          '91299' => {
+                                       'BaseType' => '90717',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '92064' => {
+                          '91789' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -9930,7 +9906,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92076' => {
+                          '91801' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -9995,8 +9971,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '92179' => {
-                                       'BaseType' => '92076',
+                          '91904' => {
+                                       'BaseType' => '91801',
                                        'Header' => 'pldm.h',
                                        'Line' => '29',
                                        'Name' => 'pldm_requester_rc_t',
diff --git a/abi/x86_64/gcc.dump b/abi/x86_64/gcc.dump
index 8e175de..7a702e9 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'
                                        },
-                            '111119' => {
+                            '110837' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -230,7 +230,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '111319' => {
+                            '111037' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -280,7 +280,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '111551' => {
+                            '111269' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -304,7 +304,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '111652' => {
+                            '111370' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -350,7 +350,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '111949' => {
+                            '111667' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -369,7 +369,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '112144' => {
+                            '111862' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -419,7 +419,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '112356' => {
+                            '112074' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -443,7 +443,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '112452' => {
+                            '112170' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -489,7 +489,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '112749' => {
+                            '112467' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -513,7 +513,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '112850' => {
+                            '112568' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -540,22 +540,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '11299' => {
-                                         'Header' => 'bios.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_date_time_req'
-                                       },
-                            '113085' => {
+                            '112803' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -574,7 +559,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '113275' => {
+                            '11299' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '112993' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -605,7 +605,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '113417' => {
+                            '113135' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -634,7 +634,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '113532' => {
+                            '113250' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -670,7 +670,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '113802' => {
+                            '113520' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -697,7 +697,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '114032' => {
+                            '113750' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -732,7 +732,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '114194' => {
+                            '113912' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -756,7 +756,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '114295' => {
+                            '114013' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -783,7 +783,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '114530' => {
+                            '114248' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -802,7 +802,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '114720' => {
+                            '114438' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -833,7 +833,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '114862' => {
+                            '114580' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -862,7 +862,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '114977' => {
+                            '114695' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -903,7 +903,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '115262' => {
+                            '114980' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -930,7 +930,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '115492' => {
+                            '115210' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -970,7 +970,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '115669' => {
+                            '115387' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -993,7 +993,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '115884' => {
+                            '115602' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1022,7 +1022,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '115994' => {
+                            '115712' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1049,7 +1049,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '116229' => {
+                            '115947' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1086,7 +1086,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '116384' => {
+                            '116102' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1109,7 +1109,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '116599' => {
+                            '116317' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1141,7 +1141,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '116735' => {
+                            '116453' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1168,7 +1168,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '116970' => {
+                            '116688' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1199,7 +1199,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '117105' => {
+                            '116823' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1239,7 +1239,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '117278' => {
+                            '116996' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1266,7 +1266,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '117504' => {
+                            '117222' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1302,7 +1302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '117801' => {
+                            '117519' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1333,7 +1333,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '117936' => {
+                            '117654' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1362,7 +1362,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '118045' => {
+                            '117763' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1398,7 +1398,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '118304' => {
+                            '118022' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1425,7 +1425,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '118525' => {
+                            '118243' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1460,7 +1460,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '119492' => {
+                            '119210' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1491,7 +1491,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '119740' => {
+                            '119458' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1515,7 +1515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '119823' => {
+                            '119541' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1546,7 +1546,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '119962' => {
+                            '119680' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1569,7 +1569,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '121031' => {
+                            '120749' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -6858,30 +6858,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_check'
                                        },
-                            '81334' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '78839'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80162'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6423'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '5053'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_pdr_add'
-                                       },
-                            '82974' => {
+                            '82692' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6899,7 +6876,7 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '83063' => {
+                            '82781' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6914,7 +6891,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '83278' => {
+                            '82996' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6925,7 +6902,7 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '83433' => {
+                            '83151' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6936,7 +6913,7 @@
                                          'Return' => '77461',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '83588' => {
+                            '83306' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6947,7 +6924,7 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '83743' => {
+                            '83461' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6958,6 +6935,25 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
+                            '83640' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '78839'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'entities',
+                                                               'type' => '78770'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'size',
+                                                               'type' => '9084'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_tree_visit'
+                                       },
                             '8379' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6989,26 +6985,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '83922' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '78839'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entities',
-                                                               'type' => '78770'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'size',
-                                                               'type' => '9084'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_tree_visit'
-                                       },
-                            '84381' => {
+                            '84099' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7049,7 +7026,7 @@
                                          'Return' => '78345',
                                          'ShortName' => 'pldm_entity_association_tree_add_entity'
                                        },
-                            '84884' => {
+                            '84602' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7076,6 +7053,22 @@
                                          'Return' => '78345',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
+                            '85035' => {
+                                         'Header' => 'pdr.h',
+                                         'Return' => '78839',
+                                         'ShortName' => 'pldm_entity_association_tree_init'
+                                       },
+                            '85269' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '78345'
+                                                             }
+                                                    },
+                                         'Return' => '77461',
+                                         'ShortName' => 'pldm_entity_extract'
+                                       },
                             '8531' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7111,23 +7104,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '85317' => {
-                                         'Header' => 'pdr.h',
-                                         'Return' => '78839',
-                                         'ShortName' => 'pldm_entity_association_tree_init'
-                                       },
-                            '85551' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '78345'
-                                                             }
-                                                    },
-                                         'Return' => '77461',
-                                         'ShortName' => 'pldm_entity_extract'
-                                       },
-                            '86346' => {
+                            '86064' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7154,7 +7131,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
-                            '86706' => {
+                            '86424' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7182,37 +7159,10 @@
                                                                'type' => '8521'
                                                              }
                                                     },
-                                         'Return' => '86691',
+                                         'Return' => '86409',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '8693' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'instance_id',
-                                                              'type' => '168'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'transfer_handle',
-                                                              'type' => '180'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'transfer_op_flag',
-                                                              'type' => '168'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'attribute_handle',
-                                                              'type' => '5053'
-                                                            },
-                                                     '4' => {
-                                                              'name' => 'msg',
-                                                              'type' => '1632'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
-                                      },
-                            '87060' => {
+                            '86778' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7248,18 +7198,45 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '87404' => {
+                            '8693' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'instance_id',
+                                                              'type' => '168'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'transfer_handle',
+                                                              'type' => '180'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'transfer_op_flag',
+                                                              'type' => '168'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'attribute_handle',
+                                                              'type' => '5053'
+                                                            },
+                                                     '4' => {
+                                                              'name' => 'msg',
+                                                              'type' => '1632'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
+                                      },
+                            '87122' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '86691'
+                                                               'type' => '86409'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '87559' => {
+                            '87277' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7268,13 +7245,13 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '86691'
+                                                               'type' => '86409'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
-                            '87772' => {
+                            '87490' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7285,7 +7262,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '87903' => {
+                            '87621' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7296,7 +7273,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '88034' => {
+                            '87752' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7309,7 +7286,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '86691'
+                                                               'type' => '86409'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
@@ -7325,10 +7302,10 @@
                                                     '3' => 'rcx',
                                                     '4' => 'r8'
                                                   },
-                                         'Return' => '86691',
+                                         'Return' => '86409',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
-                            '88205' => {
+                            '87923' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7337,7 +7314,7 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '86691'
+                                                               'type' => '86409'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
@@ -7352,10 +7329,10 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '86691',
+                                         'Return' => '86409',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '88372' => {
+                            '88090' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7379,10 +7356,10 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '86691',
+                                         'Return' => '86409',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '88540' => {
+                            '88258' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7393,12 +7370,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '88695' => {
+                            '88413' => {
                                          'Header' => 'pdr.h',
                                          'Return' => '80162',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '88767' => {
+                            '88485' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7464,7 +7441,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '90188' => {
+                            '89906' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7475,7 +7452,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '90317' => {
+                            '90035' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7486,7 +7463,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
-                            '90745' => {
+                            '90463' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7508,7 +7485,7 @@
                                          'Return' => '12557',
                                          'ShortName' => 'ver2str'
                                        },
-                            '90873' => {
+                            '90591' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7554,39 +7531,39 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '92131' => {
+                            '91849' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92354'
+                                                               'type' => '92072'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '91453'
+                                                               'type' => '91171'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '91465'
+                                                               'type' => '91183'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '92359' => {
+                            '92077' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92354'
+                                                               'type' => '92072'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '91453'
+                                                               'type' => '91171'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '92780'
+                                                               'type' => '92498'
                                                              }
                                                     },
                                          'Return' => '74',
@@ -7619,34 +7596,34 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '92785' => {
+                            '92503' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92354'
+                                                               'type' => '92072'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '92870' => {
+                            '92588' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92956'
+                                                               'type' => '92674'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '92961' => {
+                            '92679' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92956'
+                                                               'type' => '92674'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7656,12 +7633,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init'
                                        },
-                            '94140' => {
+                            '93858' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93472'
+                                                               'type' => '93190'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7676,15 +7653,15 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '93587',
+                                         'Return' => '93305',
                                          'ShortName' => 'pldm_send'
                                        },
-                            '94559' => {
+                            '94277' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93472'
+                                                               'type' => '93190'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7707,7 +7684,7 @@
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '93587',
+                                         'Return' => '93305',
                                          'ShortName' => 'pldm_send_recv'
                                        },
                             '9464' => {
@@ -7746,12 +7723,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '95042' => {
+                            '94760' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93472'
+                                                               'type' => '93190'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7770,15 +7747,15 @@
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '93587',
+                                         'Return' => '93305',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '95268' => {
+                            '94986' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93472'
+                                                               'type' => '93190'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7793,12 +7770,12 @@
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '93587',
+                                         'Return' => '93305',
                                          'ShortName' => 'pldm_recv_any'
                                        },
-                            '95713' => {
+                            '95431' => {
                                          'Header' => 'pldm.h',
-                                         'Return' => '93587',
+                                         'Return' => '93305',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9755' => {
@@ -8105,7 +8082,6 @@
                                                  'pldm_bios_table_string_entry_encode_length' => 1,
                                                  'pldm_bios_table_string_find_by_handle' => 1,
                                                  'pldm_bios_table_string_find_by_string' => 1,
-                                                 'pldm_entity_association_pdr_add' => 1,
                                                  'pldm_entity_association_pdr_add_check' => 1,
                                                  'pldm_entity_association_pdr_add_from_node_check' => 1,
                                                  'pldm_entity_association_pdr_extract' => 1,
@@ -10290,7 +10266,7 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '86691' => {
+                          '86409' => {
                                        'BaseType' => '77315',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
@@ -10348,7 +10324,7 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '91453' => {
+                          '91171' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -10356,7 +10332,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '91465' => {
+                          '91183' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -10364,14 +10340,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '91845' => {
+                          '91563' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '91465'
+                                                            'type' => '91183'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -10384,14 +10360,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '91884' => {
+                          '91602' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '91926'
+                                                            'type' => '91644'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10404,31 +10380,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '91926' => {
-                                       'BaseType' => '91845',
+                          '91644' => {
+                                       'BaseType' => '91563',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '92354' => {
-                                       'BaseType' => '91884',
+                          '92072' => {
+                                       'BaseType' => '91602',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '92780' => {
-                                       'BaseType' => '91465',
+                          '92498' => {
+                                       'BaseType' => '91183',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '92956' => {
-                                       'BaseType' => '92354',
+                          '92674' => {
+                                       'BaseType' => '92072',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93472' => {
+                          '93190' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10436,7 +10412,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93484' => {
+                          '93202' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10501,8 +10477,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '93587' => {
-                                       'BaseType' => '93484',
+                          '93305' => {
+                                       'BaseType' => '93202',
                                        'Header' => 'pldm.h',
                                        'Line' => '29',
                                        'Name' => 'pldm_requester_rc_t',
diff --git a/src/pdr.c b/src/pdr.c
index 1f6334b..da2e98d 100644
--- a/src/pdr.c
+++ b/src/pdr.c
@@ -908,17 +908,6 @@
 					  terminus_handle, record_handle);
 }
 
-LIBPLDM_ABI_DEPRECATED
-void pldm_entity_association_pdr_add(pldm_entity_association_tree *tree,
-				     pldm_pdr *repo, bool is_remote,
-				     uint16_t terminus_handle)
-{
-	int rc = pldm_entity_association_pdr_add_check(tree, repo, is_remote,
-						       terminus_handle);
-	(void)rc;
-	assert(!rc);
-}
-
 LIBPLDM_ABI_STABLE
 int pldm_entity_association_pdr_add_check(pldm_entity_association_tree *tree,
 					  pldm_pdr *repo, bool is_remote,
diff --git a/tests/libpldm_pdr_test.cpp b/tests/libpldm_pdr_test.cpp
index c2711c6..a6955a4 100644
--- a/tests/libpldm_pdr_test.cpp
+++ b/tests/libpldm_pdr_test.cpp
@@ -1211,7 +1211,8 @@
               1);
 
     auto repo = pldm_pdr_init();
-    pldm_entity_association_pdr_add(tree, repo, false, 1);
+    int rc = pldm_entity_association_pdr_add_check(tree, repo, false, 1);
+    ASSERT_EQ(rc, 0);
 
     EXPECT_EQ(pldm_pdr_get_record_count(repo), 6u);
 
@@ -1842,7 +1843,8 @@
               2);
 
     auto repo = pldm_pdr_init();
-    pldm_entity_association_pdr_add(tree, repo, false, 1);
+    int rc = pldm_entity_association_pdr_add_check(tree, repo, false, 1);
+    ASSERT_EQ(rc, 0);
 
     EXPECT_EQ(pldm_pdr_get_record_count(repo), 1u);