diff --git a/native/cpp/CommonCpp/grpc/grpc_client/src/lib.rs b/native/cpp/CommonCpp/grpc/grpc_client/src/lib.rs
--- a/native/cpp/CommonCpp/grpc/grpc_client/src/lib.rs
+++ b/native/cpp/CommonCpp/grpc/grpc_client/src/lib.rs
@@ -25,7 +25,8 @@
   registration_request::Data::PakeRegistrationUploadAndCredentialRequest,
   registration_response::Data::PakeLoginResponse,
   registration_response::Data::PakeRegistrationResponse, GetUserIdRequest,
-  GetUserIdResponse, PakeLoginResponse as PakeLoginResponseStruct,
+  GetUserIdResponse, LoginRequest, LoginResponse,
+  PakeLoginResponse as PakeLoginResponseStruct,
   PakeRegistrationRequestAndUserId as PakeRegistrationRequestAndUserIdStruct,
   PakeRegistrationUploadAndCredentialRequest as PakeRegistrationUploadAndCredentialRequestStruct,
   RegistrationRequest, RegistrationResponse as RegistrationResponseMessage,
@@ -362,3 +363,13 @@
     Err(handle_unexpected_registration_response(message))
   }
 }
+
+struct RegistrationResponseAndSender {
+  response: Option<RegistrationResponseMessage>,
+  sender: mpsc::Sender<RegistrationRequest>,
+}
+
+struct LoginResponseAndSender {
+  response: Option<LoginResponse>,
+  sender: mpsc::Sender<LoginRequest>,
+}