Custom Changes for APRP

Commiting changes for the upcoming RP server for AP