Changes to PAP infrastructure to support PDP