Added PCMG/NPP/PPP fields to Location