diff --git a/native/cpp/CommonCpp/grpc/protos/backup.proto b/native/cpp/CommonCpp/grpc/protos/backup.proto
--- a/native/cpp/CommonCpp/grpc/protos/backup.proto
+++ b/native/cpp/CommonCpp/grpc/protos/backup.proto
@@ -29,10 +29,10 @@
 // CreateNewBackup
 
 message CreateNewBackupRequest {
+  string userID = 1;
+  string deviceID = 2;
+  bytes keyEntropy = 3;
   oneof data {
-    string userID = 1;
-    string deviceID = 2;
-    bytes keyEntropy = 3;
     bytes newCompactionHash = 4;
     bytes newCompactionChunk = 5;
   }
@@ -45,11 +45,15 @@
 // SendLog
 
 message SendLogRequest {
-  oneof data {
+  message LogInfo {
     string userID = 1;
     string backupID = 2;
     bytes logHash = 3;
-    bytes logData = 4;
+  }
+  
+  oneof data {
+    LogInfo logInfo = 1;
+    bytes logData = 2;
   }
 }
 
diff --git a/native/cpp/CommonCpp/grpc/protos/blob.proto b/native/cpp/CommonCpp/grpc/protos/blob.proto
--- a/native/cpp/CommonCpp/grpc/protos/blob.proto
+++ b/native/cpp/CommonCpp/grpc/protos/blob.proto
@@ -13,10 +13,14 @@
 // Put
 
 message PutRequest {
-  oneof data {
+  message BlobInfo {
     string holder = 1;
     string blobHash = 2;
-    bytes dataChunk = 3;
+  }
+  
+  oneof data {
+    BlobInfo blobInfo = 1;
+    bytes dataChunk = 2;
   }
 }