diff --git a/common/proto/src/main/proto/queue.proto b/common/proto/src/main/proto/queue.proto
index 1f45ab7293..3cadd55095 100644
--- a/common/proto/src/main/proto/queue.proto
+++ b/common/proto/src/main/proto/queue.proto
@@ -418,15 +418,19 @@ message GetAttributeRequestMsg {
   repeated string clientAttributeNames = 2;
   repeated string sharedAttributeNames = 3;
   bool onlyShared = 4;
+  bool allClientAttributes = 5;
+  bool allSharedAttributes = 6;
+  bool separateScopesResponse = 7;
 }
 
 message GetAttributeResponseMsg {
   int32 requestId = 1;
   repeated TsKvProto clientAttributeList = 2;
   repeated TsKvProto sharedAttributeList = 3;
-  bool isMultipleAttributesRequest = 4;
+  bool isMultipleAttributesRequest = 4 [deprecated = true];
   string error = 5;
   bool sharedStateMsg = 6;
+  bool separateScopesResponse = 7;
 }
 
 message AttributeUpdateNotificationMsg {
diff --git a/common/proto/src/main/proto/transport.proto b/common/proto/src/main/proto/transport.proto
index 8adebf62b7..e951079e2e 100644
--- a/common/proto/src/main/proto/transport.proto
+++ b/common/proto/src/main/proto/transport.proto
@@ -98,4 +98,8 @@ message GatewayAttributesRequestMsg {
   string deviceName = 2;
   bool client = 3;
   repeated string keys = 4;
+  repeated string clientKeys = 5;
+  repeated string sharedKeys = 6;
+  bool allClientKeys = 7;
+  bool allSharedKeys = 8;
 }