Add nonce support