nonce management added