Add OC, XZ and remove NFC for P708