PNR Adapter changes