More NFC updates