diff --git a/webgpu.h b/webgpu.h
index 6065722d..4879fdf7 100644
--- a/webgpu.h
+++ b/webgpu.h
@@ -1484,6 +1484,10 @@ typedef struct WGPUCompilationMessage {
 } WGPUCompilationMessage WGPU_STRUCTURE_ATTRIBUTE;
 
 typedef struct WGPUComputePassTimestampWrites {
+    WGPUChainedStruct const * nextInChain;
+    /**
+     * Query set to write timestamps to. Null if timestamps should not be recorded.
+     */
     WGPUQuerySet querySet;
     uint32_t beginningOfPassWriteIndex;
     uint32_t endOfPassWriteIndex;
@@ -1656,6 +1660,10 @@ typedef struct WGPURenderPassMaxDrawCount {
 } WGPURenderPassMaxDrawCount WGPU_STRUCTURE_ATTRIBUTE;
 
 typedef struct WGPURenderPassTimestampWrites {
+    WGPUChainedStruct const * nextInChain;
+    /**
+     * Query set to write timestamps to. Null if timestamps should not be recorded.
+     */
     WGPUQuerySet querySet;
     uint32_t beginningOfPassWriteIndex;
     uint32_t endOfPassWriteIndex;
@@ -2015,7 +2023,7 @@ typedef struct WGPUComputePassDescriptor {
      * This is a \ref NonNullInputString.
      */
     WGPUStringView label;
-    WGPU_NULLABLE WGPUComputePassTimestampWrites const * timestampWrites;
+    WGPUComputePassTimestampWrites timestampWrites;
 } WGPUComputePassDescriptor WGPU_STRUCTURE_ATTRIBUTE;
 
 typedef struct WGPUDepthStencilState {
@@ -2172,7 +2180,7 @@ typedef struct WGPURenderPassDescriptor {
     WGPURenderPassColorAttachment const * colorAttachments;
     WGPU_NULLABLE WGPURenderPassDepthStencilAttachment const * depthStencilAttachment;
     WGPU_NULLABLE WGPUQuerySet occlusionQuerySet;
-    WGPU_NULLABLE WGPURenderPassTimestampWrites const * timestampWrites;
+    WGPURenderPassTimestampWrites timestampWrites;
 } WGPURenderPassDescriptor WGPU_STRUCTURE_ATTRIBUTE;
 
 typedef struct WGPUVertexState {
diff --git a/webgpu.yml b/webgpu.yml
index 93cbc0a6..f88864a5 100644
--- a/webgpu.yml
+++ b/webgpu.yml
@@ -1815,16 +1815,14 @@ structs:
         doc: |
           TODO
         type: struct.compute_pass_timestamp_writes
-        pointer: immutable
-        optional: true
   - name: compute_pass_timestamp_writes
     doc: |
       TODO
-    type: standalone
+    type: base_in
     members:
       - name: query_set
         doc: |
-          TODO
+          Query set to write timestamps to. Null if timestamps should not be recorded.
         type: object.query_set
       - name: beginning_of_pass_write_index
         doc: |
@@ -2404,8 +2402,6 @@ structs:
         doc: |
           TODO
         type: struct.render_pass_timestamp_writes
-        pointer: immutable
-        optional: true
   - name: render_pass_max_draw_count
     doc: |
       TODO
@@ -2420,11 +2416,11 @@ structs:
   - name: render_pass_timestamp_writes
     doc: |
       TODO
-    type: standalone
+    type: base_in
     members:
       - name: query_set
         doc: |
-          TODO
+          Query set to write timestamps to. Null if timestamps should not be recorded.
         type: object.query_set
       - name: beginning_of_pass_write_index
         doc: |