Refactored NONCE payload handling in quick mode