Added NFC support