Added NFC handling