diff --git a/app/app/v1alpha/conversation.proto b/app/app/v1alpha/conversation.proto
index 2ba21bc4..4bf890ca 100644
--- a/app/app/v1alpha/conversation.proto
+++ b/app/app/v1alpha/conversation.proto
@@ -77,10 +77,13 @@ message ListConversationsRequest {
   int32 page_size = 3 [(google.api.field_behavior) = OPTIONAL];
   // page token
   string page_token = 4 [(google.api.field_behavior) = OPTIONAL];
+  // conversation_uid this is optional, if provided, only the conversation with the given conversation_uid will be returned
+  // first check conversation_uid, then check conversation_id, then check if_all
+  string conversation_uid = 5 [(google.api.field_behavior) = OPTIONAL];
   // conversation_id this is optional, if provided, only the conversation with the given conversation_id will be returned
-  string conversation_id = 5 [(google.api.field_behavior) = OPTIONAL];
+  string conversation_id = 6 [(google.api.field_behavior) = OPTIONAL];
   // If true, all conversations will be returned. This has higher priority over conversation_id, page_size, and page_token.
-  bool if_all = 6 [(google.api.field_behavior) = OPTIONAL];
+  bool if_all = 7 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // ListConversationsResponse returns a list of conversations
@@ -177,6 +180,8 @@ message ListMessagesRequest {
   bool include_system_messages = 7 [(google.api.field_behavior) = OUTPUT_ONLY];
   // If true, all messages will be returned. This has higher priority over latest_k, page_size, and page_token.
   bool if_all = 8 [(google.api.field_behavior) = OPTIONAL];
+  // message_uid this is optional, if provided, only the message with the given message_uid will be returned
+  string message_uid = 9 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // ListMessagesResponse returns a list of messages
diff --git a/artifact/artifact/v1alpha/artifact_public_service.proto b/artifact/artifact/v1alpha/artifact_public_service.proto
index 897a2d46..f4b3320c 100644
--- a/artifact/artifact/v1alpha/artifact_public_service.proto
+++ b/artifact/artifact/v1alpha/artifact_public_service.proto
@@ -95,7 +95,16 @@ service ArtifactPublicService {
       post: "/v1alpha/catalogs/files/processAsync"
       body: "*"
     };
-    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {tags: "Catalog"};
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Catalog"
+      parameters: {
+        headers: {
+          name: "Instill-Requester-Uid"
+          description: "Indicates the authenticated namespace is making the request on behalf of another entity, typically an organization they belong to"
+          type: STRING
+        }
+      }
+    };
   }
 
   // List catalog files
diff --git a/openapiv2/app/service.swagger.yaml b/openapiv2/app/service.swagger.yaml
index 59eafde2..8b5533fe 100644
--- a/openapiv2/app/service.swagger.yaml
+++ b/openapiv2/app/service.swagger.yaml
@@ -174,6 +174,13 @@ paths:
           in: query
           required: false
           type: string
+        - name: conversationUid
+          description: |-
+            conversation_uid this is optional, if provided, only the conversation with the given conversation_uid will be returned
+            first check conversation_uid, then check conversation_id, then check if_all
+          in: query
+          required: false
+          type: string
         - name: conversationId
           description: conversation_id this is optional, if provided, only the conversation with the given conversation_id will be returned
           in: query
@@ -350,6 +357,11 @@ paths:
           in: query
           required: false
           type: boolean
+        - name: messageUid
+          description: message_uid this is optional, if provided, only the message with the given message_uid will be returned
+          in: query
+          required: false
+          type: string
       tags:
         - App
     post:
diff --git a/openapiv2/artifact/service.swagger.yaml b/openapiv2/artifact/service.swagger.yaml
index 63c65304..9fe0f030 100644
--- a/openapiv2/artifact/service.swagger.yaml
+++ b/openapiv2/artifact/service.swagger.yaml
@@ -302,6 +302,11 @@ paths:
           required: true
           schema:
             $ref: '#/definitions/v1alphaProcessCatalogFilesRequest'
+        - name: Instill-Requester-Uid
+          description: Indicates the authenticated namespace is making the request on behalf of another entity, typically an organization they belong to
+          in: header
+          required: false
+          type: string
       tags:
         - Catalog
   /v1alpha/namespaces/{namespaceId}/catalogs/{catalogId}/chunks: