Add NonceRequest and NonceResponse back