diff --git a/docs/sources/anthropic/claude-enterprise-analytics/claude-enterprise-analytics.yaml b/docs/sources/anthropic/claude-enterprise-analytics/claude-enterprise-analytics.yaml
index 3ea4cba41..fd82f3139 100644
--- a/docs/sources/anthropic/claude-enterprise-analytics/claude-enterprise-analytics.yaml
+++ b/docs/sources/anthropic/claude-enterprise-analytics/claude-enterprise-analytics.yaml
@@ -155,6 +155,8 @@ definitions:
         type: "integer"
       distinct_artifacts_created_count:
         type: "integer"
+      distinct_connectors_used_count:
+        type: "integer"
       distinct_conversation_count:
         type: "integer"
       distinct_files_uploaded_count:
@@ -220,14 +222,41 @@ definitions:
         type: "integer"
       distinct_connectors_used_count:
         type: "integer"
+      distinct_plugins_used_count:
+        type: "integer"
       distinct_session_count:
         type: "integer"
       distinct_skills_used_count:
         type: "integer"
+      edit_tool_count:
+        type: "integer"
+      file_edit_count:
+        type: "integer"
       message_count:
         type: "integer"
+      multi_edit_tool_count:
+        type: "integer"
+      notebook_edit_tool_count:
+        type: "integer"
+      plugins_used_count:
+        type: "integer"
+      sessions_with_file_edits_count:
+        type: "integer"
       skills_used_count:
         type: "integer"
+      write_tool_count:
+        type: "integer"
+  DesignMetrics:
+    type: "object"
+    properties:
+      distinct_projects_created_count:
+        type: "integer"
+      distinct_projects_used_count:
+        type: "integer"
+      distinct_session_count:
+        type: "integer"
+      message_count:
+        type: "integer"
   LinesOfCode:
     type: "object"
     properties:
@@ -261,6 +290,19 @@ definitions:
         $ref: "#/definitions/OfficeAppMetrics"
       word:
         $ref: "#/definitions/OfficeAppMetrics"
+  ScienceMetrics:
+    type: "object"
+    properties:
+      delegation_count:
+        type: "integer"
+      distinct_session_count:
+        type: "integer"
+      message_count:
+        type: "integer"
+      remote_compute_job_count:
+        type: "integer"
+      skills_used_count:
+        type: "integer"
   ServerToolUse:
     type: "object"
     properties:
@@ -269,9 +311,9 @@ definitions:
   ToolAction:
     type: "object"
     properties:
-      accepted:
+      accepted_count:
         type: "integer"
-      rejected:
+      rejected_count:
         type: "integer"
   ToolActions:
     type: "object"
@@ -293,11 +335,21 @@ definitions:
         $ref: "#/definitions/ClaudeCodeMetrics"
       cowork_metrics:
         $ref: "#/definitions/CoworkMetrics"
-      date:
+      design_metrics:
+        $ref: "#/definitions/DesignMetrics"
+      distinct_user_count:
+        type: "integer"
+      last_activity_date:
         type: "string"
         format: "date"
       office_metrics:
         $ref: "#/definitions/OfficeMetrics"
+      rbac_group_id:
+        type: "string"
+      rbac_group_name:
+        type: "string"
+      science_metrics:
+        $ref: "#/definitions/ScienceMetrics"
       user:
         $ref: "#/definitions/AnalyticsUser"
       web_search_count:
@@ -358,4 +410,3 @@ definitions:
         type: "integer"
       uncached_input_tokens:
         type: "integer"
-
diff --git a/docs/sources/anthropic/claude-enterprise-analytics/example-api-responses/original/users.json b/docs/sources/anthropic/claude-enterprise-analytics/example-api-responses/original/users.json
index cec6c0fb6..a45e28639 100644
--- a/docs/sources/anthropic/claude-enterprise-analytics/example-api-responses/original/users.json
+++ b/docs/sources/anthropic/claude-enterprise-analytics/example-api-responses/original/users.json
@@ -2,7 +2,6 @@
   "data": [
     {
       "user": { "id": "user_abc123", "email_address": "alice@example.com" },
-      "date": "2026-06-01",
       "chat_metrics": {
         "distinct_conversation_count": 5,
         "message_count": 42,
@@ -14,6 +13,7 @@
         "thinking_message_count": 0,
         "distinct_skills_used_count": 2,
         "connectors_used_count": 1,
+        "distinct_connectors_used_count": 1,
         "shared_conversations_viewed_count": 0
       },
       "claude_code_metrics": {
@@ -24,10 +24,10 @@
           "distinct_session_count": 4
         },
         "tool_actions": {
-          "edit_tool": { "accepted": 10, "rejected": 2 },
-          "multi_edit_tool": { "accepted": 3, "rejected": 0 },
-          "write_tool": { "accepted": 5, "rejected": 1 },
-          "notebook_edit_tool": { "accepted": 0, "rejected": 0 }
+          "edit_tool": { "accepted_count": 10, "rejected_count": 2 },
+          "multi_edit_tool": { "accepted_count": 3, "rejected_count": 0 },
+          "write_tool": { "accepted_count": 5, "rejected_count": 1 },
+          "notebook_edit_tool": { "accepted_count": 0, "rejected_count": 0 }
         }
       },
       "web_search_count": 2,
@@ -40,18 +40,33 @@
       "cowork_metrics": {
         "distinct_session_count": 0, "message_count": 0, "action_count": 0,
         "dispatch_turn_count": 0, "skills_used_count": 0, "distinct_skills_used_count": 0,
-        "connectors_used_count": 0, "distinct_connectors_used_count": 0
-      }
+        "connectors_used_count": 0, "distinct_connectors_used_count": 0,
+        "distinct_plugins_used_count": 0, "edit_tool_count": 0, "file_edit_count": 0,
+        "multi_edit_tool_count": 0, "notebook_edit_tool_count": 0, "plugins_used_count": 0,
+        "sessions_with_file_edits_count": 0, "write_tool_count": 0
+      },
+      "design_metrics": {
+        "distinct_projects_created_count": 0, "distinct_projects_used_count": 0,
+        "distinct_session_count": 0, "message_count": 0
+      },
+      "science_metrics": {
+        "delegation_count": 0, "distinct_session_count": 0, "message_count": 0,
+        "remote_compute_job_count": 0, "skills_used_count": 0
+      },
+      "distinct_user_count": null,
+      "last_activity_date": "2026-06-01",
+      "rbac_group_id": "rbac_group_abc123",
+      "rbac_group_name": "Engineering"
     },
     {
       "user": { "id": "user_def456", "email_address": "bob@example.com" },
-      "date": "2026-06-01",
       "chat_metrics": {
         "distinct_conversation_count": 2, "message_count": 10, "distinct_projects_created_count": 0,
         "distinct_projects_used_count": 1, "distinct_files_uploaded_count": 0,
         "distinct_artifacts_created_count": 0, "distinct_shared_artifacts_viewed_count": 0,
         "thinking_message_count": 0, "distinct_skills_used_count": 0,
-        "connectors_used_count": 0, "shared_conversations_viewed_count": 0
+        "connectors_used_count": 0, "distinct_connectors_used_count": 0,
+        "shared_conversations_viewed_count": 0
       },
       "claude_code_metrics": {
         "core_metrics": {
@@ -60,10 +75,10 @@
           "distinct_session_count": 0
         },
         "tool_actions": {
-          "edit_tool": { "accepted": 0, "rejected": 0 },
-          "multi_edit_tool": { "accepted": 0, "rejected": 0 },
-          "write_tool": { "accepted": 0, "rejected": 0 },
-          "notebook_edit_tool": { "accepted": 0, "rejected": 0 }
+          "edit_tool": { "accepted_count": 0, "rejected_count": 0 },
+          "multi_edit_tool": { "accepted_count": 0, "rejected_count": 0 },
+          "write_tool": { "accepted_count": 0, "rejected_count": 0 },
+          "notebook_edit_tool": { "accepted_count": 0, "rejected_count": 0 }
         }
       },
       "web_search_count": 0,
@@ -76,8 +91,23 @@
       "cowork_metrics": {
         "distinct_session_count": 0, "message_count": 0, "action_count": 0,
         "dispatch_turn_count": 0, "skills_used_count": 0, "distinct_skills_used_count": 0,
-        "connectors_used_count": 0, "distinct_connectors_used_count": 0
-      }
+        "connectors_used_count": 0, "distinct_connectors_used_count": 0,
+        "distinct_plugins_used_count": 0, "edit_tool_count": 0, "file_edit_count": 0,
+        "multi_edit_tool_count": 0, "notebook_edit_tool_count": 0, "plugins_used_count": 0,
+        "sessions_with_file_edits_count": 0, "write_tool_count": 0
+      },
+      "design_metrics": {
+        "distinct_projects_created_count": 0, "distinct_projects_used_count": 0,
+        "distinct_session_count": 0, "message_count": 0
+      },
+      "science_metrics": {
+        "delegation_count": 0, "distinct_session_count": 0, "message_count": 0,
+        "remote_compute_job_count": 0, "skills_used_count": 0
+      },
+      "distinct_user_count": null,
+      "last_activity_date": null,
+      "rbac_group_id": null,
+      "rbac_group_name": null
     }
   ],
   "next_page": "cursor_token_abc"
diff --git a/docs/sources/anthropic/claude-enterprise-analytics/example-api-responses/sanitized/users.json b/docs/sources/anthropic/claude-enterprise-analytics/example-api-responses/sanitized/users.json
index 58419fe6f..accc835be 100644
--- a/docs/sources/anthropic/claude-enterprise-analytics/example-api-responses/sanitized/users.json
+++ b/docs/sources/anthropic/claude-enterprise-analytics/example-api-responses/sanitized/users.json
@@ -5,7 +5,6 @@
         "id":"t~Wd2U4lmivWESn4fNgZWtjnW3j4TXciQNif50hO_QMVM",
         "email_address":"t~knxWE5tapsutcz6pLWSC3wfb5t34lCrXNZsKnhwyVXk@example.com"
       },
-      "date":"2026-06-01",
       "chat_metrics":{
         "distinct_conversation_count":5,
         "message_count":42,
@@ -17,6 +16,7 @@
         "thinking_message_count":0,
         "distinct_skills_used_count":2,
         "connectors_used_count":1,
+        "distinct_connectors_used_count":1,
         "shared_conversations_viewed_count":0
       },
       "claude_code_metrics":{
@@ -31,20 +31,20 @@
         },
         "tool_actions":{
           "edit_tool":{
-            "accepted":10,
-            "rejected":2
+            "accepted_count":10,
+            "rejected_count":2
           },
           "multi_edit_tool":{
-            "accepted":3,
-            "rejected":0
+            "accepted_count":3,
+            "rejected_count":0
           },
           "write_tool":{
-            "accepted":5,
-            "rejected":1
+            "accepted_count":5,
+            "rejected_count":1
           },
           "notebook_edit_tool":{
-            "accepted":0,
-            "rejected":0
+            "accepted_count":0,
+            "rejected_count":0
           }
         }
       },
@@ -91,15 +91,39 @@
         "skills_used_count":0,
         "distinct_skills_used_count":0,
         "connectors_used_count":0,
-        "distinct_connectors_used_count":0
-      }
+        "distinct_connectors_used_count":0,
+        "distinct_plugins_used_count":0,
+        "edit_tool_count":0,
+        "file_edit_count":0,
+        "multi_edit_tool_count":0,
+        "notebook_edit_tool_count":0,
+        "plugins_used_count":0,
+        "sessions_with_file_edits_count":0,
+        "write_tool_count":0
+      },
+      "design_metrics":{
+        "distinct_projects_created_count":0,
+        "distinct_projects_used_count":0,
+        "distinct_session_count":0,
+        "message_count":0
+      },
+      "science_metrics":{
+        "delegation_count":0,
+        "distinct_session_count":0,
+        "message_count":0,
+        "remote_compute_job_count":0,
+        "skills_used_count":0
+      },
+      "distinct_user_count":null,
+      "last_activity_date":"2026-06-01",
+      "rbac_group_id":"rbac_group_abc123",
+      "rbac_group_name":"Engineering"
     },
     {
       "user":{
         "id":"t~rUNP43joGY2IUQzpGJcOH7nY9pzIOXRLPOKi_PdHieA",
         "email_address":"t~PFsxS8oxlBJ9dZkL1zNMvRIajvbO3VzZpbdT-ty6Gm0@example.com"
       },
-      "date":"2026-06-01",
       "chat_metrics":{
         "distinct_conversation_count":2,
         "message_count":10,
@@ -111,6 +135,7 @@
         "thinking_message_count":0,
         "distinct_skills_used_count":0,
         "connectors_used_count":0,
+        "distinct_connectors_used_count":0,
         "shared_conversations_viewed_count":0
       },
       "claude_code_metrics":{
@@ -125,20 +150,20 @@
         },
         "tool_actions":{
           "edit_tool":{
-            "accepted":0,
-            "rejected":0
+            "accepted_count":0,
+            "rejected_count":0
           },
           "multi_edit_tool":{
-            "accepted":0,
-            "rejected":0
+            "accepted_count":0,
+            "rejected_count":0
           },
           "write_tool":{
-            "accepted":0,
-            "rejected":0
+            "accepted_count":0,
+            "rejected_count":0
           },
           "notebook_edit_tool":{
-            "accepted":0,
-            "rejected":0
+            "accepted_count":0,
+            "rejected_count":0
           }
         }
       },
@@ -185,9 +210,34 @@
         "skills_used_count":0,
         "distinct_skills_used_count":0,
         "connectors_used_count":0,
-        "distinct_connectors_used_count":0
-      }
+        "distinct_connectors_used_count":0,
+        "distinct_plugins_used_count":0,
+        "edit_tool_count":0,
+        "file_edit_count":0,
+        "multi_edit_tool_count":0,
+        "notebook_edit_tool_count":0,
+        "plugins_used_count":0,
+        "sessions_with_file_edits_count":0,
+        "write_tool_count":0
+      },
+      "design_metrics":{
+        "distinct_projects_created_count":0,
+        "distinct_projects_used_count":0,
+        "distinct_session_count":0,
+        "message_count":0
+      },
+      "science_metrics":{
+        "delegation_count":0,
+        "distinct_session_count":0,
+        "message_count":0,
+        "remote_compute_job_count":0,
+        "skills_used_count":0
+      },
+      "distinct_user_count":null,
+      "last_activity_date":null,
+      "rbac_group_id":null,
+      "rbac_group_name":null
     }
   ],
   "next_page":"cursor_token_abc"
-}
\ No newline at end of file
+}
diff --git a/docs/sources/anthropic/claude/claude.yaml b/docs/sources/anthropic/claude/claude.yaml
index 16ff54c36..9a3ed35b4 100644
--- a/docs/sources/anthropic/claude/claude.yaml
+++ b/docs/sources/anthropic/claude/claude.yaml
@@ -513,8 +513,6 @@ endpoints:
           type: "string"
         name:
           type: "string"
-        organization_id:
-          type: "string"
         organization_uuid:
           type: "string"
         project_id:
@@ -728,8 +726,6 @@ definitions:
         type: "string"
       name:
         type: "string"
-      organization_id:
-        type: "string"
       organization_uuid:
         type: "string"
       project_id:
diff --git a/docs/sources/anthropic/claude/example-api-responses/sanitized/chat-messages-response.json b/docs/sources/anthropic/claude/example-api-responses/sanitized/chat-messages-response.json
index 037191178..c22434812 100644
--- a/docs/sources/anthropic/claude/example-api-responses/sanitized/chat-messages-response.json
+++ b/docs/sources/anthropic/claude/example-api-responses/sanitized/chat-messages-response.json
@@ -3,7 +3,6 @@
   "name":"{\"length\":31,\"word_count\":3}",
   "created_at":"2025-06-07T08:09:10Z",
   "updated_at":"2025-06-07T08:09:11Z",
-  "organization_id":"org_abc123",
   "organization_uuid":"abcdef0123-4567-89ab-cdef-0123456789ab",
   "project_id":"claude_proj_xyz789",
   "model":"claude-opus-4-7",
diff --git a/docs/sources/anthropic/claude/example-api-responses/sanitized/chats-response.json b/docs/sources/anthropic/claude/example-api-responses/sanitized/chats-response.json
index 53e98557e..b1efc33a5 100644
--- a/docs/sources/anthropic/claude/example-api-responses/sanitized/chats-response.json
+++ b/docs/sources/anthropic/claude/example-api-responses/sanitized/chats-response.json
@@ -6,7 +6,6 @@
       "created_at":"2025-06-07T08:09:10Z",
       "updated_at":"2025-06-07T09:10:11Z",
       "deleted_at":null,
-      "organization_id":"org_abc123",
       "organization_uuid":"abcdef0123-4567-89ab-cdef-0123456789ab",
       "project_id":"claude_proj_xyz789",
       "user":{