Some changes for NFC