Reformat NMDUNSupport and PPPSupport