Improve NFC operation