diff --git a/go/application.go b/go/application.go
index 1f717a285..1087feff4 100644
--- a/go/application.go
+++ b/go/application.go
@@ -18,9 +18,12 @@ type Application struct {
 }
 
 type ApplicationListOptions struct {
+	// Limit the number of returned items
+	Limit *int32
+	// The iterator returned from a prior invocation
 	Iterator *string
-	Limit    *int32
-	Order    *Ordering
+	// The sorting order of the returned items
+	Order *Ordering
 }
 
 func (a *Application) List(ctx context.Context, options *ApplicationListOptions) (*ListResponseApplicationOut, error) {
diff --git a/go/endpoint.go b/go/endpoint.go
index e7a9d5f63..ba72f48d5 100644
--- a/go/endpoint.go
+++ b/go/endpoint.go
@@ -34,13 +34,18 @@ type Endpoint struct {
 }
 
 type EndpointListOptions struct {
+	// Limit the number of returned items
+	Limit *int32
+	// The iterator returned from a prior invocation
 	Iterator *string
-	Limit    *int32
-	Order    *Ordering
+	// The sorting order of the returned items
+	Order *Ordering
 }
 
 type EndpointStatsOptions struct {
+	// Filter the range to data starting from this date
 	Since *time.Time
+	// Filter the range to data ending by this date
 	Until *time.Time
 }
 
diff --git a/go/eventtype.go b/go/eventtype.go
index b4c0e1922..b3ecc094f 100644
--- a/go/eventtype.go
+++ b/go/eventtype.go
@@ -22,12 +22,16 @@ type (
 )
 
 type EventTypeListOptions struct {
-	Iterator        *string
-	Limit           *int32
-	WithContent     *bool
-	IncludeArchived *bool
-	// N.b. `openapi.Ordering` aliased for re-export via `endpoint.go`
+	// Limit the number of returned items
+	Limit *int32
+	// The iterator returned from a prior invocation
+	Iterator *string
+	// The sorting order of the returned items
 	Order *Ordering
+	// When `true` archived (deleted but not expunged) items are included in the response
+	IncludeArchived *bool
+	// When `true` the full item (including the schema) is included in the response
+	WithContent *bool
 }
 
 func (e *EventType) List(ctx context.Context, options *EventTypeListOptions) (*ListResponseEventTypeOut, error) {
diff --git a/go/integration.go b/go/integration.go
index 6740b1a8b..a0c5acd45 100644
--- a/go/integration.go
+++ b/go/integration.go
@@ -19,9 +19,11 @@ type Integration struct {
 }
 
 type IntegrationListOptions struct {
+	// Limit the number of returned items
+	Limit *int32
+	// The iterator returned from a prior invocation
 	Iterator *string
-	Limit    *int32
-	// N.b. `openapi.Ordering` aliased for re-export via `endpoint.go`
+	// The sorting order of the returned items
 	Order *Ordering
 }
 
diff --git a/go/message.go b/go/message.go
index 558967803..f8d8f1d1e 100644
--- a/go/message.go
+++ b/go/message.go
@@ -18,14 +18,22 @@ type (
 )
 
 type MessageListOptions struct {
-	Iterator    *string
-	Limit       *int32
-	EventTypes  *[]string
-	Before      *time.Time
-	After       *time.Time
-	Channel     *string
-	Tag         *string
+	// Limit the number of returned items
+	Limit *int32
+	// The iterator returned from a prior invocation
+	Iterator *string
+	// Filter response based on the channel
+	Channel *string
+	// Only include items created before a certain date
+	Before *time.Time
+	// Only include items created after a certain date
+	After *time.Time
+	// When `true` message payloads are included in the response
 	WithContent *bool
+	// Filter messages matching the provided tag
+	Tag *string
+	// Filter response based on the event type
+	EventTypes *[]string
 }
 
 func (m *Message) List(ctx context.Context, appId string, options *MessageListOptions) (*ListResponseMessageOut, error) {
diff --git a/go/operational_webhook_endpoint.go b/go/operational_webhook_endpoint.go
index 2ee5e8ff1..e1a028a6b 100644
--- a/go/operational_webhook_endpoint.go
+++ b/go/operational_webhook_endpoint.go
@@ -20,9 +20,12 @@ type OperationalWebhookEndpoint struct {
 }
 
 type OperationalWebhookEndpointListOptions struct {
+	// Limit the number of returned items
+	Limit *int32
+	// The iterator returned from a prior invocation
 	Iterator *string
-	Limit    *int32
-	Order    *openapi.Ordering
+	// The sorting order of the returned items
+	Order *Ordering
 }
 
 func (e *OperationalWebhookEndpoint) List(ctx context.Context, options *OperationalWebhookEndpointListOptions) (*ListResponseOperationalWebhookEndpointOut, error) {